chylex/IntelliJ-IdeaVim
1
0
Fork 0
mirror of https://github.com/chylex/IntelliJ-IdeaVim.git synced 2025-05-31 16:34:06 +02:00
Code

Added support for FLAG_EXPECT_MORE and now run all actions through Application.runReadCommand or runWriteCommand

Browse Source
This commit is contained in:
rmaddy 2003-04-20 19:29:20 +00:00
parent 7d6890e734
commit ea6b3808db
1 changed files with 43 additions and 29 deletions

72
src/com/maddyhome/idea/vim/KeyHandler.java
View File

@ -37,6 +37,7 @@ import com.maddyhome.idea.vim.key.CommandNode;
import com.maddyhome.idea.vim.key.KeyParser; import com.maddyhome.idea.vim.key.KeyParser;
import com.maddyhome.idea.vim.key.Node; import com.maddyhome.idea.vim.key.Node;
import com.maddyhome.idea.vim.key.ParentNode; import com.maddyhome.idea.vim.key.ParentNode;
import com.maddyhome.idea.vim.helper.RunnableHelper;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Stack; import java.util.Stack;
@ -307,36 +308,19 @@ public class KeyHandler
if (!editor.getDocument().isWritable() && !Command.isReadOnlyType(cmd.getType())) if (!editor.getDocument().isWritable() && !Command.isReadOnlyType(cmd.getType()))
{ {
VimPlugin.indicateError(); VimPlugin.indicateError();
reset();
} }
else else
{ {
executeAction(cmd.getAction(), context); Runnable action = new ActionRunner(editor, context, cmd);
if (CommandState.getInstance().getMode() == CommandState.MODE_INSERT || if (Command.isReadOnlyType(cmd.getType()))
CommandState.getInstance().getMode() == CommandState.MODE_REPLACE)
{ {
CommandGroups.getInstance().getChange().processCommand(editor, context, cmd); RunnableHelper.runReadCommand(action);
}
else
{
RunnableHelper.runWriteCommand(action);
} }
}
// Now that the command has been executed let's clean up a few things.
// By default the "empty" register is used by all commands so we want to reset whatever the last register
// selected by the user was to the empty register - unless we just executed the "select register" command.
if (cmd.getType() != Command.SELECT_REGISTER)
{
CommandGroups.getInstance().getRegister().resetRegister();
}
reset();
// If, at this point, we are not in insert, replace, or visual modes, we need to restore the previous
// mode we were in. This handles commands in those modes that temporarily allow us to execute normal
// mode commands.
if (CommandState.getInstance().getMode() != CommandState.MODE_INSERT &&
CommandState.getInstance().getMode() != CommandState.MODE_REPLACE &&
CommandState.getInstance().getMode() != CommandState.MODE_VISUAL)
{
CommandState.getInstance().restoreMode();
} }
} }
// We had some sort of error so reset the handler and let the user know (beep) // We had some sort of error so reset the handler and let the user know (beep)
@ -424,19 +408,49 @@ public class KeyHandler
*/ */
static class ActionRunner implements Runnable static class ActionRunner implements Runnable
{ {
public ActionRunner(AnAction action, DataContext context) public ActionRunner(Editor editor, DataContext context, Command cmd)
{ {
this.action = action; this.editor = editor;
this.context = context; this.context = context;
this.cmd = cmd;
} }
public void run() public void run()
{ {
action.actionPerformed(new AnActionEvent(null, context, "", action.getTemplatePresentation(), 0)); executeAction(cmd.getAction(), context);
if (CommandState.getInstance().getMode() == CommandState.MODE_INSERT ||
CommandState.getInstance().getMode() == CommandState.MODE_REPLACE)
{
CommandGroups.getInstance().getChange().processCommand(editor, context, cmd);
}
// Now that the command has been executed let's clean up a few things.
// By default the "empty" register is used by all commands so we want to reset whatever the last register
// selected by the user was to the empty register - unless we just executed the "select register" command.
if (cmd.getType() != Command.SELECT_REGISTER)
{
CommandGroups.getInstance().getRegister().resetRegister();
}
KeyHandler.getInstance().reset();
// If, at this point, we are not in insert, replace, or visual modes, we need to restore the previous
// mode we were in. This handles commands in those modes that temporarily allow us to execute normal
// mode commands. An exception is if this command should leave us in the temporary mode such as
// "select register"
if ((CommandState.getInstance().getMode() != CommandState.MODE_INSERT &&
CommandState.getInstance().getMode() != CommandState.MODE_REPLACE &&
CommandState.getInstance().getMode() != CommandState.MODE_VISUAL) &&
(cmd.getFlags() & KeyParser.FLAG_EXPECT_MORE) == 0)
{
CommandState.getInstance().restoreMode();
}
} }
private AnAction action; private Editor editor;
private DataContext context; private DataContext context;
private Command cmd;
} }
private int count; private int count;