chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-03-07 03:32:51 +01:00
Code

Remove legacy DONT_REOPEN flag

Browse Source 
It's not used since 18cd7547
This commit is contained in:
Alex Plate 2019-07-31 16:26:48 +03:00
parent 57dec7e211
commit 90079c9dfe
No known key found for this signature in database
GPG Key ID: 0B97153C8FFEC09F
18 changed files with 20 additions and 54 deletions

4
src/com/maddyhome/idea/vim/ex/CommandHandler.kt
View File

@ -88,8 +88,6 @@ sealed class CommandHandler {
}
enum class Flag {
DONT_REOPEN,
/**
* Indicates that this is a command that modifies the editor
*/
@ -182,4 +180,4 @@ sealed class CommandHandler {
}
}
data class CommandHandlerFlags(val rangeFlag: CommandHandler.RangeFlag, val argumentFlag: CommandHandler.ArgumentFlag, val flags: Set<CommandHandler.Flag>)
data class CommandHandlerFlags(val rangeFlag: CommandHandler.RangeFlag, val argumentFlag: CommandHandler.ArgumentFlag, val flags: Set<CommandHandler.Flag>)

5
src/com/maddyhome/idea/vim/ex/CommandParser.java
View File

@ -44,7 +44,6 @@ public class CommandParser {
public static final int RES_EMPTY = 1;
public static final int RES_ERROR = 1;
public static final int RES_READONLY = 1;
public static final int RES_DONT_REOPEN = 4;
public static final Pattern TRIM_WHITESPACE = Pattern.compile("[ \\t]*(.*)[ \\t\\n\\r]+", Pattern.DOTALL);
private final CommandHandler[] myHandlers = new CommandHandler[] {
new ActionListHandler(),
@ -241,10 +240,6 @@ public class CommandParser {
SelectionType.CHARACTER_WISE, ':', false);
}
if (handler.getArgFlags().getFlags().contains(CommandHandler.Flag.DONT_REOPEN)) {
result |= RES_DONT_REOPEN;
}
return result;
}

3
src/com/maddyhome/idea/vim/ex/handler/ActionHandler.kt
View File

@ -26,7 +26,6 @@ import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.*
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.SAVE_VISUAL
import com.maddyhome.idea.vim.helper.runAfterGotFocus
@ -36,7 +35,7 @@ import com.maddyhome.idea.vim.helper.runAfterGotFocus
class ActionHandler : CommandHandler.SingleExecution() {
override val names = commands("action")
override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN, SAVE_VISUAL)
override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, SAVE_VISUAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val actionName = cmd.argument.trim()

11
src/com/maddyhome/idea/vim/ex/handler/ActionListHandler.kt
View File

@ -22,14 +22,7 @@ import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.actionSystem.KeyboardShortcut
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.CommandHandlerFlags
import com.maddyhome.idea.vim.ex.CommandName
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.ExOutputModel
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
import com.maddyhome.idea.vim.ex.*
import com.maddyhome.idea.vim.helper.StringHelper
/**
@ -37,7 +30,7 @@ import com.maddyhome.idea.vim.helper.StringHelper
*/
class ActionListHandler : CommandHandler.SingleExecution() {
override val names: Array<CommandName> = commands("actionlist")
override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val lineSeparator = "\n"

12
src/com/maddyhome/idea/vim/ex/handler/CmdHandler.kt
View File

@ -22,13 +22,7 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.common.Alias
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandlerFlags
import com.maddyhome.idea.vim.ex.CommandName
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.ExOutputModel
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
import com.maddyhome.idea.vim.ex.*
import com.maddyhome.idea.vim.ex.vimscript.VimScriptCommandHandler
import com.maddyhome.idea.vim.group.CommandGroup.Companion.BLACKLISTED_ALIASES
@ -37,7 +31,7 @@ import com.maddyhome.idea.vim.group.CommandGroup.Companion.BLACKLISTED_ALIASES
*/
class CmdHandler : CommandHandler.SingleExecution(), VimScriptCommandHandler {
override val names: Array<CommandName> = commands("com[mand]")
override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Flag.DONT_REOPEN)
override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL)
// Static definitions needed for aliases.
private companion object {
@ -180,4 +174,4 @@ class CmdHandler : CommandHandler.SingleExecution(), VimScriptCommandHandler {
return true
}
}
}

3
src/com/maddyhome/idea/vim/ex/handler/EditFileHandler.kt
View File

@ -24,7 +24,6 @@ import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
@ -32,7 +31,7 @@ import com.maddyhome.idea.vim.helper.EditorDataContext
class EditFileHandler : CommandHandler.SingleExecution() {
override val names = commands("bro[wse]", "e[dit]")
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val arg = cmd.argument
if (arg == "#") {

3
src/com/maddyhome/idea/vim/ex/handler/ExitHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class ExitHandler : CommandHandler.SingleExecution() {
override val names = commands("qa[ll]", "quita[ll]", "wqa[ll]", "xa[ll]")
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
VimPlugin.getWindow().closeAll(context)

3
src/com/maddyhome/idea/vim/ex/handler/FindClassHandler.kt
View File

@ -24,14 +24,13 @@ import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class FindClassHandler : CommandHandler.SingleExecution() {
override val names = commands("cla[ss]")
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val arg = cmd.argument
if (arg.isNotEmpty()) {

3
src/com/maddyhome/idea/vim/ex/handler/FindFileHandler.kt
View File

@ -24,14 +24,13 @@ import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class FindFileHandler : CommandHandler.SingleExecution() {
override val names = commands("fin[d]")
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val arg = cmd.argument
if (arg.isNotEmpty()) {

3
src/com/maddyhome/idea/vim/ex/handler/FindSymbolHandler.kt
View File

@ -23,14 +23,13 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.KeyHandler
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class FindSymbolHandler : CommandHandler.SingleExecution() {
override val names = commands("sym[bol]")
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
// TODO: Check the command argument and jump to a specific symbol
ApplicationManager.getApplication().invokeLater { KeyHandler.executeAction("GotoSymbol", context) }

3
src/com/maddyhome/idea/vim/ex/handler/NextFileHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class NextFileHandler : CommandHandler.SingleExecution() {
override val names = commands("n[ext]")
override val argFlags = flags(RangeFlag.RANGE_IS_COUNT, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_IS_COUNT, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val count = cmd.getCount(editor, context, 1, true)

3
src/com/maddyhome/idea/vim/ex/handler/PreviousFileHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class PreviousFileHandler : CommandHandler.SingleExecution() {
override val names = commands("N[ext]", "prev[ious]")
override val argFlags = flags(RangeFlag.RANGE_IS_COUNT, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_IS_COUNT, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val count = cmd.getCount(editor, context, 1, true)

3
src/com/maddyhome/idea/vim/ex/handler/QuitHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class QuitHandler : CommandHandler.SingleExecution() {
override val names = commands("q[uit]", "clo[se]", "hid[e]")
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
VimPlugin.getFile().closeFile(editor, context)
return true

3
src/com/maddyhome/idea/vim/ex/handler/SelectFileHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class SelectFileHandler : CommandHandler.SingleExecution() {
override val names = commands("argu[ment]")
override val argFlags = flags(RangeFlag.RANGE_IS_COUNT, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_IS_COUNT, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val count = cmd.getCount(editor, context, 0, true)

3
src/com/maddyhome/idea/vim/ex/handler/SelectFirstFileHandler.kt
View File

@ -23,14 +23,13 @@ import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class SelectFirstFileHandler : CommandHandler.SingleExecution() {
override val names = commands("fir[st]", "rew[ind]")
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val res = VimPlugin.getFile().selectFile(0, context)
if (res) {

3
src/com/maddyhome/idea/vim/ex/handler/SelectLastFileHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class SelectLastFileHandler : CommandHandler.SingleExecution() {
override val names = commands("la[st]")
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
val res = VimPlugin.getFile().selectFile(999, context)
if (res) {

3
src/com/maddyhome/idea/vim/ex/handler/SplitHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class SplitHandler : CommandHandler.SingleExecution() {
override val names = commands("vs[plit]", "sp[lit]")
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
if (cmd.command.startsWith("v")) {
VimPlugin.getWindow().splitWindowVertical(context, cmd.argument)

3
src/com/maddyhome/idea/vim/ex/handler/WriteQuitHandler.kt
View File

@ -22,14 +22,13 @@ import com.intellij.openapi.actionSystem.DataContext
import com.intellij.openapi.editor.Editor
import com.maddyhome.idea.vim.VimPlugin
import com.maddyhome.idea.vim.ex.CommandHandler
import com.maddyhome.idea.vim.ex.CommandHandler.Flag.DONT_REOPEN
import com.maddyhome.idea.vim.ex.ExCommand
import com.maddyhome.idea.vim.ex.commands
import com.maddyhome.idea.vim.ex.flags
class WriteQuitHandler : CommandHandler.SingleExecution() {
override val names = commands("wq", "exi[t]", "x[it]")
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, DONT_REOPEN)
override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL)
override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
VimPlugin.getFile().saveFile(context)
VimPlugin.getFile().closeFile(editor, context)