Set plugin version to chylex-39

This reverts commit 1fa78935

.gitignore

@@ -27,6 +27,9 @@
 # Generated by gradle task "generateGrammarSource"
 vim-engine/src/main/java/com/maddyhome/idea/vim/parser/generated
 vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
+# Generated JSONs for lazy classloading
+/vim-engine/src/main/resources/ksp-generated
+/src/main/resources/ksp-generated
 
 # Created by github automation
 settings.xml

.teamcity/_Self/Project.kt

@@ -27,7 +27,6 @@ object Project : Project({
   // Active tests
   buildType(TestingBuildType("Latest EAP", "<default>", version = "LATEST-EAP-SNAPSHOT"))
   buildType(TestingBuildType("2024.1.1", "<default>"))
-  buildType(TestingBuildType("2024.2", "<default>"))
   buildType(TestingBuildType("Latest EAP With Xorg", "<default>", version = "LATEST-EAP-SNAPSHOT"))
 
   buildType(PropertyBased)

AUTHORS.md

@@ -523,22 +523,6 @@ Contributors:
   [![icon][github]](https://github.com/LazyScaper)
    
   Jake
-* [![icon][mail]](mailto:the1xdeveloper@gmail.com)
-  [![icon][github]](https://github.com/The1xDeveloper)
-   
-  The1xDeveloper
-* [![icon][mail]](mailto:shaunewilliams@gmail.com)
-  [![icon][github]](https://github.com/shaunlebron)
-   
-  shaun
-* [![icon][mail]](mailto:i.i.babko@gmail.com)
-  [![icon][github]](https://github.com/igorbabko)
-   
-  Igor Babko
-* [![icon][mail]](mailto:533601+felixwiemuth@users.noreply.github.com)
-  [![icon][github]](https://github.com/felixwiemuth)
-   
-  Felix Wiemuth
 
 Previous contributors:
 

CHANGES.md

@@ -27,8 +27,8 @@ usual beta standards.
 
 Since version 2.9.0, the changelog can be found on YouTrack
 
-* [To Be Released](https://youtrack.jetbrains.com/issues/VIM?q=%23%7BReady%20To%20Release%7D%20)
-* [Version Fixes](https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20sort%20by:%20%7BFix%20versions%7D%20asc)
+To Be Released: https://youtrack.jetbrains.com/issues/VIM?q=%23%7BReady%20To%20Release%7D%20
+Latest Fixes: https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20sort%20by:%20updated%20
 
 ## 2.9.0, 2024-02-20
 

CONTRIBUTING.md

@@ -62,16 +62,12 @@ for a few days or send it to a friend for testing.
 If you are looking for:
 
 - Vim commands (`w`, `<C-O>`, `p`, etc.):
-    - Any particular command:
-      - [Commands common for Fleet and IdeaVim](vim-engine/src/main/resources/ksp-generated/engine_commands.json)
-      - [IdeaVim only commands](src/main/resources/ksp-generated/intellij_commands.json)
+    - Any particular command: `package-info.java`.
     - How commands are executed in common: `EditorActionHandlerBase`.
     - Key mapping: `KeyHandler.handleKey()`.
 
 - Ex commands (`:set`, `:s`, `:nohlsearch`):
-    - Any particular command:
-        - [Commands common for Fleet and IdeaVim](vim-engine/src/main/resources/ksp-generated/engine_ex_commands.json)
-        - [IdeaVim only commands](src/main/resources/ksp-generated/intellij_ex_commands.json)
+    - Any particular ex command: package `com.maddyhome.idea.vim.ex.handler`.
     - Vim script grammar: `Vimscript.g4`.
     - Vim script parsing: package `com.maddyhome.idea.vim.vimscript.parser`.
     - Vim script executor: `Executor`.

README.md

@@ -109,6 +109,7 @@ etc
 
 See also:
 
+* [The list of all supported commands](src/main/java/com/maddyhome/idea/vim/package-info.java)
 * [Top feature requests and bugs](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+sort+by%3A+votes)
 * [Vimscript support roadmap](vimscript-info/VIMSCRIPT_ROADMAP.md)
 * [List of supported in-build functions](vimscript-info/FUNCTIONS_INFO.MD)

annotation-processors/src/main/kotlin/com/intellij/vim/processors/CommandOrMotionProcessor.kt

@@ -37,8 +37,7 @@ class CommandOrMotionProcessor(private val environment: SymbolProcessorEnvironme
     Files.createDirectories(generatedDirPath)
 
     val filePath = generatedDirPath.resolve(environment.options["commands_file"]!!)
-    val sortedCommands = commands.sortedWith(compareBy({ it.keys }, { it.`class` }))
-    val fileContent = json.encodeToString(sortedCommands)
+    val fileContent = json.encodeToString(commands)
     filePath.writeText(fileContent)
 
     return emptyList()

annotation-processors/src/main/kotlin/com/intellij/vim/processors/ExCommandProcessor.kt

@@ -37,8 +37,7 @@ class ExCommandProcessor(private val environment: SymbolProcessorEnvironment): S
     Files.createDirectories(generatedDirPath)
 
     val filePath = generatedDirPath.resolve(environment.options["ex_commands_file"]!!)
-    val sortedCommandToClass = commandToClass.toList().sortedWith(compareBy({ it.first }, { it.second })).toMap()
-    val fileContent = json.encodeToString(sortedCommandToClass)
+    val fileContent = json.encodeToString(commandToClass)
     filePath.writeText(fileContent)
 
     return emptyList()

annotation-processors/src/main/kotlin/com/intellij/vim/processors/VimscriptFunctionProcessor.kt

@@ -37,8 +37,7 @@ class VimscriptFunctionProcessor(private val environment: SymbolProcessorEnviron
     Files.createDirectories(generatedDirPath)
 
     val filePath = generatedDirPath.resolve(environment.options["vimscript_functions_file"]!!)
-    val sortedNameToClass = nameToClass.toList().sortedWith(compareBy({ it.first }, { it.second })).toMap()
-    val fileContent = json.encodeToString(sortedNameToClass)
+    val fileContent = json.encodeToString(nameToClass)
     filePath.writeText(fileContent)
 
     return emptyList()

doc/Home.md

@@ -1,6 +1,6 @@
 Welcome to the IdeaVim wiki!
 
-- List of IdeaVim plugins: [plugins](IdeaVim%20Plugins)
-- Examples of `ideajoin` option (also known as "smart join"): ["ideajoin" examples](ideajoin-examples)
-- List of "set" commands: ["set" commands](set-commands)
-- Docs about "select" mode in vim: [select mode](Select-mode)
+- List of IdeaVim plugins: [plugins](IdeaVim%20Plugins.md)
+- Examples of `ideajoin` option (also known as "smart join"): ["ideajoin" examples](ideajoin-examples.md)
+- List of "set" commands: ["set" commands](set-commands.md)
+- Docs about "select" mode in vim: [select mode](Select-mode.md)

doc/IdeaVim Plugins.md

@@ -82,7 +82,7 @@ Original plugin: [NERDTree](https://github.com/preservim/nerdtree).
    
 ### Instructions
    
-[See here](NERDTree-support).
+[See here](NERDTree-support.md).
 
 </details>
 

doc/set-commands.md

@@ -8,7 +8,7 @@ Every effort is made to make these options compatible with Vim behaviour.
 However, some differences are inevitable.
 
 ```
-'clipboard'     'cb'    Defines clipboard behavior
+'clipboard'     'cb'    Defines clipboard behavioue
         A comma-separated list of words to control clipboard behaviour:
            unnamed      The clipboard register '*' is used instead of the
                         unnamed register

doc/support-guide.md

@@ -1,7 +1,7 @@
 # Support Guide
 
 This document is created to help our support team.
-It's not intended to be read by the users as it brings no value to them.
+It's not intended to be read by the users as it brings to value to them.
 
 ## Support channels
 
@@ -35,4 +35,4 @@ IdeaVim has multiple YouTrack statuses, main are:
 # ~.ideavimrc file
 
 `~/.ideavimrc` is the file that is used for IdeaVim configuration. It may affect behaviour of the program,
-so it makes sense to additionally request this file in case the issues can't be reproduced.
+so it makes sense to additionally request this file in case the issues can't be reproduced.

gradle.properties

@@ -20,7 +20,7 @@ ideaVersion=2024.2
 # Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 ideaType=IC
 instrumentPluginCode=true
-version=chylex-41
+version=chylex-39
 javaVersion=17
 remoteRobotVersion=0.11.23
 antlrVersion=4.10.1

qodana.yaml

@@ -19,6 +19,7 @@ exclude:
       - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/JavaText.kt
       - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/LoremText.kt
       - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/SimpleText.kt
+      - src/main/java/com/maddyhome/idea/vim/package-info.java
       - vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
       - vim-engine/src/main/java/com/maddyhome/idea/vim/parser/generated
       - src/main/java/com/maddyhome/idea/vim/group/SearchGroup.java

src/main/java/com/maddyhome/idea/vim/PluginStartup.kt

@@ -8,10 +8,6 @@
 
 package com.maddyhome.idea.vim
 
-import com.intellij.ide.BrowserUtil
-import com.intellij.ide.plugins.IdeaPluginDescriptor
-import com.intellij.ide.plugins.PluginStateListener
-import com.intellij.ide.plugins.PluginStateManager
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
 import com.intellij.openapi.project.Project
@@ -44,18 +40,6 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {
 
     // This code should be executed once
     VimPlugin.getInstance().initialize()
-
-    // Uninstall survey. Should be registered once for all projects
-    PluginStateManager.addStateListener(object : PluginStateListener {
-      override fun install(p0: IdeaPluginDescriptor) {/*Nothing*/
-      }
-
-      override fun uninstall(descriptor: IdeaPluginDescriptor) {
-        if (descriptor.pluginId == VimPlugin.getPluginId()) {
-          BrowserUtil.open("https://surveys.jetbrains.com/s3/ideavim-uninstall-feedback")
-        }
-      }
-    })
   }
 }
 

src/main/java/com/maddyhome/idea/vim/action/change/OperatorAction.kt

@@ -37,7 +37,7 @@ import com.maddyhome.idea.vim.vimscript.model.expressions.FunctionCallExpression
 import com.maddyhome.idea.vim.vimscript.model.expressions.SimpleExpression
 
 // todo make it multicaret
-private fun doOperatorAction(editor: VimEditor, context: ExecutionContext, textRange: TextRange, motionType: SelectionType): Boolean {
+private fun doOperatorAction(editor: VimEditor, context: ExecutionContext, textRange: TextRange, selectionType: SelectionType): Boolean {
   val func = injector.globalOptions().operatorfunc
   if (func.isEmpty()) {
     VimPlugin.showMessage(MessageHelper.message("E774"))
@@ -57,9 +57,9 @@ private fun doOperatorAction(editor: VimEditor, context: ExecutionContext, textR
         if (value is VimFuncref) {
           handler = value.handler
         }
-      } catch (_: ExException) {
+      } catch (ex: ExException) {
         // Get the argument for function('...') or funcref('...') for the error message
-        val functionName = if (expression is FunctionCallExpression && expression.arguments.isNotEmpty()) {
+        val functionName = if (expression is FunctionCallExpression && expression.arguments.size > 0) {
           expression.arguments[0].evaluate(editor, context, scriptContext).toString()
         }
         else {
@@ -77,7 +77,7 @@ private fun doOperatorAction(editor: VimEditor, context: ExecutionContext, textR
     return false
   }
 
-  val arg = when (motionType) {
+  val arg = when (selectionType) {
     SelectionType.LINE_WISE -> "line"
     SelectionType.CHARACTER_WISE -> "char"
     SelectionType.BLOCK_WISE -> "block"
@@ -101,13 +101,19 @@ internal class OperatorAction : VimActionHandler.SingleExecution() {
   override val argumentType: Argument.Type = Argument.Type.MOTION
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val argument = cmd.argument as? Argument.Motion ?: return false
+    val argument = cmd.argument ?: return false
     if (!editor.inRepeatMode) {
       argumentCaptured = argument
     }
     val range = getMotionRange(editor, context, argument, operatorArguments)
+
     if (range != null) {
-      return doOperatorAction(editor, context, range, argument.getMotionType())
+      val selectionType = if (argument.motion.isLinewiseMotion()) {
+        SelectionType.LINE_WISE
+      } else {
+        SelectionType.CHARACTER_WISE
+      }
+      return doOperatorAction(editor, context, range, selectionType)
     }
     return false
   }
@@ -115,7 +121,7 @@ internal class OperatorAction : VimActionHandler.SingleExecution() {
   private fun getMotionRange(
     editor: VimEditor,
     context: ExecutionContext,
-    argument: Argument.Motion,
+    argument: Argument,
     operatorArguments: OperatorArguments,
   ): TextRange? {
     // Note that we're using getMotionRange2 in order to avoid normalising the linewise range into line start
@@ -130,7 +136,7 @@ internal class OperatorAction : VimActionHandler.SingleExecution() {
       operatorArguments,
     )?.normalize()?.let {
       // If we're linewise, make sure the end offset isn't just the EOL char
-      if (argument.getMotionType() == SelectionType.LINE_WISE && it.endOffset < editor.fileSize()) {
+      if (argument.motion.isLinewiseMotion() && it.endOffset < editor.fileSize()) {
         TextRange(it.startOffset, it.endOffset + 1)
       } else {
         it

src/main/java/com/maddyhome/idea/vim/action/change/RepeatChangeAction.kt

@@ -25,7 +25,7 @@ internal class RepeatChangeAction : VimActionHandler.SingleExecution() {
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     val state = injector.vimState
-    var lastCommand = VimRepeater.lastChangeCommand
+    val lastCommand = VimRepeater.lastChangeCommand
 
     if (lastCommand == null && Extension.lastExtensionHandler == null) return false
 
@@ -57,7 +57,12 @@ internal class RepeatChangeAction : VimActionHandler.SingleExecution() {
       )
     } else if (!repeatHandler && lastCommand != null) {
       if (cmd.rawCount > 0) {
-        lastCommand = lastCommand.copy(rawCount = cmd.rawCount)
+        lastCommand.rawCount = cmd.count
+        val arg = lastCommand.argument
+        if (arg != null) {
+          val mot = arg.motion
+          mot.rawCount = 0
+        }
       }
       state.executingCommand = lastCommand
 

src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.kt

@@ -40,7 +40,7 @@ class DeleteJoinLinesAction : ChangeEditorActionHandler.ConditionalSingleExecuti
   ): Boolean {
     injector.editorGroup.notifyIdeaJoin(editor)
 
-    return injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, false)
+    return injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, false, operatorArguments)
   }
 
   override fun execute(

src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.kt

@@ -35,7 +35,7 @@ class DeleteJoinLinesSpacesAction : ChangeEditorActionHandler.SingleExecution()
     injector.editorGroup.notifyIdeaJoin(editor)
     var res = true
     editor.nativeCarets().sortedByDescending { it.offset }.forEach { caret ->
-      if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, true)) {
+      if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, true, operatorArguments)) {
         res = false
       }
     }

src/main/java/com/maddyhome/idea/vim/action/editor/VimEditorActions.kt

@@ -22,6 +22,11 @@ import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
 
+@CommandOrMotion(keys = ["<C-H>", "<BS>"], modes = [Mode.INSERT])
+internal class VimEditorBackSpace : IdeActionHandler(IdeActions.ACTION_EDITOR_BACKSPACE) {
+  override val type: Command.Type = Command.Type.DELETE
+}
+
 @CommandOrMotion(keys = ["<Del>"], modes = [Mode.INSERT])
 internal class VimEditorDelete : IdeActionHandler(IdeActions.ACTION_EDITOR_DELETE) {
   override val type: Command.Type = Command.Type.DELETE

src/main/java/com/maddyhome/idea/vim/extension/argtextobj/VimArgTextObjExtension.java

@@ -33,6 +33,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
+import java.util.EnumSet;
 
 import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putExtensionHandlerMapping;
 import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissing;
@@ -63,8 +64,8 @@ public class VimArgTextObjExtension implements VimExtension {
    */
   private static class BracketPairs {
     // NOTE: brackets must match by the position, and ordered by rank (highest to lowest).
-    private final @NotNull String openBrackets;
-    private final @NotNull String closeBrackets;
+    @NotNull private final String openBrackets;
+    @NotNull private final String closeBrackets;
 
     static class ParseException extends Exception {
       public ParseException(@NotNull String message) {
@@ -86,7 +87,8 @@ public class VimArgTextObjExtension implements VimExtension {
      * @param bracketPairs comma-separated list of colon-separated bracket pairs.
      * @throws ParseException if a syntax error is detected.
      */
-    static @NotNull BracketPairs fromBracketPairList(final @NotNull String bracketPairs) throws ParseException {
+    @NotNull
+    static BracketPairs fromBracketPairList(@NotNull final String bracketPairs) throws ParseException {
       StringBuilder openBrackets = new StringBuilder();
       StringBuilder closeBrackets = new StringBuilder();
       ParseState state = ParseState.OPEN;
@@ -126,7 +128,7 @@ public class VimArgTextObjExtension implements VimExtension {
       return new BracketPairs(openBrackets.toString(), closeBrackets.toString());
     }
 
-    BracketPairs(final @NotNull String openBrackets, final @NotNull String closeBrackets) {
+    BracketPairs(@NotNull final String openBrackets, @NotNull final String closeBrackets) {
       assert openBrackets.length() == closeBrackets.length();
       this.openBrackets = openBrackets;
       this.closeBrackets = closeBrackets;
@@ -156,9 +158,10 @@ public class VimArgTextObjExtension implements VimExtension {
     }
   }
 
-  private static final BracketPairs DEFAULT_BRACKET_PAIRS = new BracketPairs("(", ")");
+  public static final BracketPairs DEFAULT_BRACKET_PAIRS = new BracketPairs("(", ")");
 
-  private static @Nullable String bracketPairsVariable() {
+  @Nullable
+  private static String bracketPairsVariable() {
     final Object value = VimPlugin.getVariableService().getGlobalVariableValue("argtextobj_pairs");
     if (value instanceof VimString vimValue) {
       return vimValue.getValue();
@@ -189,12 +192,13 @@ public class VimArgTextObjExtension implements VimExtension {
         this.isInner = isInner;
       }
 
+      @Nullable
       @Override
-      public @Nullable TextRange getRange(@NotNull VimEditor editor,
-                                          @NotNull ImmutableVimCaret caret,
-                                          @NotNull ExecutionContext context,
-                                          int count,
-                                          int rawCount) {
+      public TextRange getRange(@NotNull VimEditor editor,
+                                @NotNull ImmutableVimCaret caret,
+                                @NotNull ExecutionContext context,
+                                int count,
+                                int rawCount) {
         BracketPairs bracketPairs = DEFAULT_BRACKET_PAIRS;
         final String bracketPairsVar = bracketPairsVariable();
         if (bracketPairsVar != null) {
@@ -232,22 +236,24 @@ public class VimArgTextObjExtension implements VimExtension {
         return new TextRange(finder.getLeftBound(), finder.getRightBound());
       }
 
+      @NotNull
       @Override
-      public @NotNull TextObjectVisualType getVisualType() {
+      public TextObjectVisualType getVisualType() {
         return TextObjectVisualType.CHARACTER_WISE;
       }
     }
 
     @Override
     public void execute(@NotNull VimEditor editor, @NotNull ExecutionContext context, @NotNull OperatorArguments operatorArguments) {
+      @NotNull KeyHandler keyHandler = KeyHandler.getInstance();
       @NotNull KeyHandlerState keyHandlerState = KeyHandler.getInstance().getKeyHandlerState();
+      int count = Math.max(1, keyHandlerState.getCommandBuilder().getCount());
 
       final ArgumentTextObjectHandler textObjectHandler = new ArgumentTextObjectHandler(isInner);
       //noinspection DuplicatedCode
-      if (!(editor.getMode() instanceof Mode.OP_PENDING)) {
-        int count0 = operatorArguments.getCount0();
+      if (!keyHandler.isOperatorPending(editor.getMode(), keyHandlerState)) {
         editor.nativeCarets().forEach((VimCaret caret) -> {
-          final TextRange range = textObjectHandler.getRange(editor, caret, context, Math.max(1, count0), count0);
+          final TextRange range = textObjectHandler.getRange(editor, caret, context, count, 0);
           if (range != null) {
             try (VimListenerSuppressor.Locked ignored = SelectionVimListenerSuppressor.INSTANCE.lock()) {
               if (editor.getMode() instanceof Mode.VISUAL) {
@@ -259,7 +265,8 @@ public class VimArgTextObjExtension implements VimExtension {
           }
         });
       } else {
-        keyHandlerState.getCommandBuilder().addAction(textObjectHandler);
+        keyHandlerState.getCommandBuilder().completeCommandPart(new Argument(new Command(count,
+                                                                                         textObjectHandler, Command.Type.MOTION, EnumSet.noneOf(CommandFlags.class))));
       }
     }
   }
@@ -269,9 +276,9 @@ public class VimArgTextObjExtension implements VimExtension {
    * position
    */
   private static class ArgBoundsFinder {
-    private final @NotNull CharSequence text;
-    private final @NotNull Document document;
-    private final @NotNull BracketPairs brackets;
+    @NotNull private final CharSequence text;
+    @NotNull private final Document document;
+    @NotNull private final BracketPairs brackets;
     private int leftBound = Integer.MAX_VALUE;
     private int rightBound = Integer.MIN_VALUE;
     private int leftBracket;
@@ -298,7 +305,7 @@ public class VimArgTextObjExtension implements VimExtension {
      * @param position starting position.
      */
     boolean findBoundsAt(int position) throws IllegalStateException {
-      if (text.isEmpty()) {
+      if (text.length() == 0) {
         error = "empty document";
         return false;
       }

src/main/java/com/maddyhome/idea/vim/extension/commentary/CommentaryExtension.kt

@@ -25,6 +25,9 @@ import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.getLineEndOffset
 import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.MappingMode
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.command.TextObjectVisualType
@@ -49,6 +52,7 @@ import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.SelectionType
+import java.util.*
 
 internal class CommentaryExtension : VimExtension {
 
@@ -180,8 +184,10 @@ internal class CommentaryExtension : VimExtension {
     override val isRepeatable = true
 
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
+      val command = Command(operatorArguments.count1, CommentaryTextObjectMotionHandler, Command.Type.MOTION, EnumSet.noneOf(CommandFlags::class.java))
+
       val keyState = KeyHandler.getInstance().keyHandlerState
-      keyState.commandBuilder.addAction(CommentaryTextObjectMotionHandler)
+      keyState.commandBuilder.completeCommandPart(Argument(command))
     }
   }
 

src/main/java/com/maddyhome/idea/vim/extension/matchit/Matchit.kt

@@ -44,7 +44,6 @@ import com.maddyhome.idea.vim.helper.enumSetOf
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.Mode
 import java.util.*
 import java.util.regex.Pattern
 
@@ -94,29 +93,34 @@ internal class Matchit : VimExtension {
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
       val keyHandler = KeyHandler.getInstance()
       val keyState = keyHandler.keyHandlerState
+      val count = keyState.commandBuilder.count
 
       // Reset the command count so it doesn't transfer onto subsequent commands.
       keyState.commandBuilder.resetCount()
 
       // Normally we want to jump to the start of the matching pair. But when moving forward in operator
       // pending mode, we want to include the entire match. isInOpPending makes that distinction.
-      if (editor.mode is Mode.OP_PENDING) {
+      val isInOpPending = keyHandler.isOperatorPending(editor.mode, keyState)
+
+      if (isInOpPending) {
         val matchitAction = MatchitAction()
         matchitAction.reverse = reverse
         matchitAction.isInOpPending = true
 
-        keyState.commandBuilder.addAction(matchitAction)
+        keyState.commandBuilder.completeCommandPart(
+          Argument(
+            Command(
+              count,
+              matchitAction,
+              Command.Type.MOTION,
+              EnumSet.noneOf(CommandFlags::class.java),
+            ),
+          ),
+        )
       } else {
         editor.sortedCarets().forEach { caret ->
           injector.jumpService.saveJumpLocation(editor)
-          caret.moveToOffset(
-            getMatchitOffset(
-              editor.ij,
-              caret.ij,
-              operatorArguments.count0,
-              isInOpPending = false,
-              reverse
-            ))
+          caret.moveToOffset(getMatchitOffset(editor.ij, caret.ij, count, isInOpPending, reverse))
         }
       }
     }
@@ -350,7 +354,7 @@ private object FileTypePatterns {
 
 private val DEFAULT_PAIRS = setOf('(', ')', '[', ']', '{', '}')
 
-private fun getMatchitOffset(editor: Editor, caret: Caret, count0: Int, isInOpPending: Boolean, reverse: Boolean): Int {
+private fun getMatchitOffset(editor: Editor, caret: Caret, count: Int, isInOpPending: Boolean, reverse: Boolean): Int {
   val virtualFile = EditorHelper.getVirtualFile(editor)
   var caretOffset = caret.offset
 
@@ -363,9 +367,9 @@ private fun getMatchitOffset(editor: Editor, caret: Caret, count0: Int, isInOpPe
   val currentChar = editor.document.charsSequence[caretOffset]
   var motionOffset: Int? = null
 
-  if (count0 > 0) {
+  if (count > 0) {
     // Matchit doesn't affect the percent motion, so we fall back to the default behavior.
-    motionOffset = VimPlugin.getMotion().moveCaretToLinePercent(editor.vim, caret.vim, count0)
+    motionOffset = VimPlugin.getMotion().moveCaretToLinePercent(editor.vim, caret.vim, count)
   } else {
     // Check the simplest case first.
     if (DEFAULT_PAIRS.contains(currentChar)) {
@@ -396,7 +400,8 @@ private fun getMatchitOffset(editor: Editor, caret: Caret, count0: Int, isInOpPe
 
 private fun getMotionOffset(motion: Motion): Int? {
   return when (motion) {
-    is Motion.AdjustedOffset, is Motion.AbsoluteOffset -> motion.offset
+    is Motion.AbsoluteOffset -> motion.offset
+    is Motion.AdjustedOffset -> motion.offset
     is Motion.Error, is Motion.NoMotion -> null
   }
 }

src/main/java/com/maddyhome/idea/vim/extension/nerdtree/NerdTree.kt

@@ -555,13 +555,12 @@ private fun registerCommand(default: String, action: NerdAction) {
 }
 
 
-private val actionsRoot: RootNode<NerdAction> = RootNode("NERDTree")
+private val actionsRoot: RootNode<NerdAction> = RootNode()
 private var currentNode: CommandPartNode<NerdAction> = actionsRoot
-
 private fun collectShortcuts(node: Node<NerdAction>): Set<KeyStroke> {
   return if (node is CommandPartNode<NerdAction>) {
-    val res = node.children.keys.toMutableSet()
-    res += node.children.values.map { collectShortcuts(it) }.flatten()
+    val res = node.keys.toMutableSet()
+    res += node.values.map { collectShortcuts(it) }.flatten()
     res
   } else {
     emptySet()

src/main/java/com/maddyhome/idea/vim/extension/replacewithregister/ReplaceWithRegister.kt

@@ -10,6 +10,7 @@ package com.maddyhome.idea.vim.extension.replacewithregister
 
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.ImmutableVimCaret
@@ -165,11 +166,17 @@ private fun doReplace(editor: Editor, context: DataContext, caret: ImmutableVimC
     putToLine = -1,
   )
   val vimEditor = editor.vim
+  val keyHandler = KeyHandler.getInstance()
   ClipboardOptionHelper.IdeaputDisabler().use {
     VimPlugin.getPut().putText(
       vimEditor,
       context.vim,
       putData,
+      operatorArguments = OperatorArguments(
+        keyHandler.isOperatorPending(vimEditor.mode, keyHandler.keyHandlerState),
+        0,
+        editor.vim.mode,
+      ),
       saveToRegister = false
     )
   }

src/main/java/com/maddyhome/idea/vim/extension/textobjentire/VimTextObjEntireExtension.java

@@ -29,12 +29,14 @@ import com.maddyhome.idea.vim.state.mode.Mode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.EnumSet;
+
 import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putExtensionHandlerMapping;
 import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissing;
 
 /**
  * Port of vim-entire:
- * <a href="https://github.com/kana/vim-textobj-entire">vim-textobj-entire</a>
+ * https://github.com/kana/vim-textobj-entire
  *
  * <p>
  * vim-textobj-entire provides two text objects:
@@ -49,7 +51,7 @@ import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingI
  * </ul>
  *
  * See also the reference manual for more details at:
- * <a href="https://github.com/kana/vim-textobj-entire/blob/master/doc/textobj-entire.txt">text-obj-entire.txt</a>
+ * https://github.com/kana/vim-textobj-entire/blob/master/doc/textobj-entire.txt
  *
  * @author Alexandre Grison (@agrison)
  */
@@ -92,12 +94,13 @@ public class VimTextObjEntireExtension implements VimExtension {
         this.ignoreLeadingAndTrailing = ignoreLeadingAndTrailing;
       }
 
+      @Nullable
       @Override
-      public @Nullable TextRange getRange(@NotNull VimEditor editor,
-                                          @NotNull ImmutableVimCaret caret,
-                                          @NotNull ExecutionContext context,
-                                          int count,
-                                          int rawCount) {
+      public TextRange getRange(@NotNull VimEditor editor,
+                                @NotNull ImmutableVimCaret caret,
+                                @NotNull ExecutionContext context,
+                                int count,
+                                int rawCount) {
         int start = 0, end = ((IjVimEditor)editor).getEditor().getDocument().getTextLength();
 
         // for the `ie` text object we don't want leading an trailing spaces
@@ -122,22 +125,24 @@ public class VimTextObjEntireExtension implements VimExtension {
         return new TextRange(start, end);
       }
 
+      @NotNull
       @Override
-      public @NotNull TextObjectVisualType getVisualType() {
+      public TextObjectVisualType getVisualType() {
         return TextObjectVisualType.CHARACTER_WISE;
       }
     }
 
     @Override
     public void execute(@NotNull VimEditor editor, @NotNull ExecutionContext context, @NotNull OperatorArguments operatorArguments) {
+      @NotNull KeyHandler keyHandler = KeyHandler.getInstance();
       @NotNull KeyHandlerState keyHandlerState = KeyHandler.getInstance().getKeyHandlerState();
+      int count = Math.max(1, keyHandlerState.getCommandBuilder().getCount());
 
       final EntireTextObjectHandler textObjectHandler = new EntireTextObjectHandler(ignoreLeadingAndTrailing);
       //noinspection DuplicatedCode
-      if (!(editor.getMode() instanceof Mode.OP_PENDING)) {
-        int count0 = operatorArguments.getCount0();
+      if (!keyHandler.isOperatorPending(editor.getMode(), keyHandlerState)) {
         ((IjVimEditor) editor).getEditor().getCaretModel().runForEachCaret((Caret caret) -> {
-          final TextRange range = textObjectHandler.getRange(editor, new IjVimCaret(caret), context, Math.max(1, count0), count0);
+          final TextRange range = textObjectHandler.getRange(editor, new IjVimCaret(caret), context, count, 0);
           if (range != null) {
             try (VimListenerSuppressor.Locked ignored = SelectionVimListenerSuppressor.INSTANCE.lock()) {
               if (editor.getMode() instanceof Mode.VISUAL) {
@@ -150,7 +155,9 @@ public class VimTextObjEntireExtension implements VimExtension {
 
         });
       } else {
-        keyHandlerState.getCommandBuilder().addAction(textObjectHandler);
+        keyHandlerState.getCommandBuilder().completeCommandPart(new Argument(new Command(count,
+                                                                                         textObjectHandler, Command.Type.MOTION,
+                                                                                         EnumSet.noneOf(CommandFlags.class))));
       }
     }
   }

src/main/java/com/maddyhome/idea/vim/extension/textobjindent/VimIndentObject.java

@@ -30,12 +30,14 @@ import com.maddyhome.idea.vim.state.mode.Mode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.EnumSet;
+
 import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putExtensionHandlerMapping;
 import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMapping;
 
 /**
  * Port of vim-indent-object:
- * <a href="https://github.com/michaeljsmith/vim-indent-object">vim-indent-object</a>
+ * https://github.com/michaeljsmith/vim-indent-object
  *
  * <p>
  * vim-indent-object provides these text objects based on the cursor line's indentation:
@@ -47,7 +49,7 @@ import static com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMapping;
  * </ul>
  *
  * See also the reference manual for more details at:
- * <a href="https://github.com/michaeljsmith/vim-indent-object/blob/master/doc/indent-object.txt">indent-object.txt</a>
+ * https://github.com/michaeljsmith/vim-indent-object/blob/master/doc/indent-object.txt
  *
  * @author Shrikant Kandula (@sharat87)
  */
@@ -96,12 +98,13 @@ public class VimIndentObject implements VimExtension {
         this.includeBelow = includeBelow;
       }
 
+      @Nullable
       @Override
-      public @Nullable TextRange getRange(@NotNull VimEditor editor,
-                                          @NotNull ImmutableVimCaret caret,
-                                          @NotNull ExecutionContext context,
-                                          int count,
-                                          int rawCount) {
+      public TextRange getRange(@NotNull VimEditor editor,
+                                @NotNull ImmutableVimCaret caret,
+                                @NotNull ExecutionContext context,
+                                int count,
+                                int rawCount) {
         final CharSequence charSequence = ((IjVimEditor)editor).getEditor().getDocument().getCharsSequence();
         final int caretOffset = ((IjVimCaret)caret).getCaret().getOffset();
 
@@ -246,8 +249,9 @@ public class VimIndentObject implements VimExtension {
         return new TextRange(upperBoundaryOffset, lowerBoundaryOffset);
       }
 
+      @NotNull
       @Override
-      public @NotNull TextObjectVisualType getVisualType() {
+      public TextObjectVisualType getVisualType() {
         return TextObjectVisualType.LINE_WISE;
       }
 
@@ -260,14 +264,15 @@ public class VimIndentObject implements VimExtension {
     @Override
     public void execute(@NotNull VimEditor editor, @NotNull ExecutionContext context, @NotNull OperatorArguments operatorArguments) {
       IjVimEditor vimEditor = (IjVimEditor)editor;
+      @NotNull KeyHandler keyHandler = KeyHandler.getInstance();
       @NotNull KeyHandlerState keyHandlerState = KeyHandler.getInstance().getKeyHandlerState();
+      int count = Math.max(1, keyHandlerState.getCommandBuilder().getCount());
 
       final IndentObjectHandler textObjectHandler = new IndentObjectHandler(includeAbove, includeBelow);
 
-      if (!(editor.getMode() instanceof Mode.OP_PENDING)) {
-        int count0 = operatorArguments.getCount0();
+      if (!keyHandler.isOperatorPending(editor.getMode(), keyHandlerState)) {
         ((IjVimEditor)editor).getEditor().getCaretModel().runForEachCaret((Caret caret) -> {
-          final TextRange range = textObjectHandler.getRange(vimEditor, new IjVimCaret(caret), context, Math.max(1, count0), count0);
+          final TextRange range = textObjectHandler.getRange(vimEditor, new IjVimCaret(caret), context, count, 0);
           if (range != null) {
             try (VimListenerSuppressor.Locked ignored = SelectionVimListenerSuppressor.INSTANCE.lock()) {
               if (editor.getMode() instanceof Mode.VISUAL) {
@@ -280,7 +285,9 @@ public class VimIndentObject implements VimExtension {
 
         });
       } else {
-        keyHandlerState.getCommandBuilder().addAction(textObjectHandler);
+        keyHandlerState.getCommandBuilder().completeCommandPart(new Argument(new Command(count,
+                                                                                         textObjectHandler, Command.Type.MOTION,
+                                                                                         EnumSet.noneOf(CommandFlags.class))));
       }
     }
   }

src/main/java/com/maddyhome/idea/vim/group/ChangeGroup.kt

@@ -103,11 +103,6 @@ class ChangeGroup : VimChangeGroupBase() {
     }
   }
 
-  override fun processBackspace(editor: VimEditor, context: ExecutionContext) {
-    injector.actionExecutor.executeAction(editor, name = IdeActions.ACTION_EDITOR_BACKSPACE, context = context)
-    injector.scroll.scrollCaretIntoView(editor)
-  }
-
   private fun restoreCursor(editor: VimEditor, caret: VimCaret, startLine: Int) {
     if (caret != editor.primaryCaret()) {
       (editor as IjVimEditor).editor.caretModel.addCaret(

src/main/java/com/maddyhome/idea/vim/group/DigraphGroup.java

@@ -11,14 +11,11 @@ package com.maddyhome.idea.vim.group;
 import com.intellij.openapi.diagnostic.Logger;
 import com.maddyhome.idea.vim.api.VimDigraphGroupBase;
 import com.maddyhome.idea.vim.api.VimEditor;
-import com.maddyhome.idea.vim.api.VimOutputPanel;
 import com.maddyhome.idea.vim.ex.ExOutputModel;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import com.maddyhome.idea.vim.newapi.IjVimEditor;
 import org.jetbrains.annotations.NotNull;
 
-import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
-
 public class DigraphGroup extends VimDigraphGroupBase {
 
   public void showDigraphs(@NotNull VimEditor editor) {
@@ -74,9 +71,7 @@ public class DigraphGroup extends VimDigraphGroupBase {
       }
     }
 
-    VimOutputPanel output = injector.getOutputPanel().getOrCreate(editor, injector.getExecutionContextManager().getEditorExecutionContext(editor));
-    output.addText(res.toString(), true );
-    output.show();
+    ExOutputModel.getInstance(((IjVimEditor) editor).getEditor()).output(res.toString());
   }
 
   private static final Logger logger = Logger.getInstance(DigraphGroup.class.getName());

src/main/java/com/maddyhome/idea/vim/group/EditorGroup.java

@@ -374,9 +374,9 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
           if (activeCommandLine != null) {
             activeCommandLine.close(true, false);
           }
-          VimOutputPanel outputPanel = injector.getOutputPanel().getCurrentOutputPanel();
-          if (outputPanel != null) {
-            outputPanel.close();
+          ExOutputModel exOutputModel = ExOutputModel.tryGetInstance(editor);
+          if (exOutputModel != null) {
+            exOutputModel.close();
           }
           VimModalInput modalInput = injector.getModalInput().getCurrentModalInput();
           if (modalInput != null) {

src/main/java/com/maddyhome/idea/vim/group/HistoryGroup.java

@@ -14,7 +14,9 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.history.*;
+import com.maddyhome.idea.vim.history.HistoryBlock;
+import com.maddyhome.idea.vim.history.HistoryEntry;
+import com.maddyhome.idea.vim.history.VimHistoryBase;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -33,20 +35,21 @@ public class HistoryGroup extends VimHistoryBase implements PersistentStateCompo
     logger.debug("saveData");
     Element hist = new Element("history");
 
-    for (Type type : getHistories().keySet()) {
-      saveData(hist, type);
-    }
+    saveData(hist, SEARCH);
+    saveData(hist, COMMAND);
+    saveData(hist, EXPRESSION);
+    saveData(hist, INPUT);
 
     element.addContent(hist);
   }
 
-  private void saveData(@NotNull Element element, VimHistory.Type type) {
-    final HistoryBlock block = getHistories().get(type);
+  private void saveData(@NotNull Element element, String key) {
+    final HistoryBlock block = getHistories().get(key);
     if (block == null) {
       return;
     }
 
-    final Element root = new Element("history-" + typeToKey(type));
+    final Element root = new Element("history-" + key);
 
     for (HistoryEntry entry : block.getEntries()) {
       final Element entryElement = new Element("entry");
@@ -64,10 +67,10 @@ public class HistoryGroup extends VimHistoryBase implements PersistentStateCompo
       return;
     }
 
-    for (Element child : hist.getChildren()) {
-      String key = child.getName().replace("history-", "");
-      readData(hist, key);
-    }
+    readData(hist, SEARCH);
+    readData(hist, COMMAND);
+    readData(hist, EXPRESSION);
+    readData(hist, INPUT);
   }
 
   private void readData(@NotNull Element element, String key) {
@@ -77,7 +80,7 @@ public class HistoryGroup extends VimHistoryBase implements PersistentStateCompo
     }
 
     block = new HistoryBlock();
-    getHistories().put(getTypeForString(key), block);
+    getHistories().put(key, block);
 
     final Element root = element.getChild("history-" + key);
     if (root != null) {
@@ -91,25 +94,6 @@ public class HistoryGroup extends VimHistoryBase implements PersistentStateCompo
     }
   }
 
-  private String typeToKey(VimHistory.Type type) {
-    if (type instanceof VimHistory.Type.Search) {
-      return SEARCH;
-    }
-    if (type instanceof VimHistory.Type.Command) {
-      return COMMAND;
-    }
-    if (type instanceof VimHistory.Type.Expression) {
-      return EXPRESSION;
-    }
-    if (type instanceof VimHistory.Type.Input) {
-      return INPUT;
-    }
-    if (type instanceof VimHistory.Type.Custom) {
-      return ((Type.Custom) type).getId();
-    }
-    return "unreachable";
-  }
-
   @Nullable
   @Override
   public Element getState() {

src/main/java/com/maddyhome/idea/vim/group/KeyGroup.java

@@ -26,7 +26,10 @@ import com.maddyhome.idea.vim.EventFacade;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.action.VimShortcutKeyAction;
 import com.maddyhome.idea.vim.action.change.LazyVimCommand;
-import com.maddyhome.idea.vim.api.*;
+import com.maddyhome.idea.vim.api.NativeAction;
+import com.maddyhome.idea.vim.api.VimEditor;
+import com.maddyhome.idea.vim.api.VimInjectorKt;
+import com.maddyhome.idea.vim.api.VimKeyGroupBase;
 import com.maddyhome.idea.vim.command.MappingMode;
 import com.maddyhome.idea.vim.ex.ExOutputModel;
 import com.maddyhome.idea.vim.key.*;
@@ -77,6 +80,25 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
                                                           ((IjVimEditor)editor).getEditor().getComponent());
   }
 
+  public boolean showKeyMappings(@NotNull Set<? extends MappingMode> modes, @NotNull Editor editor) {
+    List<Pair<EnumSet<MappingMode>, MappingInfo>> rows = getKeyMappingRows(modes);
+    final StringBuilder builder = new StringBuilder();
+    for (Pair<EnumSet<MappingMode>, MappingInfo> row : rows) {
+      MappingInfo mappingInfo = row.getSecond();
+      builder.append(StringsKt.padEnd(getModesStringCode(row.getFirst()), 2, ' '));
+      builder.append(" ");
+      builder.append(StringsKt.padEnd(VimInjectorKt.getInjector().getParser().toKeyNotation(mappingInfo.getFromKeys()), 11, ' '));
+      builder.append(" ");
+      builder.append(mappingInfo.isRecursive() ? " " : "*");
+      builder.append(" ");
+      builder.append(mappingInfo.getPresentableString());
+      builder.append("\n");
+    }
+    ExOutputModel.getInstance(editor).output(builder.toString());
+    return true;
+  }
+
+
   @Override
   public void updateShortcutKeysRegistration() {
     for (VimEditor editor : injector.getEditorGroup().getEditors()) {
@@ -336,22 +358,6 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
 
   @Override
   public boolean showKeyMappings(@NotNull Set<? extends MappingMode> modes, @NotNull VimEditor editor) {
-    List<Pair<EnumSet<MappingMode>, MappingInfo>> rows = getKeyMappingRows(modes);
-    final StringBuilder builder = new StringBuilder();
-    for (Pair<EnumSet<MappingMode>, MappingInfo> row : rows) {
-      MappingInfo mappingInfo = row.getSecond();
-      builder.append(StringsKt.padEnd(getModesStringCode(row.getFirst()), 2, ' '));
-      builder.append(" ");
-      builder.append(StringsKt.padEnd(VimInjectorKt.getInjector().getParser().toKeyNotation(mappingInfo.getFromKeys()), 11, ' '));
-      builder.append(" ");
-      builder.append(mappingInfo.isRecursive() ? " " : "*");
-      builder.append(" ");
-      builder.append(mappingInfo.getPresentableString());
-      builder.append("\n");
-    }
-    VimOutputPanel outputPanel = injector.getOutputPanel().getOrCreate(editor, injector.getExecutionContextManager().getEditorExecutionContext(editor));
-    outputPanel.addText(builder.toString(), true);
-    outputPanel.show();
-    return true;
+    return showKeyMappings(modes, ((IjVimEditor) editor).getEditor());
   }
 }

src/main/java/com/maddyhome/idea/vim/group/MotionGroup.kt

@@ -35,7 +35,7 @@ import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.ExternalActionHandler
+import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.handler.Motion
 import com.maddyhome.idea.vim.handler.Motion.AbsoluteOffset
 import com.maddyhome.idea.vim.handler.MotionActionHandler
@@ -193,16 +193,21 @@ internal class MotionGroup : VimMotionGroupBase() {
       argument: Argument,
       operatorArguments: OperatorArguments,
     ): TextRange? {
-      if (argument !is Argument.Motion) {
-        throw RuntimeException("Unexpected argument passed to getMotionRange2: $argument")
-      }
-
       var start: Int
       var end: Int
+      if (argument.type === Argument.Type.OFFSETS) {
+        val offsets = argument.offsets[caret.vim] ?: return null
+        val (first, second) = offsets.getNativeStartAndEnd()
+        start = first
+        end = second
+      } else {
+        val cmd = argument.motion
+        // Normalize the counts between the command and the motion argument
+        val cnt = cmd.count * operatorArguments.count1
+        val raw = if (operatorArguments.count0 == 0 && cmd.rawCount == 0) 0 else cnt
+        if (cmd.action is MotionActionHandler) {
+          val action = cmd.action as MotionActionHandler
 
-      val action = argument.motion
-      when (action) {
-        is MotionActionHandler -> {
           // This is where we are now
           start = caret.offset
 
@@ -211,8 +216,8 @@ internal class MotionGroup : VimMotionGroupBase() {
             editor.vim,
             caret.vim,
             IjEditorExecutionContext(context!!),
-            argument.argument,
-            operatorArguments
+            cmd.argument,
+            operatorArguments.withCount0(raw),
           )
 
           // Invalid motion
@@ -228,32 +233,22 @@ internal class MotionGroup : VimMotionGroupBase() {
               end++
             }
           }
-        }
-
-        is TextObjectActionHandler -> {
-          val range = action.getRange(
-            editor.vim,
-            caret.vim,
-            IjEditorExecutionContext(context!!),
-            operatorArguments.count1,
-            operatorArguments.count0
-          ) ?: return null
+        } else if (cmd.action is TextObjectActionHandler) {
+          val action = cmd.action as TextObjectActionHandler
+          val range =
+            action.getRange(editor.vim, caret.vim, IjEditorExecutionContext(context!!), cnt, raw) ?: return null
           start = range.startOffset
           end = range.endOffset
-          if (argument.isLinewiseMotion()) end--
+          if (cmd.isLinewiseMotion()) end--
+        } else {
+          throw RuntimeException(
+            "Commands doesn't take " + cmd.action.javaClass.simpleName + " as an operator",
+          )
         }
-
-        is ExternalActionHandler -> {
-          val range = action.getRange(caret.vim) ?: return null
-          start = range.startOffset
-          end = range.endOffset
-        }
-
-        else -> throw RuntimeException("Commands doesn't take " + action.javaClass.simpleName + " as an operator")
       }
 
       // This is a kludge for dw, dW, and d[w. Without this kludge, an extra newline is operated when it shouldn't be.
-      val id = argument.motion.id
+      val id = argument.motion.action.id
       if (id == VimChangeGroupBase.VIM_MOTION_WORD_RIGHT || id == VimChangeGroupBase.VIM_MOTION_BIG_WORD_RIGHT || id == VimChangeGroupBase.VIM_MOTION_CAMEL_RIGHT) {
         val text = editor.document.charsSequence.subSequence(start, end).toString()
         val lastNewLine = text.lastIndexOf('\n')
@@ -263,7 +258,6 @@ internal class MotionGroup : VimMotionGroupBase() {
           }
         }
       }
-
       return TextRange(start, end)
     }
 
@@ -323,7 +317,7 @@ internal class MotionGroup : VimMotionGroupBase() {
               is Mode.CMD_LINE -> {
                 val commandLine = injector.commandLine.getActiveCommandLine() ?: return
                 commandLine.close(refocusOwningEditor = false, resetCaret = false)
-                injector.outputPanel.getCurrentOutputPanel()?.close()
+                ExOutputModel.tryGetInstance(editor)?.close()
               }
               else -> {}
             }

src/main/java/com/maddyhome/idea/vim/handler/VimEnterHandler.kt

@@ -218,17 +218,13 @@ internal class VimEnterHandler(nextHandler: EditorActionHandler?) : VimKeyHandle
 internal class VimEscHandler(nextHandler: EditorActionHandler) : VimKeyHandler(nextHandler) {
   override val key: String = "<Esc>"
 
-  private val ideaVimSupportDialog
-    get() = injector.globalIjOptions().ideavimsupport.contains(IjOptionConstants.ideavimsupport_dialog)
-  
   override fun isHandlerEnabled(editor: Editor, dataContext: DataContext?): Boolean {
+    val ideaVimSupportDialog =
+      injector.globalIjOptions().ideavimsupport.contains(IjOptionConstants.ideavimsupport_dialog)
+
     return editor.isPrimaryEditor() ||
-      EditorHelper.isFileEditor(editor) && vimStateNeedsToHandleEscape(editor) ||
-      ideaVimSupportDialog && vimStateNeedsToHandleEscape(editor)
-  }
-  
-  private fun vimStateNeedsToHandleEscape(editor: Editor): Boolean {
-    return !editor.vim.mode.inNormalMode || KeyHandler.getInstance().keyHandlerState.mappingState.hasKeys
+      EditorHelper.isFileEditor(editor) && !editor.vim.mode.inNormalMode ||
+      ideaVimSupportDialog && !editor.vim.mode.inNormalMode
   }
 }
 

src/main/java/com/maddyhome/idea/vim/helper/IjActionExecutor.kt

@@ -61,9 +61,6 @@ internal class IjActionExecutor : VimActionExecutor {
     get() = IdeActions.ACTION_EXPAND_REGION
   override val ACTION_EXPAND_REGION_RECURSIVELY: String
     get() = IdeActions.ACTION_EXPAND_REGION_RECURSIVELY
-  override val ACTION_EXPAND_COLLAPSE_TOGGLE: String
-    // [VERSION UPDATE] 2024.3+ Replace raw "ExpandCollapseToggleAction" with IdeActions.ACTION_EXPAND_COLLAPSE_TOGGLE_REGION from the platform.
-    get() = "ExpandCollapseToggleAction"
 
   /**
    * Execute an action

src/main/java/com/maddyhome/idea/vim/helper/ModeExtensions.kt

@@ -16,6 +16,7 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.getLineEndForOffset
 import com.maddyhome.idea.vim.api.getLineStartForOffset
+import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.listener.SelectionVimListenerSuppressor
 import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
 import com.maddyhome.idea.vim.newapi.IjVimCaret
@@ -93,6 +94,6 @@ internal fun VimEditor.exitSelectMode(adjustCaretPosition: Boolean) {
   }
 }
 
-internal fun Editor.exitInsertMode(context: DataContext) {
-  VimPlugin.getChange().processEscape(IjVimEditor(this), IjEditorExecutionContext(context))
+internal fun Editor.exitInsertMode(context: DataContext, operatorArguments: OperatorArguments) {
+  VimPlugin.getChange().processEscape(IjVimEditor(this), IjEditorExecutionContext(context), operatorArguments)
 }

src/main/java/com/maddyhome/idea/vim/helper/UserDataManager.kt

@@ -24,7 +24,6 @@ import com.maddyhome.idea.vim.common.InsertSequence
 import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.group.visual.VisualChange
 import com.maddyhome.idea.vim.group.visual.vimLeadSelectionOffset
-import com.maddyhome.idea.vim.common.VimEditorReplaceMask
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.VimStateMachine
 import com.maddyhome.idea.vim.state.mode.Mode
@@ -125,7 +124,6 @@ internal var Editor.vimExOutput: ExOutputModel? by userData()
 internal var Editor.vimTestInputModel: TestInputModel? by userData()
 
 internal var Editor.vimChangeActionSwitchMode: Mode? by userData()
-internal var Editor.replaceMask: VimEditorReplaceMask? by userData()
 
 internal var Caret.currentInsert: InsertSequence? by userData()
 internal val Caret.insertHistory: MutableList<InsertSequence> by userDataOr { mutableListOf() }

src/main/java/com/maddyhome/idea/vim/listener/IJEditorFocusListener.kt

@@ -15,6 +15,7 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.common.EditorListener
 import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.newapi.ij
@@ -64,7 +65,7 @@ class IJEditorFocusListener : EditorListener {
       val context: ExecutionContext = injector.executionContextManager.getEditorExecutionContext(editor)
       val mode = injector.vimState.mode
       when (mode) {
-        is Mode.INSERT -> editor.exitInsertMode(context)
+        is Mode.INSERT -> editor.exitInsertMode(context, OperatorArguments(false, 0, mode))
         else -> {}
       }
     }
@@ -78,4 +79,3 @@ class IJEditorFocusListener : EditorListener {
     KeyHandler.getInstance().reset(editor)
   }
 }
-

src/main/java/com/maddyhome/idea/vim/listener/IdeaSpecifics.kt

@@ -16,9 +16,7 @@ import com.intellij.codeInsight.lookup.impl.actions.ChooseItemAction
 import com.intellij.codeInsight.template.Template
 import com.intellij.codeInsight.template.TemplateEditingAdapter
 import com.intellij.codeInsight.template.TemplateManagerListener
-import com.intellij.codeInsight.template.impl.TemplateManagerImpl
 import com.intellij.codeInsight.template.impl.TemplateState
-import com.intellij.codeInsight.template.impl.actions.NextVariableAction
 import com.intellij.find.FindModelListener
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionUpdateThread
@@ -154,10 +152,6 @@ internal object IdeaSpecifics {
             KeyHandler.getInstance().reset(it.vim)
           }
         }
-        else if (action is NextVariableAction && TemplateManagerImpl.getTemplateState(editor) == null) {
-          editor.vim.exitInsertMode(event.dataContext.vim)
-          KeyHandler.getInstance().reset(editor.vim)
-        }
         //endregion
 
         if (caretOffset != -1 && caretOffset != editor.caretModel.offset) {

src/main/java/com/maddyhome/idea/vim/listener/VimListenerManager.kt

@@ -66,6 +66,7 @@ import com.maddyhome.idea.vim.api.coerceOffset
 import com.maddyhome.idea.vim.api.getLineEndForOffset
 import com.maddyhome.idea.vim.api.getLineStartForOffset
 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.group.EditorGroup
 import com.maddyhome.idea.vim.group.FileGroup
 import com.maddyhome.idea.vim.group.IjOptions
@@ -394,8 +395,7 @@ internal object VimListenerManager {
           editor.vim.mode = Mode.NORMAL()
           KeyHandler.getInstance().reset(editor.vim)
         }
-        // Breaks relativenumber for some reason
-//        injector.scroll.scrollCaretIntoView(editor.vim)
+        injector.scroll.scrollCaretIntoView(editor.vim)
       }
       
       MotionGroup.fileEditorManagerSelectionChangedCallback(event)
@@ -748,7 +748,7 @@ internal object VimListenerManager {
         injector.commandLine.getActiveCommandLine()?.close(refocusOwningEditor = true, resetCaret = false)
         injector.modalInput.getCurrentModalInput()?.deactivate(refocusOwningEditor = true, resetCaret = false)
 
-        injector.outputPanel.getCurrentOutputPanel()?.close()
+        ExOutputModel.tryGetInstance(editor)?.close()
 
         val caretModel = editor.caretModel
         if (editor.vim.mode.selectionType != null) {
@@ -777,7 +777,7 @@ internal object VimListenerManager {
         injector.commandLine.getActiveCommandLine()?.close(refocusOwningEditor = true, resetCaret = false)
         injector.modalInput.getCurrentModalInput()?.deactivate(refocusOwningEditor = true, resetCaret = false)
 
-        injector.outputPanel.getCurrentOutputPanel()?.close()
+        ExOutputModel.getInstance(event.editor).close()
       }
     }
   }

src/main/java/com/maddyhome/idea/vim/newapi/IjLiveRange.kt

@@ -14,27 +14,6 @@ import com.maddyhome.idea.vim.common.LiveRange
 internal class IjLiveRange(val marker: RangeMarker) : LiveRange {
   override val startOffset: Int
     get() = marker.startOffset
-
-  override val endOffset: Int
-    get() = marker.endOffset
-
-  override fun equals(other: Any?): Boolean {
-    if (this === other) return true
-    if (javaClass != other?.javaClass) return false
-
-    other as IjLiveRange
-
-    if (startOffset != other.startOffset) return false
-    if (endOffset != other.endOffset) return false
-
-    return true
-  }
-
-  override fun hashCode(): Int {
-    var result = startOffset
-    result = 31 * result + endOffset
-    return result
-  }
 }
 
 val RangeMarker.vim: LiveRange

src/main/java/com/maddyhome/idea/vim/newapi/IjVimEditor.kt

@@ -38,12 +38,12 @@ import com.maddyhome.idea.vim.api.VimSelectionModel
 import com.maddyhome.idea.vim.api.VimVisualPosition
 import com.maddyhome.idea.vim.api.VirtualFile
 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.common.IndentConfig
+import com.maddyhome.idea.vim.common.IndentConfig.Companion.create
 import com.maddyhome.idea.vim.common.LiveRange
 import com.maddyhome.idea.vim.common.ModeChangeListener
 import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.common.VimEditorReplaceMask
-import com.maddyhome.idea.vim.common.forgetAllReplaceMasks
 import com.maddyhome.idea.vim.group.visual.vimSetSystemBlockSelectionSilently
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.StrictMode
@@ -53,7 +53,6 @@ import com.maddyhome.idea.vim.helper.fileSize
 import com.maddyhome.idea.vim.helper.getTopLevelEditor
 import com.maddyhome.idea.vim.helper.inExMode
 import com.maddyhome.idea.vim.helper.isTemplateActive
-import com.maddyhome.idea.vim.helper.replaceMask
 import com.maddyhome.idea.vim.helper.vimChangeActionSwitchMode
 import com.maddyhome.idea.vim.helper.vimLastSelectionType
 import com.maddyhome.idea.vim.impl.state.VimStateMachineImpl
@@ -76,11 +75,6 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
   // TBH, I don't like the names. Need to think a bit more about this
   val editor = editor.getTopLevelEditor()
   val originalEditor = editor
-  override var replaceMask: VimEditorReplaceMask?
-    get() = editor.replaceMask
-    set(value) {
-      editor.replaceMask = value
-    }
 
   override fun updateMode(mode: Mode) {
     (injector.vimState as VimStateMachineImpl).mode = mode
@@ -97,7 +91,7 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
       editor.vimChangeActionSwitchMode = value
     }
   override val indentConfig: VimIndentConfig
-    get() = IndentConfig.create(editor)
+    get() = create(editor)
 
   override fun fileSize(): Long = editor.fileSize.toLong()
 
@@ -404,8 +398,8 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
     return editor.visualPositionToOffset(VisualPosition(position.line, position.column, position.leansRight))
   }
 
-  override fun exitInsertMode(context: ExecutionContext) {
-    editor.exitInsertMode(context.ij)
+  override fun exitInsertMode(context: ExecutionContext, operatorArguments: OperatorArguments) {
+    editor.exitInsertMode(context.ij, operatorArguments)
   }
 
   override fun exitSelectModeNative(adjustCaret: Boolean) {
@@ -477,7 +471,6 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
     get() = (editor as? EditorEx)?.isInsertMode ?: false
     set(value) {
       (editor as? EditorEx)?.isInsertMode = value
-      forgetAllReplaceMasks()
     }
 
   override val document: VimDocument

src/main/java/com/maddyhome/idea/vim/package-info.java

@@ -0,0 +1,718 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+/**
+ * IdeaVim command index.
+ *
+ *
+ * 1. Insert mode
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ *
+ * |i_CTRL-@|             {@link com.maddyhome.idea.vim.action.change.insert.InsertPreviousInsertExitAction}
+ * |i_CTRL-A|             {@link com.maddyhome.idea.vim.action.change.insert.InsertPreviousInsertAction}
+ * |i_CTRL-C|             {@link com.maddyhome.idea.vim.action.change.insert.InsertExitModeAction}
+ * |i_CTRL-D|             {@link com.maddyhome.idea.vim.action.change.shift.ShiftLeftLinesAction}
+ * |i_CTRL-E|             {@link com.maddyhome.idea.vim.action.change.insert.InsertCharacterBelowCursorAction}
+ * |i_CTRL-G_j|           TO BE IMPLEMENTED
+ * |i_CTRL-G_k|           TO BE IMPLEMENTED
+ * |i_CTRL-G_u|           TO BE IMPLEMENTED
+ * |i_<BS>|               {@link com.maddyhome.idea.vim.action.editor.VimEditorBackSpace}
+ * |i_digraph|            IdeaVim enter digraph
+ * |i_CTRL-H|             IntelliJ editor backspace
+ * |i_<Tab>|              {@link com.maddyhome.idea.vim.action.editor.VimEditorTab}
+ * |i_CTRL-I|             IntelliJ editor tab
+ * |i_<NL>|               {@link com.maddyhome.idea.vim.action.change.insert.InsertEnterAction}
+ * |i_CTRL-J|             TO BE IMPLEMENTED
+ * |i_CTRL-K|             {@link com.maddyhome.idea.vim.action.change.insert.InsertCompletedDigraphAction}
+ * |i_CTRL-L|             TO BE IMPLEMENTED
+ * |i_<CR>|               {@link com.maddyhome.idea.vim.action.change.insert.InsertEnterAction}
+ * |i_CTRL-M|             {@link com.maddyhome.idea.vim.action.change.insert.InsertEnterAction}
+ * |i_CTRL-N|             {@link com.maddyhome.idea.vim.action.window.LookupDownAction}
+ * |i_CTRL-O|             {@link com.maddyhome.idea.vim.action.change.insert.InsertSingleCommandAction}
+ * |i_CTRL-P|             {@link com.maddyhome.idea.vim.action.window.LookupUpAction}
+ * |i_CTRL-Q|             TO BE IMPLEMENTED
+ * |i_CTRL-R|             {@link com.maddyhome.idea.vim.action.change.insert.InsertRegisterAction}
+ * |i_CTRL-R_CTRL-R|      TO BE IMPLEMENTED
+ * |i_CTRL-R_CTRL-O|      TO BE IMPLEMENTED
+ * |i_CTRL-R_CTRL-P|      TO BE IMPLEMENTED
+ * |i_CTRL-T|             {@link com.maddyhome.idea.vim.action.change.shift.ShiftRightLinesAction}
+ * |i_CTRL-U|             {@link com.maddyhome.idea.vim.action.change.insert.InsertDeleteInsertedTextAction}
+ * |i_CTRL-V|             {@link com.maddyhome.idea.vim.action.change.insert.InsertCompletedLiteralAction}
+ * |i_CTRL-V_digit|       {@link com.maddyhome.idea.vim.action.change.insert.InsertCompletedLiteralAction}
+ * |i_CTRL-W|             {@link com.maddyhome.idea.vim.action.change.insert.InsertDeletePreviousWordAction}
+ * |i_CTRL-X|             TO BE IMPLEMENTED
+ * |i_CTRL-Y|             {@link com.maddyhome.idea.vim.action.change.insert.InsertCharacterAboveCursorAction}
+ * |i_CTRL-Z|             TO BE IMPLEMENTED
+ * |i_<Esc>|              {@link com.maddyhome.idea.vim.action.change.insert.InsertExitModeAction}
+ * |i_CTRL-[|             {@link com.maddyhome.idea.vim.action.change.insert.InsertExitModeAction}
+ * |i_CTRL-\_CTRL-N|      {@link com.maddyhome.idea.vim.action.ResetModeAction}
+ * |i_CTRL-\_CTRL-G|      TO BE IMPLEMENTED
+ * |i_CTRL-]}             TO BE IMPLEMENTED
+ * |i_CTRL-^|             TO BE IMPLEMENTED
+ * |i_CTRL-_|             TO BE IMPLEMENTED
+ * |i_0_CTRL-D|           TO BE IMPLEMENTED
+ * |i_^_CTRL-D|           TO BE IMPLEMENTED
+ * |i_<Del>|              {@link com.maddyhome.idea.vim.action.editor.VimEditorDelete}
+ * |i_<Left>|             {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLeftInsertModeAction}
+ * |i_<S-Left>|           {@link com.maddyhome.idea.vim.action.motion.text.MotionWordLeftInsertAction}
+ * |i_<C-Left>|           {@link com.maddyhome.idea.vim.action.motion.text.MotionWordLeftInsertAction}
+ * |i_<Right>|            {@link com.maddyhome.idea.vim.action.motion.leftright.MotionRightInsertAction}
+ * |i_<S-Right>|          {@link com.maddyhome.idea.vim.action.motion.text.MotionWordRightInsertAction}
+ * |i_<C-Right>|          {@link com.maddyhome.idea.vim.action.motion.text.MotionWordRightInsertAction}
+ * |i_<Up>|               {@link com.maddyhome.idea.vim.action.editor.VimEditorUp}
+ * |i_<S-Up>|             {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageUpInsertModeAction}
+ * |i_<Down>|             {@link com.maddyhome.idea.vim.action.editor.VimEditorDown}
+ * |i_<S-Down>|           {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageDownInsertModeAction}
+ * |i_<Home>|             {@link com.maddyhome.idea.vim.action.motion.leftright.MotionFirstColumnInsertModeAction}
+ * |i_<C-Home>|           {@link com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineFirstInsertAction}
+ * |i_<End>|              {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLastColumnInsertAction}
+ * |i_<C-End>|            {@link com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastEndInsertAction}
+ * |i_<Insert>|           {@link com.maddyhome.idea.vim.action.change.insert.InsertInsertAction}
+ * |i_<PageUp>|           {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageUpInsertModeAction}
+ * |i_<PageDown>|         {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageDownInsertModeAction}
+ * |i_<F1>|               IntelliJ help
+ * |i_<Insert>|           IntelliJ editor toggle insert/replace
+ * |i_CTRL-X_index|       TO BE IMPLEMENTED
+ *
+ *
+ * 2. Normal mode
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ *
+ * |CTRL-A|               {@link com.maddyhome.idea.vim.action.change.change.number.ChangeNumberIncAction}
+ * |CTRL-B|               {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageUpAction}
+ * |CTRL-C|               TO BE IMPLEMENTED
+ * |CTRL-D|               {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfPageDownAction}
+ * |CTRL-E|               {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLineDownAction}
+ * |CTRL-F|               {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageDownAction}
+ * |CTRL-G|               {@link com.maddyhome.idea.vim.action.file.FileGetFileInfoAction}
+ * |<BS>|                 {@link com.maddyhome.idea.vim.action.motion.leftright.MotionBackspaceAction}
+ * |CTRL-H|               {@link com.maddyhome.idea.vim.action.motion.leftright.MotionBackspaceAction}
+ * |<Tab>|                TO BE IMPLEMENTED
+ * |CTRL-I|               {@link com.maddyhome.idea.vim.action.motion.mark.MotionJumpNextAction}
+ * |<NL>|                 {@link com.maddyhome.idea.vim.action.motion.updown.MotionDownNotLineWiseAction}
+ * |CTRL-J|               TO BE IMPLEMENTED
+ * |CTRL-L|               not applicable
+ * |<CR>|                 {@link com.maddyhome.idea.vim.action.motion.updown.EnterNormalAction}
+ * |CTRL-M|               {@link com.maddyhome.idea.vim.action.motion.updown.MotionDownFirstNonSpaceAction}
+ * |CTRL-N|               {@link com.maddyhome.idea.vim.action.motion.updown.MotionDownCtrlNAction}
+ * |CTRL-O|               {@link com.maddyhome.idea.vim.action.motion.mark.MotionJumpPreviousAction}
+ * |CTRL-P|               {@link com.maddyhome.idea.vim.action.motion.updown.MotionUpCtrlPAction}
+ * |CTRL-R|               {@link com.maddyhome.idea.vim.action.change.RedoAction}
+ * |CTRL-T|               TO BE IMPLEMENTED
+ * |CTRL-U|               {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfPageUpAction}
+ * |CTRL-V|               {@link com.maddyhome.idea.vim.action.motion.visual.VisualToggleBlockModeAction}
+ * |CTRL-W|               see window commands
+ * |CTRL-X|               {@link com.maddyhome.idea.vim.action.change.change.number.ChangeNumberDecAction}
+ * |CTRL-Y|               {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLineUpAction}
+ * |CTRL-Z|               TO BE IMPLEMENTED
+ * |CTRL-]|               {@link com.maddyhome.idea.vim.action.motion.search.GotoDeclarationAction}
+ * |CTRL-6|               {@link com.maddyhome.idea.vim.action.file.FilePreviousAction}
+ * |CTRL-\CTRL-N|         {@link com.maddyhome.idea.vim.action.ResetModeAction}
+ * |<Space>|              {@link com.maddyhome.idea.vim.action.motion.leftright.MotionSpaceAction}
+ * |!|                    {@link com.maddyhome.idea.vim.action.change.change.FilterMotionAction}
+ * |!!|                   translated to !_
+ * |quote|                handled by command key parser
+ * |#|                    {@link com.maddyhome.idea.vim.action.motion.search.SearchWholeWordBackwardAction}
+ * |$|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLastColumnAction}
+ * |%|                    {@link com.maddyhome.idea.vim.action.motion.updown.MotionPercentOrMatchAction}
+ * |&|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeLastSearchReplaceAction}
+ * |'|                    {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkLineAction}
+ * |''|                   ?
+ * ...
+ * |(|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionSentencePreviousStartAction}
+ * |)|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionSentenceNextStartAction}
+ * |star|                 {@link com.maddyhome.idea.vim.action.motion.search.SearchWholeWordForwardAction}
+ * |+|                    {@link com.maddyhome.idea.vim.action.motion.updown.MotionDownFirstNonSpaceAction}
+ * |,|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLastMatchCharReverseAction}
+ * |-|                    {@link com.maddyhome.idea.vim.action.motion.updown.MotionUpFirstNonSpaceAction}
+ * |.|                    {@link com.maddyhome.idea.vim.action.change.RepeatChangeAction}
+ * |/|                    {@link com.maddyhome.idea.vim.action.motion.search.SearchEntryFwdAction}
+ * |:|                    {@link com.maddyhome.idea.vim.action.ex.ExEntryAction}
+ * |;|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLastMatchCharAction}
+ * |<|                    {@link com.maddyhome.idea.vim.action.change.shift.ShiftLeftMotionAction}
+ * |<<|                   translated to <_
+ * |=|                    {@link com.maddyhome.idea.vim.action.change.shift.AutoIndentMotionAction}
+ * |==|                   translated to =_
+ * |>|                    {@link com.maddyhome.idea.vim.action.change.shift.ShiftRightMotionAction}
+ * |>>|                   translated to >_
+ * |?|                    {@link com.maddyhome.idea.vim.action.motion.search.SearchEntryRevAction}
+ * |@|                    {@link com.maddyhome.idea.vim.action.macro.PlaybackRegisterAction}
+ * |A|                    {@link com.maddyhome.idea.vim.action.change.insert.InsertAfterLineEndAction}
+ * |B|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionBigWordLeftAction}
+ * |C|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeEndOfLineAction}
+ * |D|                    {@link com.maddyhome.idea.vim.action.change.delete.DeleteEndOfLineAction}
+ * |E|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionBigWordEndRightAction}
+ * |F|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLeftMatchCharAction}
+ * |G|                    {@link com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastAction}
+ * |H|                    {@link com.maddyhome.idea.vim.action.motion.screen.MotionFirstScreenLineAction}
+ * |H|                    {@link com.maddyhome.idea.vim.action.motion.screen.MotionOpPendingFirstScreenLineAction}
+ * |I|                    {@link com.maddyhome.idea.vim.action.change.insert.InsertBeforeFirstNonBlankAction}
+ * |J|                    {@link com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesSpacesAction}
+ * |K|                    {@link com.maddyhome.idea.vim.action.editor.VimQuickJavaDoc}
+ * |L|                    {@link com.maddyhome.idea.vim.action.motion.screen.MotionLastScreenLineAction}
+ * |L|                    {@link com.maddyhome.idea.vim.action.motion.screen.MotionOpPendingLastScreenLineAction}
+ * |M|                    {@link com.maddyhome.idea.vim.action.motion.screen.MotionMiddleScreenLineAction}
+ * |N|                    {@link com.maddyhome.idea.vim.action.motion.search.SearchAgainPreviousAction}
+ * |O|                    {@link com.maddyhome.idea.vim.action.change.insert.InsertNewLineAboveAction}
+ * |P|                    {@link com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorAction}
+ * |Q|                    TO BE IMPLEMENTED
+ * |R|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeReplaceAction}
+ * |S|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeLineAction}
+ * |T|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLeftTillMatchCharAction}
+ * |U|                    ?
+ * |V|                    {@link com.maddyhome.idea.vim.action.motion.visual.VisualToggleLineModeAction}
+ * |W|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionBigWordRightAction}
+ * |X|                    {@link com.maddyhome.idea.vim.action.change.delete.DeleteCharacterLeftAction}
+ * |Y|                    {@link com.maddyhome.idea.vim.action.copy.YankLineAction}
+ * |ZZ|                   {@link com.maddyhome.idea.vim.action.file.FileSaveCloseAction}
+ * |ZQ|                   {@link com.maddyhome.idea.vim.action.file.FileSaveCloseAction}
+ * |[|                    see bracket commands
+ * |]|                    see bracket commands
+ * |^|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionFirstNonSpaceAction}
+ * |_|                    {@link com.maddyhome.idea.vim.action.motion.updown.MotionDownLess1FirstNonSpaceAction}
+ * |`|                    {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkAction}
+ * |``|                   ?
+ * ...
+ * |0|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionFirstColumnAction}
+ * |a|                    {@link com.maddyhome.idea.vim.action.change.insert.InsertAfterCursorAction}
+ * |b|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionWordLeftAction}
+ * |c|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeMotionAction}
+ * |cc|                   translated to c_
+ * |d|                    {@link com.maddyhome.idea.vim.action.change.delete.DeleteMotionAction}
+ * |dd|                   translated to d_
+ * |do|                   TO BE IMPLEMENTED
+ * |dp|                   TO BE IMPLEMENTED
+ * |e|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionWordEndRightAction}
+ * |f|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionRightMatchCharAction}
+ * |g|                    see commands starting with 'g'
+ * |h|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLeftAction}
+ * |i|                    {@link com.maddyhome.idea.vim.action.change.insert.InsertBeforeCursorAction}
+ * |j|                    {@link com.maddyhome.idea.vim.action.motion.updown.MotionDownAction}
+ * |k|                    {@link com.maddyhome.idea.vim.action.motion.updown.MotionUpAction}
+ * |l|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionRightAction}
+ * |m|                    {@link com.maddyhome.idea.vim.action.motion.mark.MotionMarkAction}
+ * |n|                    {@link com.maddyhome.idea.vim.action.motion.search.SearchAgainNextAction}
+ * |o|                    {@link com.maddyhome.idea.vim.action.change.insert.InsertNewLineBelowAction}
+ * |p|                    {@link com.maddyhome.idea.vim.action.copy.PutTextAfterCursorAction}
+ * |q|                    {@link com.maddyhome.idea.vim.action.macro.ToggleRecordingAction}
+ * |r|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeCharacterAction}
+ * |s|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeCharactersAction}
+ * |t|                    {@link com.maddyhome.idea.vim.action.motion.leftright.MotionRightTillMatchCharAction}
+ * |u|                    {@link com.maddyhome.idea.vim.action.change.UndoAction}
+ * |v|                    {@link com.maddyhome.idea.vim.action.motion.visual.VisualToggleCharacterModeAction}
+ * |w|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionWordRightAction}
+ * |x|                    {@link com.maddyhome.idea.vim.action.change.delete.DeleteCharacterRightAction}
+ * |y|                    {@link com.maddyhome.idea.vim.action.copy.YankMotionAction}
+ * |yy|                   translated to y_
+ * |z|                    see commands starting with 'z'
+ * |{|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionParagraphPreviousAction}
+ * |bar|                  {@link com.maddyhome.idea.vim.action.motion.leftright.MotionColumnAction}
+ * |}|                    {@link com.maddyhome.idea.vim.action.motion.text.MotionParagraphNextAction}
+ * |~|                    {@link com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleCharacterAction}
+ * |<C-End>|              {@link com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineLastEndAction}
+ * |<C-Home>|             {@link com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineFirstAction}
+ * |<C-Left>|             {@link com.maddyhome.idea.vim.action.motion.text.MotionWordLeftAction}
+ * |<C-Right>|            {@link com.maddyhome.idea.vim.action.motion.text.MotionWordRightAction}
+ * |<C-Down>|             {@link com.maddyhome.idea.vim.action.motion.scroll.CtrlDownAction}
+ * |<C-Up>|               {@link com.maddyhome.idea.vim.action.motion.scroll.CtrlUpAction}
+ * |<Del>|                {@link com.maddyhome.idea.vim.action.change.delete.DeleteCharacterAction}
+ * |<Down>|               {@link com.maddyhome.idea.vim.action.motion.updown.MotionArrowDownAction}
+ * |<End>|                {@link com.maddyhome.idea.vim.action.motion.leftright.MotionEndAction}
+ * |<F1>|                 IntelliJ help
+ * |<Home>|               {@link com.maddyhome.idea.vim.action.motion.leftright.MotionHomeAction}
+ * |<Insert>|             {@link com.maddyhome.idea.vim.action.change.insert.InsertBeforeCursorAction}
+ * |<Left>|               {@link com.maddyhome.idea.vim.action.motion.leftright.MotionArrowLeftAction}
+ * |<PageDown>|           {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageDownAction}
+ * |<PageUp>|             {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollPageUpAction}
+ * |<Right>|              {@link com.maddyhome.idea.vim.action.motion.leftright.MotionArrowRightAction}
+ * |<S-Down>|             {@link com.maddyhome.idea.vim.action.motion.updown.MotionShiftDownAction}
+ * |<S-Left>|             {@link com.maddyhome.idea.vim.action.motion.leftright.MotionShiftLeftAction}
+ * |<S-Right>|            {@link com.maddyhome.idea.vim.action.motion.leftright.MotionShiftRightAction}
+ * |<S-Up>|               {@link com.maddyhome.idea.vim.action.motion.updown.MotionShiftUpAction}
+ * |<S-Home>|             {@link com.maddyhome.idea.vim.action.motion.leftright.MotionShiftHomeAction}
+ * |<S-End>|              {@link com.maddyhome.idea.vim.action.motion.leftright.MotionShiftEndAction}
+ * |<Up>|                 {@link com.maddyhome.idea.vim.action.motion.updown.MotionArrowUpAction}
+ *
+ *
+ * 2.1. Text objects
+ *
+ * Text object commands are listed in the visual mode section.
+ *
+ *
+ * 2.2. Window commands
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ *
+ * |CTRL-W_+|             TO BE IMPLEMENTED
+ * |CTRL-W_-|             TO BE IMPLEMENTED
+ * |CTRL-W_<|             TO BE IMPLEMENTED
+ * |CTRL-W_=|             TO BE IMPLEMENTED
+ * |CTRL-W_>|             TO BE IMPLEMENTED
+ * |CTRL-W_H|             TO BE IMPLEMENTED
+ * |CTRL-W_J|             TO BE IMPLEMENTED
+ * |CTRL-W_K|             TO BE IMPLEMENTED
+ * |CTRL-W_L|             TO BE IMPLEMENTED
+ * |CTRL-W_P|             TO BE IMPLEMENTED
+ * |CTRL-W_R|             TO BE IMPLEMENTED
+ * |CTRL-W_S|             {@link com.maddyhome.idea.vim.action.window.HorizontalSplitAction}
+ * |CTRL-W_T|             TO BE IMPLEMENTED
+ * |CTRL-W_W|             {@link com.maddyhome.idea.vim.action.window.WindowPrevAction}
+ * |CTRL-W_]|             TO BE IMPLEMENTED
+ * |CTRL-W_^|             TO BE IMPLEMENTED
+ * |CTRL-W__|             TO BE IMPLEMENTED
+ * |CTRL-W_b|             TO BE IMPLEMENTED
+ * |CTRL-W_c|             {@link com.maddyhome.idea.vim.action.window.CloseWindowAction}
+ * |CTRL-W_d|             TO BE IMPLEMENTED
+ * |CTRL-W_f|             TO BE IMPLEMENTED
+ * |CTRL-W-F|             TO BE IMPLEMENTED
+ * |CTRL-W-g]|            TO BE IMPLEMENTED
+ * |CTRL-W-g}|            TO BE IMPLEMENTED
+ * |CTRL-W-gf|            TO BE IMPLEMENTED
+ * |CTRL-W-gF|            TO BE IMPLEMENTED
+ * |CTRL-W_h|             {@link com.maddyhome.idea.vim.action.window.WindowLeftAction}
+ * |CTRL-W_i|             TO BE IMPLEMENTED
+ * |CTRL-W_j|             {@link com.maddyhome.idea.vim.action.window.WindowDownAction}
+ * |CTRL-W_k|             {@link com.maddyhome.idea.vim.action.window.WindowUpAction}
+ * |CTRL-W_l|             {@link com.maddyhome.idea.vim.action.window.WindowRightAction}
+ * |CTRL-W_n|             TO BE IMPLEMENTED
+ * |CTRL-W_o|             {@link com.maddyhome.idea.vim.action.window.WindowOnlyAction}
+ * |CTRL-W_p|             TO BE IMPLEMENTED
+ * |CTRL-W_q|             TO BE IMPLEMENTED
+ * |CTRL-W_r|             TO BE IMPLEMENTED
+ * |CTRL-W_s|             {@link com.maddyhome.idea.vim.action.window.HorizontalSplitAction}
+ * |CTRL-W_t|             TO BE IMPLEMENTED
+ * |CTRL-W_v|             {@link com.maddyhome.idea.vim.action.window.VerticalSplitAction}
+ * |CTRL-W_w|             {@link com.maddyhome.idea.vim.action.window.WindowNextAction}
+ * |CTRL-W_x|             TO BE IMPLEMENTED
+ * |CTRL-W_z|             TO BE IMPLEMENTED
+ * |CTRL-W_bar|           TO BE IMPLEMENTED
+ * |CTRL-W_}|             TO BE IMPLEMENTED
+ * |CTRL-W_<Down>|        {@link com.maddyhome.idea.vim.action.window.WindowDownAction}
+ * |CTRL-W_<Up>|          {@link com.maddyhome.idea.vim.action.window.WindowUpAction}
+ * |CTRL-W_<Left>|        {@link com.maddyhome.idea.vim.action.window.WindowLeftAction}
+ * |CTRL-W_<Right>|       {@link com.maddyhome.idea.vim.action.window.WindowRightAction}
+ * |CTRL-W_CTRL-H|        {@link com.maddyhome.idea.vim.action.window.WindowLeftAction}
+ * |CTRL-W_CTRL-J|        {@link com.maddyhome.idea.vim.action.window.WindowDownAction}
+ * |CTRL-W_CTRL-K|        {@link com.maddyhome.idea.vim.action.window.WindowUpAction}
+ * |CTRL-W_CTRL-L|        {@link com.maddyhome.idea.vim.action.window.WindowRightAction}
+ *
+ *
+ * 2.3. Square bracket commands
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ * |[_CTRL-D|             TO BE IMPLEMENTED
+ * |[_CTRL-I|             TO BE IMPLEMENTED
+ * |[#|                   TO BE IMPLEMENTED
+ * |['|                   TO BE IMPLEMENTED
+ * |[(|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedParenOpenAction}
+ * |[star|                TO BE IMPLEMENTED
+ * |[`|                   TO BE IMPLEMENTED
+ * |[/|                   TO BE IMPLEMENTED
+ * |[D|                   TO BE IMPLEMENTED
+ * |[I|                   TO BE IMPLEMENTED
+ * |[M|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionMethodPreviousEndAction}
+ * |[P|                   {@link com.maddyhome.idea.vim.action.copy.PutVisualTextBeforeCursorNoIndentAction}
+ * |[P|                   {@link com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorNoIndentAction}
+ * |[[|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionSectionBackwardStartAction}
+ * |[]|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionSectionBackwardEndAction}
+ * |[c|                   TO BE IMPLEMENTED
+ * |[d|                   TO BE IMPLEMENTED
+ * |[f|                   TO BE IMPLEMENTED
+ * |[i|                   TO BE IMPLEMENTED
+ * |[m|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionMethodPreviousStartAction}
+ * |[p|                   {@link com.maddyhome.idea.vim.action.copy.PutVisualTextAfterCursorNoIndentAction}
+ * |[p|                   {@link com.maddyhome.idea.vim.action.copy.PutTextAfterCursorNoIndentAction}
+ * |[s|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionMisspelledWordPreviousAction}
+ * |[z|                   TO BE IMPLEMENTED
+ * |[{|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedBraceOpenAction}
+ * |]_CTRL-D|             TO BE IMPLEMENTED
+ * |]_CTRL-I|             TO BE IMPLEMENTED
+ * |]#|                   TO BE IMPLEMENTED
+ * |]'|                   TO BE IMPLEMENTED
+ * |])|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedParenCloseAction}
+ * |]star|                TO BE IMPLEMENTED
+ * |]`|                   TO BE IMPLEMENTED
+ * |]/|                   TO BE IMPLEMENTED
+ * |]D|                   TO BE IMPLEMENTED
+ * |]I|                   TO BE IMPLEMENTED
+ * |]M|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionMethodNextEndAction}
+ * |]P|                   {@link com.maddyhome.idea.vim.action.copy.PutVisualTextBeforeCursorNoIndentAction}
+ * |]P|                   {@link com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorNoIndentAction}
+ * |][|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionSectionForwardEndAction}
+ * |]]|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionSectionForwardStartAction}
+ * |]c|                   TO BE IMPLEMENTED
+ * |]d|                   TO BE IMPLEMENTED
+ * |]f|                   TO BE IMPLEMENTED
+ * |]i|                   TO BE IMPLEMENTED
+ * |]m|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionMethodNextStartAction}
+ * |]p|                   {@link com.maddyhome.idea.vim.action.copy.PutVisualTextAfterCursorNoIndentAction}
+ * |]p|                   {@link com.maddyhome.idea.vim.action.copy.PutTextAfterCursorNoIndentAction}
+ * |]s|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionMisspelledWordNextAction}
+ * |]z|                   TO BE IMPLEMENTED
+ * |]}|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionUnmatchedBraceCloseAction}
+ *
+ *
+ * 2.4. Commands starting with 'g'
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ *
+ * |g_CTRL-A|             not applicable
+ * |g_CTRL-G|             {@link com.maddyhome.idea.vim.action.file.FileGetLocationInfoAction}
+ * |g_CTRL-H|             {@link com.maddyhome.idea.vim.action.motion.select.SelectEnableBlockModeAction}
+ * |g_CTRL-]|             TO BE IMPLEMENTED
+ * |g#|                   {@link com.maddyhome.idea.vim.action.motion.search.SearchWordBackwardAction}
+ * |g$|                   {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLastScreenColumnAction}
+ * |g&|                   {@link com.maddyhome.idea.vim.action.change.change.ChangeLastGlobalSearchReplaceAction}
+ * |v_g'|                 {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkLineNoSaveJumpAction}
+ * |g'|                   {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkLineNoSaveJumpAction}
+ * |g`|                   {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoMarkNoSaveJumpAction}
+ * |gstar|                {@link com.maddyhome.idea.vim.action.motion.search.SearchWordForwardAction}
+ * |g+|                   TO BE IMPLEMENTED
+ * |g,|                   TO BE IMPLEMENTED
+ * |g-|                   TO BE IMPLEMENTED
+ * |g0|                   {@link com.maddyhome.idea.vim.action.motion.leftright.MotionFirstScreenColumnAction}
+ * |g8|                   {@link com.maddyhome.idea.vim.action.file.FileGetHexAction}
+ * |g;|                   TO BE IMPLEMENTED
+ * |g<|                   TO BE IMPLEMENTED
+ * |g?|                   TO BE IMPLEMENTED
+ * |g?g?|                 TO BE IMPLEMENTED
+ * |gD|                   {@link com.maddyhome.idea.vim.action.motion.search.GotoDeclarationAction}
+ * |gE|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionBigWordEndLeftAction}
+ * |gF|                   TO BE IMPLEMENTED
+ * |gH|                   {@link com.maddyhome.idea.vim.action.motion.select.SelectEnableLineModeAction}
+ * |gI|                   {@link com.maddyhome.idea.vim.action.change.insert.InsertLineStartAction}
+ * |gJ|                   {@link com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesAction}
+ * |gN|                   {@link com.maddyhome.idea.vim.action.motion.gn.VisualSelectPreviousSearch}
+ * |gN|                   {@link com.maddyhome.idea.vim.action.motion.gn.GnPreviousTextObject}
+ * |gP|                   {@link com.maddyhome.idea.vim.action.copy.PutVisualTextBeforeCursorMoveCursorAction}
+ * |gP|                   {@link com.maddyhome.idea.vim.action.copy.PutTextBeforeCursorActionMoveCursor}
+ * |gQ|                   TO BE IMPLEMENTED
+ * |gR|                   TO BE IMPLEMENTED
+ * |gT|                   {@link com.maddyhome.idea.vim.action.window.tabs.PreviousTabAction}
+ * |gU|                   {@link com.maddyhome.idea.vim.action.change.change.ChangeCaseUpperMotionAction}
+ * |gV|                   TO BE IMPLEMENTED
+ * |g]|                   TO BE IMPLEMENTED
+ * |g^|                   {@link com.maddyhome.idea.vim.action.motion.leftright.MotionFirstScreenNonSpaceAction}
+ * |g_|                   {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLastNonSpaceAction}
+ * |ga|                   {@link com.maddyhome.idea.vim.action.file.FileGetAsciiAction}
+ * |gd|                   {@link com.maddyhome.idea.vim.action.motion.search.GotoDeclarationAction}
+ * |ge|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionWordEndLeftAction}
+ * |gf|                   TO BE IMPLEMENTED
+ * |gg|                   {@link com.maddyhome.idea.vim.action.motion.updown.MotionGotoLineFirstAction}
+ * |gh|                   {@link com.maddyhome.idea.vim.action.motion.select.SelectEnableCharacterModeAction}
+ * |gi|                   {@link com.maddyhome.idea.vim.action.change.insert.InsertAtPreviousInsertAction}
+ * |gj|                   TO BE IMPLEMENTED
+ * |gk|                   {@link com.maddyhome.idea.vim.action.motion.updown.MotionUpNotLineWiseAction}
+ * |gn|                   {@link com.maddyhome.idea.vim.action.motion.gn.VisualSelectNextSearch}
+ * |gn|                   {@link com.maddyhome.idea.vim.action.motion.gn.GnNextTextObject}
+ * |gm|                   {@link com.maddyhome.idea.vim.action.motion.leftright.MotionMiddleColumnAction}
+ * |go|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionNthCharacterAction}
+ * |gp|                   {@link com.maddyhome.idea.vim.action.copy.PutVisualTextAfterCursorMoveCursorAction}
+ * |gp|                   {@link com.maddyhome.idea.vim.action.copy.PutTextAfterCursorActionMoveCursor}
+ * |gq|                   {@link com.maddyhome.idea.vim.action.change.change.ReformatCodeMotionAction}
+ * |gr|                   TO BE IMPLEMENTED
+ * |gs|                   TO BE IMPLEMENTED
+ * |gt|                   {@link com.maddyhome.idea.vim.action.window.tabs.NextTabAction}
+ * |gu|                   {@link com.maddyhome.idea.vim.action.change.change.ChangeCaseLowerMotionAction}
+ * |gv|                   {@link com.maddyhome.idea.vim.action.motion.visual.VisualSelectPreviousAction}
+ * |gw|                   TO BE IMPLEMENTED
+ * |g@|                   {@link com.maddyhome.idea.vim.action.change.OperatorAction}
+ * |g~|                   {@link com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleMotionAction}
+ * |g<Down>|              TO BE IMPLEMENTED
+ * |g<End>|               {@link com.maddyhome.idea.vim.action.motion.leftright.MotionLastScreenColumnAction}
+ * |g<Home>|              {@link com.maddyhome.idea.vim.action.motion.leftright.MotionFirstScreenColumnAction}
+ * |g<Up>|                {@link com.maddyhome.idea.vim.action.motion.updown.MotionUpNotLineWiseAction}
+ *
+ *
+ * 2.5. Commands starting with 'z'
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ * |z<CR>|                {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLineStartAction}
+ * |z+|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLinePageStartAction}
+ * |z-|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLineStartAction}
+ * |z.|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollMiddleScreenLineStartAction}
+ * |z=|                   TO BE IMPLEMENTED
+ * |zA|                   TO BE IMPLEMENTED
+ * |zC|                   {@link com.maddyhome.idea.vim.action.fold.VimCollapseRegionRecursively}
+ * |zD|                   TO BE IMPLEMENTED
+ * |zE|                   TO BE IMPLEMENTED
+ * |zF|                   TO BE IMPLEMENTED
+ * |zG|                   TO BE IMPLEMENTED
+ * |zH|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfWidthLeftAction}
+ * |zL|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollHalfWidthRightAction}
+ * |zM|                   {@link com.maddyhome.idea.vim.action.fold.VimCollapseAllRegions}
+ * |zN|                   TO BE IMPLEMENTED
+ * |zO|                   {@link com.maddyhome.idea.vim.action.fold.VimExpandRegionRecursively}
+ * |zR|                   {@link com.maddyhome.idea.vim.action.fold.VimExpandAllRegions}
+ * |zW|                   TO BE IMPLEMENTED
+ * |zX|                   TO BE IMPLEMENTED
+ * |z^|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLinePageStartAction}
+ * |za|                   TO BE IMPLEMENTED
+ * |zb|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenLineAction}
+ * |zc|                   {@link com.maddyhome.idea.vim.action.fold.VimCollapseRegion}
+ * |zd|                   not applicable
+ * |ze|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollLastScreenColumnAction}
+ * |zf|                   not applicable
+ * |zg|                   TO BE IMPLEMENTED
+ * |zh|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnRightAction}
+ * |zi|                   TO BE IMPLEMENTED
+ * |zj|                   TO BE IMPLEMENTED
+ * |zk|                   TO BE IMPLEMENTED
+ * |zl|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnLeftAction}
+ * |zm|                   TO BE IMPLEMENTED
+ * |zn|                   TO BE IMPLEMENTED
+ * |zo|                   {@link com.maddyhome.idea.vim.action.fold.VimExpandRegion}
+ * |zr|                   TO BE IMPLEMENTED
+ * |zs|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenColumnAction}
+ * |zt|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollFirstScreenLineAction}
+ * |zv|                   TO BE IMPLEMENTED
+ * |zw|                   TO BE IMPLEMENTED
+ * |zx|                   TO BE IMPLEMENTED
+ * |zz|                   {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollMiddleScreenLineAction}
+ * |z<Left>|              {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnRightAction}
+ * |z<Right>|             {@link com.maddyhome.idea.vim.action.motion.scroll.MotionScrollColumnLeftAction}
+ *
+ *
+ * 3. Visual mode
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ *
+ * |v_CTRL-\_CTRL-N|      {@link com.maddyhome.idea.vim.action.motion.visual.VisualExitModeAction}
+ * |v_CTRL-\_CTRL-G|      TO BE IMPLEMENTED
+ * |v_CTRL-A|             {@link com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberIncAction}
+ * |v_CTRL-C|             {@link com.maddyhome.idea.vim.action.motion.visual.VisualExitModeAction}
+ * |v_CTRL-G|             {@link com.maddyhome.idea.vim.action.motion.select.SelectToggleVisualMode}
+ * |v_<BS>|               NVO mapping
+ * |v_CTRL-H|             NVO mapping
+ * |v_CTRL-O|             TO BE IMPLEMENTED
+ * |v_CTRL-V|             NVO mapping
+ * |v_<Esc>|              {@link com.maddyhome.idea.vim.action.motion.visual.VisualExitModeAction}
+ * |v_CTRL-X|             {@link com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberDecAction}
+ * |v_CTRL-]|             TO BE IMPLEMENTED
+ * |v_!|                  {@link com.maddyhome.idea.vim.action.change.change.FilterVisualLinesAction}
+ * |v_:|                  NVO mapping
+ * |v_<|                  {@link com.maddyhome.idea.vim.action.change.shift.ShiftLeftVisualAction}
+ * |v_=|                  {@link com.maddyhome.idea.vim.action.change.change.AutoIndentLinesVisualAction}
+ * |v_>|                  {@link com.maddyhome.idea.vim.action.change.shift.ShiftRightVisualAction}
+ * |v_b_A|                {@link com.maddyhome.idea.vim.action.change.insert.VisualBlockAppendAction}
+ * |v_C|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeVisualLinesEndAction}
+ * |v_D|                  {@link com.maddyhome.idea.vim.action.change.delete.DeleteVisualLinesEndAction}
+ * |v_b_I|                {@link com.maddyhome.idea.vim.action.change.insert.VisualBlockInsertAction}
+ * |v_J|                  {@link com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesSpacesAction}
+ * |v_K|                  TO BE IMPLEMENTED
+ * |v_O|                  {@link com.maddyhome.idea.vim.action.motion.visual.VisualSwapEndsBlockAction}
+ * |v_P|                  {@link com.maddyhome.idea.vim.action.copy.PutVisualTextBeforeCursorAction}
+ * |v_R|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeVisualLinesAction}
+ * |v_S|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeVisualLinesAction}
+ * |v_U|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeCaseUpperVisualAction}
+ * |v_V|                  NV mapping
+ * |v_X|                  {@link com.maddyhome.idea.vim.action.change.delete.DeleteVisualLinesAction}
+ * |v_Y|                  {@link com.maddyhome.idea.vim.action.copy.YankVisualLinesAction}
+ * |v_aquote|             {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockDoubleQuoteAction}
+ * |v_a'|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockSingleQuoteAction}
+ * |v_a(|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockParenAction}
+ * |v_a)|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockParenAction}
+ * |v_a<|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockAngleAction}
+ * |v_a>|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockAngleAction}
+ * |v_aB|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBraceAction}
+ * |v_aW|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBigWordAction}
+ * |v_a[|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBracketAction}
+ * |v_a]|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBracketAction}
+ * |v_a`|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBackQuoteAction}
+ * |v_ab|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockParenAction}
+ * |v_ap|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterParagraphAction}
+ * |v_as|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterSentenceAction}
+ * |v_at|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockTagAction}
+ * |v_aw|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterWordAction}
+ * |v_a{|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBraceAction}
+ * |v_a}|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionOuterBlockBraceAction}
+ * |v_c|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeVisualAction}
+ * |v_d|                  {@link com.maddyhome.idea.vim.action.change.delete.DeleteVisualAction}
+ * |v_gCTRL-A|            {@link com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberAvalancheIncAction}
+ * |v_gCTRL-X|            {@link com.maddyhome.idea.vim.action.change.change.number.ChangeVisualNumberAvalancheDecAction}
+ * |v_gJ|                 {@link com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesAction}
+ * |v_gq|                 {@link com.maddyhome.idea.vim.action.change.change.ReformatCodeVisualAction}
+ * |v_gv|                 {@link com.maddyhome.idea.vim.action.motion.visual.VisualSwapSelectionsAction}
+ * |v_g`|                 {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkNoSaveJumpAction}
+ * |v_g@|                 {@link com.maddyhome.idea.vim.action.change.VisualOperatorAction}
+ * |v_iquote|             {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockDoubleQuoteAction}
+ * |v_i'|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockSingleQuoteAction}
+ * |v_i(|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockParenAction}
+ * |v_i)|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockParenAction}
+ * |v_i<|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockAngleAction}
+ * |v_i>|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockAngleAction}
+ * |v_iB|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBraceAction}
+ * |v_iW|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBigWordAction}
+ * |v_i[|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBracketAction}
+ * |v_i]|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBracketAction}
+ * |v_i`|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBackQuoteAction}
+ * |v_ib|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockParenAction}
+ * |v_ip|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerParagraphAction}
+ * |v_is|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerSentenceAction}
+ * |v_it|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockTagAction}
+ * |v_iw|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerWordAction}
+ * |v_i{|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBraceAction}
+ * |v_i}|                 {@link com.maddyhome.idea.vim.action.motion.object.MotionInnerBlockBraceAction}
+ * |v_o|                  {@link com.maddyhome.idea.vim.action.motion.visual.VisualSwapEndsAction}
+ * |v_p|                  {@link com.maddyhome.idea.vim.action.copy.PutVisualTextAfterCursorAction}
+ * |v_r|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeVisualCharacterAction}
+ * |v_s|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeVisualAction}
+ * |v_u|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeCaseLowerVisualAction}
+ * |v_v|                  NV mapping
+ * |v_x|                  {@link com.maddyhome.idea.vim.action.change.delete.DeleteVisualAction}
+ * |v_y|                  {@link com.maddyhome.idea.vim.action.copy.YankVisualAction}
+ * |v_~|                  {@link com.maddyhome.idea.vim.action.change.change.ChangeCaseToggleVisualAction}
+ * |v_`|                  {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkAction}
+ * |v_'|                  {@link com.maddyhome.idea.vim.action.motion.mark.MotionGotoFileMarkLineAction}
+ *
+ *
+ * 4. Select mode
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ * |<BS>|                 {@link com.maddyhome.idea.vim.action.motion.select.SelectDeleteAction}
+ * |<CR>|                 {@link com.maddyhome.idea.vim.action.motion.select.SelectEnterAction}
+ * |<DEL>|                {@link com.maddyhome.idea.vim.action.motion.select.SelectDeleteAction}
+ * |<ESC>|                {@link com.maddyhome.idea.vim.action.motion.select.SelectEscapeAction}
+ * |<C-G>|                {@link com.maddyhome.idea.vim.action.motion.select.SelectToggleVisualMode}
+ * |<S-Down>|             {@link com.maddyhome.idea.vim.action.motion.updown.MotionShiftDownAction}
+ * |<S-Left>|             {@link com.maddyhome.idea.vim.action.motion.leftright.MotionShiftLeftAction}
+ * |<S-Right>|            {@link com.maddyhome.idea.vim.action.motion.leftright.MotionShiftRightAction}
+ * |<S-Up>|               {@link com.maddyhome.idea.vim.action.motion.updown.MotionShiftUpAction}
+ * |<Down>|               {@link com.maddyhome.idea.vim.action.motion.updown.MotionArrowDownAction}
+ * |<Left>|               {@link com.maddyhome.idea.vim.action.motion.select.motion.SelectMotionLeftAction}
+ * |<Right>|              {@link com.maddyhome.idea.vim.action.motion.select.motion.SelectMotionRightAction}
+ * |<Up>|                 {@link com.maddyhome.idea.vim.action.motion.updown.MotionArrowUpAction}
+ *
+ * 5. Command line editing
+ *
+ * tag                    action
+ * -------------------------------------------------------------------------------------------------------------------
+ *
+ * |c_CTRL-A|             TO BE IMPLEMENTED
+ * |c_CTRL-B|             {@link javax.swing.text.DefaultEditorKit#beginLineAction}
+ * |c_CTRL-C|             {@link com.maddyhome.idea.vim.ui.ex.CancelEntryAction}
+ * |c_CTRL-D|             TO BE IMPLEMENTED
+ * |c_CTRL-E|             {@link javax.swing.text.DefaultEditorKit#endLineAction}
+ * |c_CTRL-G|             TO BE IMPLEMENTED
+ * |c_CTRL-H|             {@link com.maddyhome.idea.vim.ui.ex.DeletePreviousCharAction}
+ * |c_CTRL-I|             TO BE IMPLEMENTED
+ * |c_CTRL-J|             {@link com.maddyhome.idea.vim.ui.ex.CompleteEntryAction}
+ * |c_CTRL-K|             Handled by KeyHandler
+ * |c_CTRL-L|             TO BE IMPLEMENTED
+ * |c_CTRL-M|             {@link com.maddyhome.idea.vim.action.ex.ProcessExEntryAction}
+ * |c_CTRL-N|             {@link com.maddyhome.idea.vim.ui.ex.HistoryDownAction}
+ * |c_CTRL-P|             {@link com.maddyhome.idea.vim.ui.ex.HistoryUpAction}
+ * |c_CTRL-Q|             Handled by KeyHandler
+ * |c_CTRL-R_CTRL-A|      TO BE IMPLEMENTED
+ * |c_CTRL-R_CTRL-F|      TO BE IMPLEMENTED
+ * |c_CTRL-R_CTRL-L|      TO BE IMPLEMENTED
+ * |c_CTRL-R_CTRL-O|      TO BE IMPLEMENTED
+ * |c_CTRL-R_CTRL-P|      TO BE IMPLEMENTED
+ * |c_CTRL-R_CTRL-R|      TO BE IMPLEMENTED
+ * |c_CTRL-R_CTRL-W|      TO BE IMPLEMENTED
+ * |c_CTRL-T|             TO BE IMPLEMENTED
+ * |c_CTRL-U|             {@link com.maddyhome.idea.vim.ui.ex.DeleteToCursorAction}
+ * |c_CTRL-V|             Handled by KeyHandler
+ * |c_CTRL-W|             {@link com.maddyhome.idea.vim.ui.ex.DeletePreviousWordAction}
+ * |c_CTRL-Y|             TO BE IMPLEMENTED
+ * |c_CTRL-\_e|           TO BE IMPLEMENTED
+ * |c_CTRL-\_CTRL-G|      TO BE IMPLEMENTED
+ * |c_CTRL-\_CTRL-N|      TO BE IMPLEMENTED
+ * |c_CTRL-_|             not applicable
+ * |c_CTRL-^|             not applicable
+ * |c_CTRL-]|             TO BE IMPLEMENTED
+ * |c_CTRL-[|             {@link com.maddyhome.idea.vim.ui.ex.EscapeCharAction}
+ * |c_<BS>|               {@link com.maddyhome.idea.vim.ui.ex.DeletePreviousCharAction}
+ * |c_<CR>|               {@link com.maddyhome.idea.vim.ui.ex.CompleteEntryAction}
+ * |c_<C-Left>|           {@link javax.swing.text.DefaultEditorKit#previousWordAction}
+ * |c_<C-Right>|          {@link javax.swing.text.DefaultEditorKit#nextWordAction}
+ * |c_<Del>|              {@link javax.swing.text.DefaultEditorKit#deleteNextCharAction}
+ * |c_<Down>|             {@link com.maddyhome.idea.vim.ui.ex.HistoryDownFilterAction}
+ * |c_<End>|              {@link javax.swing.text.DefaultEditorKit#endLineAction}
+ * |c_<Esc>|              {@link com.maddyhome.idea.vim.ui.ex.EscapeCharAction}
+ * |c_<Home>|             {@link javax.swing.text.DefaultEditorKit#beginLineAction}
+ * |c_<Insert>|           {@link com.maddyhome.idea.vim.ui.ex.ToggleInsertReplaceAction}
+ * |c_<Left>|             {@link javax.swing.text.DefaultEditorKit#backwardAction}
+ * |c_<LeftMouse>|        not applicable
+ * |c_<MiddleMouse>|      TO BE IMPLEMENTED
+ * |c_<NL>|               {@link com.maddyhome.idea.vim.ui.ex.CompleteEntryAction}
+ * |c_<PageUp>|           {@link com.maddyhome.idea.vim.ui.ex.HistoryUpAction}
+ * |c_<PageDown>|         {@link com.maddyhome.idea.vim.ui.ex.HistoryDownAction}
+ * |c_<Right>|            {@link javax.swing.text.DefaultEditorKit#forwardAction}
+ * |c_<S-Down>|           {@link com.maddyhome.idea.vim.ui.ex.HistoryDownAction}
+ * |c_<S-Left>|           {@link javax.swing.text.DefaultEditorKit#previousWordAction}
+ * |c_<S-Right>|          {@link javax.swing.text.DefaultEditorKit#nextWordAction}
+ * |c_<S-Tab>|            TO BE IMPLEMENTED
+ * |c_<S-Up>|             {@link com.maddyhome.idea.vim.ui.ex.HistoryUpAction}
+ * |c_<Tab>|              TO BE IMPLEMENTED
+ * |c_<Up>|               {@link com.maddyhome.idea.vim.ui.ex.HistoryUpFilterAction}
+ * |c_digraph|            {char1} <BS> {char2}
+ * |c_wildchar|           TO BE IMPLEMENTED
+ * |'cedit'|              TO BE IMPLEMENTED
+ *
+ *
+ * 6. Ex commands
+ *
+ * tag                    handler
+ * -------------------------------------------------------------------------------------------------------------------
+ *
+ * |:map|                 {@link com.maddyhome.idea.vim.vimscript.model.commands.mapping.MapCommand}
+ * |:nmap|                ...
+ * |:vmap|                ...
+ * |:omap|                ...
+ * |:imap|                ...
+ * |:cmap|                ...
+ * |:noremap|             ...
+ * |:nnoremap|            ...
+ * |:vnoremap|            ...
+ * |:onoremap|            ...
+ * |:inoremap|            ...
+ * |:cnoremap|            ...
+ * |:shell|               {@link com.maddyhome.idea.vim.vimscript.model.commands.ShellCommand}
+ * |:sort|                {@link com.maddyhome.idea.vim.vimscript.model.commands.SortCommand}
+ * |:source|              {@link com.maddyhome.idea.vim.vimscript.model.commands.SourceCommand}
+ * |:qall|                {@link com.maddyhome.idea.vim.vimscript.model.commands.ExitCommand}
+ * |:quitall|             {@link com.maddyhome.idea.vim.vimscript.model.commands.ExitCommand}
+ * |:quitall|             {@link com.maddyhome.idea.vim.vimscript.model.commands.ExitCommand}
+ * |:wqall|               {@link com.maddyhome.idea.vim.vimscript.model.commands.ExitCommand}
+ * |:xall|                {@link com.maddyhome.idea.vim.vimscript.model.commands.ExitCommand}
+ * |:command|             {@link com.maddyhome.idea.vim.vimscript.model.commands.CmdCommand}
+ * |:delcommand|          {@link com.maddyhome.idea.vim.vimscript.model.commands.DelCmdCommand}
+ * |:comclear|            {@link com.maddyhome.idea.vim.vimscript.model.commands.CmdClearCommand}
+ * ...
+ *
+ * The list of supported Ex commands is incomplete.
+ *
+ *
+ * A. Misc commands
+ *
+ * tag                    handler
+ * -------------------------------------------------------------------------------------------------------------------
+ * |]b|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionCamelEndLeftAction}
+ * |]w|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionCamelEndRightAction}
+ * |[b|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionCamelLeftAction}
+ * |[w|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionCamelRightAction}
+ * |g(|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionSentencePreviousEndAction}
+ * |g)|                   {@link com.maddyhome.idea.vim.action.motion.text.MotionSentenceNextEndAction}
+ *
+ *
+ * See also :help index.
+ *
+ * @author vlan
+ */
+package com.maddyhome.idea.vim;

src/main/java/com/maddyhome/idea/vim/ui/StatusBar.kt

@@ -192,13 +192,6 @@ private object VimActionsPopup {
         null,
       ),
     )
-    actionGroup.add(
-      HelpLink(
-        "Take Survey ↗",
-        "https://surveys.jetbrains.com/s3/ideavim-usage-survey",
-        AllIcons.Actions.IntentionBulb,
-      ),
-    )
     actionGroup.addSeparator(MessageHelper.message("action.eap.choice.active.text"))
 
     actionGroup.add(JoinEap)

src/main/java/com/maddyhome/idea/vim/ui/ex/ExActions.kt

@@ -0,0 +1,263 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package com.maddyhome.idea.vim.ui.ex
+
+import com.intellij.openapi.diagnostic.logger
+import com.intellij.openapi.editor.textarea.TextComponentEditorImpl
+import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.api.LocalOptionInitialisationScenario
+import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.newapi.vim
+import java.awt.event.ActionEvent
+import java.awt.event.KeyEvent
+import javax.swing.Action
+import javax.swing.KeyStroke
+import javax.swing.text.BadLocationException
+import javax.swing.text.DefaultEditorKit
+import javax.swing.text.Document
+import javax.swing.text.TextAction
+import kotlin.math.abs
+import kotlin.math.min
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal interface MultiStepAction : Action {
+  fun reset()
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class HistoryUpAction : TextAction(ExEditorKit.HistoryUp) {
+  override fun actionPerformed(actionEvent: ActionEvent) {
+    val target = getTextComponent(actionEvent) as ExTextField
+    target.selectHistory(true, false)
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class HistoryDownAction : TextAction(ExEditorKit.HistoryDown) {
+  override fun actionPerformed(actionEvent: ActionEvent) {
+    val target = getTextComponent(actionEvent) as ExTextField
+    target.selectHistory(false, false)
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class HistoryUpFilterAction : TextAction(ExEditorKit.HistoryUpFilter) {
+  override fun actionPerformed(actionEvent: ActionEvent) {
+    val target = getTextComponent(actionEvent) as ExTextField
+    target.selectHistory(true, true)
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class HistoryDownFilterAction : TextAction(ExEditorKit.HistoryDownFilter) {
+  override fun actionPerformed(actionEvent: ActionEvent) {
+    val target = getTextComponent(actionEvent) as ExTextField
+    target.selectHistory(false, true)
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class CompleteEntryAction : TextAction(ExEditorKit.CompleteEntry) {
+  override fun actionPerformed(actionEvent: ActionEvent) {
+    logger.debug("complete entry")
+    val stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)
+
+    // We send the <Enter> keystroke through the key handler rather than calling ProcessGroup#processExEntry directly.
+    // We do this for a couple of reasons:
+    // * The C mode mapping for ProcessExEntryAction handles the actual entry, and most importantly, it does so as a
+    //   write action
+    // * The key handler routines get the chance to clean up and reset state
+    val entry = ExEntryPanel.getInstance().entry
+    val keyHandler = KeyHandler.getInstance()
+    keyHandler.handleKey(entry.editor!!.vim, stroke, entry.context.vim, keyHandler.keyHandlerState)
+  }
+
+  companion object {
+    private val logger = logger<CompleteEntryAction>()
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class CancelEntryAction : TextAction(ExEditorKit.CancelEntry) {
+  override fun actionPerformed(e: ActionEvent) {
+    val target = getTextComponent(e) as ExTextField
+    target.cancel()
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class EscapeCharAction : TextAction(ExEditorKit.EscapeChar) {
+  override fun actionPerformed(e: ActionEvent) {
+    val target = getTextComponent(e) as ExTextField
+    target.escape()
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal abstract class DeleteCharAction internal constructor(name: String?) : TextAction(name) {
+  @kotlin.jvm.Throws(BadLocationException::class)
+  fun deleteSelection(doc: Document, dot: Int, mark: Int): Boolean {
+    if (dot != mark) {
+      doc.remove(min(dot, mark), abs(dot - mark))
+      return true
+    }
+    return false
+  }
+
+  @kotlin.jvm.Throws(BadLocationException::class)
+  fun deleteNextChar(doc: Document, dot: Int): Boolean {
+    if (dot < doc.length) {
+      var delChars = 1
+      if (dot < doc.length - 1) {
+        val dotChars = doc.getText(dot, 2)
+        val c0 = dotChars[0]
+        val c1 = dotChars[1]
+        if (c0 in '\uD800'..'\uDBFF' && c1 in '\uDC00'..'\uDFFF') {
+          delChars = 2
+        }
+      }
+      doc.remove(dot, delChars)
+      return true
+    }
+    return false
+  }
+
+  @kotlin.jvm.Throws(BadLocationException::class)
+  fun deletePrevChar(doc: Document, dot: Int): Boolean {
+    if (dot > 0) {
+      var delChars = 1
+      if (dot > 1) {
+        val dotChars = doc.getText(dot - 2, 2)
+        val c0 = dotChars[0]
+        val c1 = dotChars[1]
+        if (c0 in '\uD800'..'\uDBFF' && c1 in '\uDC00'..'\uDFFF') {
+          delChars = 2
+        }
+      }
+      doc.remove(dot - delChars, delChars)
+      return true
+    }
+    return false
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class DeleteNextCharAction : DeleteCharAction(DefaultEditorKit.deleteNextCharAction) {
+  override fun actionPerformed(e: ActionEvent) {
+    val target = getTextComponent(e) as ExTextField
+    target.saveLastEntry()
+    try {
+      val doc = target.document
+      val caret = target.caret
+      val dot = caret.dot
+      val mark = caret.mark
+      if (!deleteSelection(doc, dot, mark) && !deleteNextChar(doc, dot) && !deletePrevChar(doc, dot)) {
+        target.cancel()
+      }
+    } catch (ex: BadLocationException) {
+      // ignore
+    }
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class DeletePreviousCharAction : DeleteCharAction(DefaultEditorKit.deletePrevCharAction) {
+  override fun actionPerformed(e: ActionEvent) {
+    val target = getTextComponent(e) as ExTextField
+    target.saveLastEntry()
+    try {
+      val doc = target.document
+      val caret = target.caret
+      val dot = caret.dot
+      val mark = caret.mark
+      if (!deleteSelection(doc, dot, mark) && !deletePrevChar(doc, dot)) {
+        if (dot == 0 && doc.length == 0) {
+          target.cancel()
+        }
+      }
+    } catch (bl: BadLocationException) {
+      // ignore
+    }
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class DeletePreviousWordAction : TextAction(DefaultEditorKit.deletePrevWordAction) {
+  /**
+   * Invoked when an action occurs.
+   */
+  override fun actionPerformed(e: ActionEvent) {
+    val target = getTextComponent(e) as ExTextField
+    target.saveLastEntry()
+    val doc = target.document
+    val caret = target.caret
+    val project = target.editor!!.project
+
+    // Create a VimEditor instance on the Swing text field which we can pass to the search helpers. We need an editor
+    // rather than just working on a buffer because the search helpers need local options (specifically the local to
+    // buffer 'iskeyword'). We use the CMD_LINE scenario to initialise local options from the main editor. The options
+    // service will copy all local-to-buffer and local-to-window options, effectively cloning the options.
+    // TODO: Over time, we should migrate all ex actions to be based on VimEditor
+    // This will mean we always have an editor that has been initialised for options, etc. But also means that we can
+    // share the command line entry actions between IdeaVim implementations
+    val editor = TextComponentEditorImpl(project, target).vim
+    injector.optionGroup.initialiseLocalOptions(editor, target.editor!!.vim, LocalOptionInitialisationScenario.CMD_LINE)
+
+    val offset = injector.searchHelper.findNextWord(editor, caret.dot, -1, bigWord = false, spaceWords = false)
+    if (logger.isDebugEnabled) logger.debug("offset=$offset")
+    try {
+      val pos = caret.dot
+      doc.remove(offset, pos - offset)
+    } catch (ex: BadLocationException) {
+      // ignore
+    }
+  }
+
+  companion object {
+    private val logger = logger<DeletePreviousWordAction>()
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class DeleteToCursorAction : TextAction(ExEditorKit.DeleteToCursor) {
+  /**
+   * Invoked when an action occurs.
+   */
+  override fun actionPerformed(e: ActionEvent) {
+    val target = getTextComponent(e) as ExTextField
+    target.saveLastEntry()
+    val doc = target.document
+    val caret = target.caret
+    try {
+      doc.remove(0, caret.dot)
+    } catch (ex: BadLocationException) {
+      // ignore
+    }
+  }
+}
+
+@Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
+internal class ToggleInsertReplaceAction : TextAction(ExEditorKit.ToggleInsertReplace) {
+  /**
+   * Invoked when an action occurs.
+   */
+  override fun actionPerformed(e: ActionEvent) {
+    logger.debug("actionPerformed")
+    val target = getTextComponent(e) as ExTextField
+    target.toggleInsertReplace()
+  }
+
+  init {
+    logger.debug("ToggleInsertReplaceAction()")
+  }
+
+  companion object {
+    private val logger = logger<ToggleInsertReplaceAction>()
+  }
+}

src/main/java/com/maddyhome/idea/vim/ui/ex/ExDocument.java

@@ -34,7 +34,7 @@ public class ExDocument extends PlainDocument {
   void toggleInsertReplace() {
     VimCommandLine commandLine = injector.getCommandLine().getActiveCommandLine();
     if (commandLine != null) {
-      ((ExEntryPanel) commandLine).isReplaceMode = !((ExEntryPanel)commandLine).isReplaceMode;
+      commandLine.toggleReplaceMode();
     }
     overwrite = !overwrite;
   }

src/main/java/com/maddyhome/idea/vim/ui/ex/ExEditorKit.kt

@@ -7,6 +7,7 @@
  */
 package com.maddyhome.idea.vim.ui.ex
 
+import com.intellij.openapi.diagnostic.debug
 import com.intellij.openapi.diagnostic.logger
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.api.injector
@@ -14,12 +15,50 @@ import com.maddyhome.idea.vim.newapi.vim
 import org.jetbrains.annotations.NonNls
 import java.awt.event.ActionEvent
 import java.awt.event.KeyEvent
+import javax.swing.Action
 import javax.swing.KeyStroke
 import javax.swing.text.DefaultEditorKit
 import javax.swing.text.Document
+import javax.swing.text.TextAction
 
 @Deprecated("ExCommands should be migrated to KeyHandler like commands for other modes")
 internal object ExEditorKit : DefaultEditorKit() {
+
+  @NonNls
+  val CancelEntry: String = "cancel-entry"
+
+  @NonNls
+  val CompleteEntry: String = "complete-entry"
+
+  @NonNls
+  val EscapeChar: String = "escape"
+
+  @NonNls
+  val DeleteToCursor: String = "delete-to-cursor"
+
+  @NonNls
+  val ToggleInsertReplace: String = "toggle-insert"
+
+  @NonNls
+  val HistoryUp: String = "history-up"
+
+  @NonNls
+  val HistoryDown: String = "history-down"
+
+  @NonNls
+  val HistoryUpFilter: String = "history-up-filter"
+
+  @NonNls
+  val HistoryDownFilter: String = "history-down-filter"
+
+  @NonNls
+  val StartDigraph: String = "start-digraph"
+
+  @NonNls
+  val StartLiteral: String = "start-literal"
+
+  private val logger = logger<ExEditorKit>()
+
   /**
    * Gets the MIME type of the data that this
    * kit represents support for.
@@ -31,6 +70,19 @@ internal object ExEditorKit : DefaultEditorKit() {
     return "text/ideavim"
   }
 
+  /**
+   * Fetches the set of commands that can be used
+   * on a text component that is using a model and
+   * view produced by this kit.
+   *
+   * @return the set of actions
+   */
+  override fun getActions(): Array<Action> {
+    val res = TextAction.augmentList(super.getActions(), exActions)
+    logger.debug { "res.length=${res.size}" }
+    return res
+  }
+
   /**
    * Creates an uninitialized text storage model
    * that is appropriate for this type of editor.
@@ -41,29 +93,48 @@ internal object ExEditorKit : DefaultEditorKit() {
     return ExDocument()
   }
 
+  private val exActions = arrayOf<Action>(
+    CancelEntryAction(),
+    CompleteEntryAction(),
+    EscapeCharAction(),
+    DeleteNextCharAction(),
+    DeletePreviousCharAction(),
+    DeletePreviousWordAction(),
+    DeleteToCursorAction(),
+    HistoryUpAction(),
+    HistoryDownAction(),
+    HistoryUpFilterAction(),
+    HistoryDownFilterAction(),
+    ToggleInsertReplaceAction(),
+  )
+
   class DefaultExKeyHandler : DefaultKeyTypedAction() {
     override fun actionPerformed(e: ActionEvent) {
       val target = getTextComponent(e) as ExTextField
-
-      val key = convert(e)
-      if (key != null) {
-        val c = key.keyChar
-        if (c.code > 0) {
-          if (target.useHandleKeyFromEx) {
-            val panel = ((injector.commandLine.getActiveCommandLine() as? ExEntryPanel) ?: (injector.modalInput.getCurrentModalInput() as? WrappedAsModalInputExEntryPanel)?.exEntryPanel) ?: return
-            val entry = panel.entry
-            val editor = entry.editor
-            val keyHandler = KeyHandler.getInstance()
-            keyHandler.handleKey(editor!!.vim, key, entry.context.vim, keyHandler.keyHandlerState)
-          } else {
-            val event = ActionEvent(e.source, e.id, c.toString(), e.getWhen(), e.modifiers)
-            super.actionPerformed(event)
+      val currentAction = target.currentAction
+      if (currentAction != null) {
+        currentAction.actionPerformed(e)
+      } else {
+        val key = convert(e)
+        if (key != null) {
+          val c = key.keyChar
+          if (c.code > 0) {
+            if (target.useHandleKeyFromEx) {
+              val panel = ((injector.commandLine.getActiveCommandLine() as? ExEntryPanel) ?: (injector.modalInput.getCurrentModalInput() as? WrappedAsModalInputExEntryPanel)?.exEntryPanel) ?: return
+              val entry = panel.entry
+              val editor = entry.editor
+              val keyHandler = KeyHandler.getInstance()
+              keyHandler.handleKey(editor!!.vim, key, entry.context.vim, keyHandler.keyHandlerState)
+            } else {
+              val event = ActionEvent(e.source, e.id, c.toString(), e.getWhen(), e.modifiers)
+              super.actionPerformed(event)
+            }
+            target.saveLastEntry()
           }
+        } else {
+          super.actionPerformed(e)
           target.saveLastEntry()
         }
-      } else {
-        super.actionPerformed(e)
-        target.saveLastEntry()
       }
     }
   }

src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.java

@@ -63,7 +63,7 @@ import static com.maddyhome.idea.vim.group.KeyGroup.toShortcutSet;
 public class ExEntryPanel extends JPanel implements VimCommandLine {
   public static ExEntryPanel instance;
   public static ExEntryPanel instanceWithoutShortcuts;
-  public boolean isReplaceMode = false;
+  private boolean isReplaceMode = false;
   private WeakReference<Editor> weakEditor = null;
 
   private VimInputInterceptor myInputInterceptor = null;
@@ -344,12 +344,12 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
           }
         }
 
-        // Get a snapshot of the count for the in progress command, and coerce it to 1. This value will include all
-        // count components - selecting register(s), operator and motions. E.g. `2"a3"b4"c5d6/` will return 720.
-        // If we're showing highlights for an Ex command like `:s`, the command builder will be empty, but we'll still
-        // get a valid value.
-        int count1 = Math.max(1, KeyHandler.getInstance().getKeyHandlerState().getEditorCommandBuilder()
-          .calculateCount0Snapshot());
+        // Get the current count from the command builder. This value is coerced to at least 1, so will always be valid.
+        // The aggregated value includes any counts for operator and register selections, and the uncommitted count for
+        // the search command (`/` or `?`). E.g., `2"a3"b4"c5d6/` would return 720.
+        // If we're showing highlights for an ex command like `:s`, there won't be a command, but the value is already
+        // coerced to at least 1.
+        int count1 = KeyHandler.getInstance().getKeyHandlerState().getEditorCommandBuilder().getAggregatedUncommittedCount();
 
         if ((labelText.equals("/") || labelText.equals("?") || searchCommand) && !injector.getMacro().isExecutingMacro()) {
           final boolean forwards = !labelText.equals("?");  // :s, :g, :v are treated as forwards
@@ -405,7 +405,7 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
 
   @Override
   public void toggleReplaceMode() {
-    entry.toggleInsertReplace();
+    isReplaceMode = !isReplaceMode;
   }
 
   /**
@@ -531,17 +531,17 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
 
   private static final Logger logger = Logger.getInstance(ExEntryPanel.class.getName());
 
+  @NotNull
   @Override
-  public @NotNull VimCommandLineCaret getCaret() {
+  public VimCommandLineCaret getCaret() {
     return (VimCommandLineCaret) entry.getCaret();
   }
 
   @Override
-  public void setText(@NotNull String string, boolean updateLastEntry) {
+  public void setText(@NotNull String string) {
     // It's a feature of Swing that caret is moved when we set new text. However, our API is Swing independent and we do not expect this
     int offset = getCaret().getOffset();
     entry.updateText(string);
-    if (updateLastEntry) entry.saveLastEntry();
     getCaret().setOffset(Math.min(offset, getVisibleText().length()));
   }
 
@@ -550,8 +550,9 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
     entry.clearCurrentAction();
   }
 
+  @Nullable
   @Override
-  public @Nullable Integer getPromptCharacterOffset() {
+  public Integer getPromptCharacterOffset() {
     int offset = entry.currentActionPromptCharacterOffset;
     return offset == -1 ? null : offset;
   }
@@ -571,7 +572,8 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
     IdeFocusManager.findInstance().requestFocus(entry, true);
   }
 
-  public @Nullable VimInputInterceptor<?> getInputInterceptor() {
+  @Nullable
+  public VimInputInterceptor<?> getInputInterceptor() {
     return myInputInterceptor;
   }
 
@@ -584,37 +586,18 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
     myInputInterceptor = vimInputInterceptor;
   }
 
+  @Nullable
   @Override
-  public @Nullable Function1<String, Unit> getInputProcessing() {
+  public Function1<String, Unit> getInputProcessing() {
     return inputProcessing;
   }
 
+  @Nullable
   @Override
-  public @Nullable Character getFinishOn() {
+  public Character getFinishOn() {
     return finishOn;
   }
 
-  @Override
-  public int getHistIndex() {
-    return entry.histIndex;
-  }
-
-  @Override
-  public void setHistIndex(int i) {
-    entry.histIndex = i;
-  }
-
-  @NotNull
-  @Override
-  public String getLastEntry() {
-    return entry.lastEntry;
-  }
-
-  @Override
-  public void setLastEntry(@NotNull String s) {
-    entry.lastEntry = s;
-  }
-
   public static class LafListener implements LafManagerListener {
     @Override
     public void lookAndFeelChanged(@NotNull LafManager source) {

src/main/java/com/maddyhome/idea/vim/ui/ex/ExKeyBindings.kt

@@ -21,6 +21,57 @@ internal object ExKeyBindings {
 
   val bindings: Array<KeyBinding> by lazy {
     arrayOf(
+      // Escape will cancel a pending insert digraph/register before cancelling
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), ExEditorKit.EscapeChar),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.EscapeChar),
+
+      // Cancel entry, ignoring any pending actions such as digraph/registry entry
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.CancelEntry),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), ExEditorKit.CompleteEntry),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.CompleteEntry),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.CompleteEntry),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.beginLineAction),
+      KeyBinding(KeyStroke.getKeyStroke(0x02.toChar().code, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.beginLineAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0), DefaultEditorKit.beginLineAction),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.endLineAction),
+      KeyBinding(KeyStroke.getKeyStroke(0x05.toChar().code, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.endLineAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_END, 0), DefaultEditorKit.endLineAction),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), DefaultEditorKit.deletePrevCharAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.deletePrevCharAction),
+      KeyBinding(KeyStroke.getKeyStroke(0x08.toChar().code, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.deletePrevCharAction),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), DefaultEditorKit.deleteNextCharAction),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.deletePrevWordAction),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_U, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.DeleteToCursor),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0), ExEditorKit.HistoryUpFilter),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.SHIFT_DOWN_MASK), ExEditorKit.HistoryUp),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0), ExEditorKit.HistoryUp),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_P, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.HistoryUp),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0), ExEditorKit.HistoryDownFilter),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_DOWN_MASK), ExEditorKit.HistoryDown),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0), ExEditorKit.HistoryDown),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.HistoryDown),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0), ExEditorKit.ToggleInsertReplace),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), DefaultEditorKit.backwardAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.SHIFT_DOWN_MASK), DefaultEditorKit.previousWordAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.previousWordAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), DefaultEditorKit.forwardAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.SHIFT_DOWN_MASK), DefaultEditorKit.nextWordAction),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.CTRL_DOWN_MASK), DefaultEditorKit.nextWordAction),
+
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_K, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.StartDigraph),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.StartLiteral),
+      KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK), ExEditorKit.StartLiteral),
+
       // These appear to be non-Vim shortcuts
       KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.META_DOWN_MASK), DefaultEditorKit.pasteAction),
       KeyBinding(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, KeyEvent.SHIFT_DOWN_MASK), DefaultEditorKit.pasteAction),

src/main/java/com/maddyhome/idea/vim/ui/ex/ExShortcutKeyAction.kt

@@ -59,45 +59,9 @@ internal class ExShortcutKeyAction(private val exEntryPanel: ExEntryPanel) : Dum
   }
 
   fun registerCustomShortcutSet() {
-    val shortcuts = listOf(
-        KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_C, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_J, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_B, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_HOME, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_E, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_END, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_U, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_UP, KeyEvent.SHIFT_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_P, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, KeyEvent.SHIFT_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.SHIFT_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.SHIFT_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_K, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_V, KeyEvent.META_DOWN_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, KeyEvent.SHIFT_DOWN_MASK),
-    )
-      .map { KeyboardShortcut(it, null) }
-      .toTypedArray()
+    val shortcuts = ExKeyBindings.bindings.map {
+      KeyboardShortcut(it.key, null)
+    }.toTypedArray()
 
     registerCustomShortcutSet({ shortcuts }, exEntryPanel)
   }

src/main/java/com/maddyhome/idea/vim/ui/ex/ExTextField.java

@@ -16,9 +16,11 @@ import com.intellij.util.ui.JBUI;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.VimCommandLine;
 import com.maddyhome.idea.vim.api.VimCommandLineCaret;
+import com.maddyhome.idea.vim.api.VimEditor;
 import com.maddyhome.idea.vim.helper.UiHelper;
 import com.maddyhome.idea.vim.history.HistoryConstants;
 import com.maddyhome.idea.vim.history.HistoryEntry;
+import com.maddyhome.idea.vim.newapi.IjVimEditor;
 import com.maddyhome.idea.vim.options.helpers.GuiCursorAttributes;
 import com.maddyhome.idea.vim.options.helpers.GuiCursorMode;
 import com.maddyhome.idea.vim.options.helpers.GuiCursorOptionHelper;
@@ -65,6 +67,9 @@ public class ExTextField extends JTextField {
         // If we're in the middle of an action (e.g. entering a register to paste, or inserting a digraph), cancel it if
         // the mouse is clicked anywhere. Vim's behavior is to use the mouse click as an event, which can lead to
         // something like : !%!C, which I don't believe is documented, or useful
+        if (currentAction != null) {
+          clearCurrentAction();
+        }
         super.mouseClicked(e);
       }
     });
@@ -235,15 +240,20 @@ public class ExTextField extends JTextField {
     // This gets called for ALL events, before the IDE starts to process key events for the action system. We can add a
     // dispatcher that checks that the plugin is enabled, checks that the component with the focus is ExTextField,
     // dispatch to ExEntryPanel#handleKey and if it's processed, mark the event as consumed.
-    KeyEvent event = new KeyEvent(this, keyChar != KeyEvent.CHAR_UNDEFINED ? KeyEvent.KEY_TYPED :
-                                        (stroke.isOnKeyRelease() ? KeyEvent.KEY_RELEASED : KeyEvent.KEY_PRESSED),
-                                  (new Date()).getTime(), modifiers, keyCode, c);
+    if (currentAction != null) {
+      currentAction.actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, String.valueOf(c), modifiers));
+    }
+    else {
+      KeyEvent event = new KeyEvent(this, keyChar != KeyEvent.CHAR_UNDEFINED ? KeyEvent.KEY_TYPED :
+        (stroke.isOnKeyRelease() ? KeyEvent.KEY_RELEASED : KeyEvent.KEY_PRESSED),
+        (new Date()).getTime(), modifiers, keyCode, c);
 
-    useHandleKeyFromEx = false;
-    try {
-      super.processKeyEvent(event);
-    } finally {
-      useHandleKeyFromEx = true;
+      useHandleKeyFromEx = false;
+      try {
+        super.processKeyEvent(event);
+      }finally {
+        useHandleKeyFromEx = true;
+      }
     }
   }
 
@@ -269,7 +279,12 @@ public class ExTextField extends JTextField {
    * Cancels current action, if there is one. If not, cancels entry.
    */
   void escape() {
-    cancel();
+    if (currentAction != null) {
+      clearCurrentAction();
+    }
+    else {
+      cancel();
+    }
   }
 
   /**
@@ -284,10 +299,19 @@ public class ExTextField extends JTextField {
   }
 
   public void clearCurrentAction() {
+    if (currentAction != null) {
+      currentAction.reset();
+    }
+    currentAction = null;
     VimCommandLine commandLine = injector.getCommandLine().getActiveCommandLine();
     if (commandLine != null) commandLine.clearPromptCharacter();
   }
 
+  @Nullable
+  Action getCurrentAction() {
+    return currentAction;
+  }
+
   private void setInsertMode() {
     ExDocument doc = (ExDocument)getDocument();
     if (doc.isOverwrite()) {
@@ -518,9 +542,10 @@ public class ExTextField extends JTextField {
 
   private DataContext context;
   private final CommandLineCaret caret;
-  String lastEntry;
+  private String lastEntry;
   private List<HistoryEntry> history;
-  int histIndex = 0;
+  private int histIndex = 0;
+  private @Nullable MultiStepAction currentAction;
   int currentActionPromptCharacterOffset = -1;
 
   private static final Logger logger = Logger.getInstance(ExTextField.class.getName());

src/main/java/com/maddyhome/idea/vim/vimscript/Executor.kt

@@ -8,20 +8,114 @@
 
 package com.maddyhome.idea.vim.vimscript
 
+import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.components.Service
+import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.vfs.VirtualFileManager
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimScriptExecutorBase
+import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.ex.ExException
+import com.maddyhome.idea.vim.ex.FinishException
 import com.maddyhome.idea.vim.extension.VimExtensionRegistrar
+import com.maddyhome.idea.vim.history.HistoryConstants
+import com.maddyhome.idea.vim.newapi.vim
+import com.maddyhome.idea.vim.register.RegisterConstants.LAST_COMMAND_REGISTER
+import com.maddyhome.idea.vim.vimscript.model.CommandLineVimLContext
+import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
+import com.maddyhome.idea.vim.vimscript.model.VimLContext
+import com.maddyhome.idea.vim.vimscript.model.commands.Command
+import com.maddyhome.idea.vim.vimscript.model.commands.RepeatCommand
+import com.maddyhome.idea.vim.vimscript.parser.VimscriptParser
 import java.io.File
+import java.io.IOException
 
 @Service
 internal class Executor : VimScriptExecutorBase() {
-  override fun enableDelayedExtensions() {
-    VimExtensionRegistrar.enableDelayedExtensions()
+  private val logger = logger<Executor>()
+  override var executingVimscript = false
+  override var executingIdeaVimRcConfiguration = false
+
+  @Throws(ExException::class)
+  override fun execute(script: String, editor: VimEditor, context: ExecutionContext, skipHistory: Boolean, indicateErrors: Boolean, vimContext: VimLContext?): ExecutionResult {
+    try {
+      injector.vimscriptExecutor.executingVimscript = true
+      var finalResult: ExecutionResult = ExecutionResult.Success
+
+      val myScript = VimscriptParser.parse(script)
+      myScript.units.forEach { it.vimContext = vimContext ?: myScript }
+
+      for (unit in myScript.units) {
+        try {
+          val result = unit.execute(editor, context)
+          if (result is ExecutionResult.Error) {
+            finalResult = ExecutionResult.Error
+            if (indicateErrors) {
+              VimPlugin.indicateError()
+            }
+          }
+        } catch (e: ExException) {
+          if (e is FinishException) {
+            break
+          }
+          finalResult = ExecutionResult.Error
+          if (indicateErrors) {
+            VimPlugin.showMessage(e.message)
+            VimPlugin.indicateError()
+          } else {
+            logger.warn("Failed while executing $unit. " + e.message)
+          }
+        } catch (e: NotImplementedError) {
+          if (indicateErrors) {
+            VimPlugin.showMessage("Not implemented yet :(")
+            VimPlugin.indicateError()
+          }
+        } catch (e: Exception) {
+          logger.warn(e)
+          if (injector.application.isUnitTest()) {
+            throw e
+          }
+        }
+      }
+
+      if (!skipHistory) {
+        VimPlugin.getHistory().addEntry(HistoryConstants.COMMAND, script)
+        if (myScript.units.size == 1 && myScript.units[0] is Command && myScript.units[0] !is RepeatCommand) {
+          VimPlugin.getRegister().storeTextSpecial(LAST_COMMAND_REGISTER, script)
+        }
+      }
+      return finalResult
+    } finally {
+      injector.vimscriptExecutor.executingVimscript = false
+
+      // Initialize any extensions that were enabled during execution of this vimscript
+      // See the doc of this function for details
+      VimExtensionRegistrar.enableDelayedExtensions()
+    }
   }
 
-  override fun ensureFileIsSaved(file: File) {
+  override fun executeFile(file: File, editor: VimEditor, fileIsIdeaVimRcConfig: Boolean, indicateErrors: Boolean) {
+    val context = DataContext.EMPTY_CONTEXT.vim
+    try {
+      if (fileIsIdeaVimRcConfig) {
+        injector.vimscriptExecutor.executingIdeaVimRcConfiguration = true
+      }
+      ensureFileIsSaved(file)
+      execute(file.readText(), editor, context, skipHistory = true, indicateErrors)
+    } catch (ignored: IOException) {
+      LOG.error(ignored)
+    } finally {
+      if (fileIsIdeaVimRcConfig) {
+        injector.vimrcFileState.saveFileState(file.absolutePath)
+        injector.vimscriptExecutor.executingIdeaVimRcConfiguration = false
+      }
+    }
+  }
+
+  private fun ensureFileIsSaved(file: File) {
     val documentManager = FileDocumentManager.getInstance()
 
     VirtualFileManager.getInstance().findFileByNioPath(file.toPath())
@@ -29,4 +123,16 @@ internal class Executor : VimScriptExecutorBase() {
       ?.takeIf(documentManager::isDocumentUnsaved)
       ?.let(documentManager::saveDocumentAsIs)
   }
+
+  @Throws(ExException::class)
+  override fun executeLastCommand(editor: VimEditor, context: ExecutionContext): Boolean {
+    val reg = VimPlugin.getRegister().getRegister(':') ?: return false
+    val text = reg.text ?: return false
+    execute(text, editor, context, skipHistory = false, indicateErrors = true, CommandLineVimLContext)
+    return true
+  }
+
+  companion object {
+    val LOG = logger<Executor>()
+  }
 }

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/ActionListCommand.kt

@@ -45,9 +45,7 @@ internal data class ActionListCommand(val range: Range, val argument: String) :
       .filter { line -> searchPattern.all { it in line.lowercase(Locale.getDefault()) } }
       .joinToString(lineSeparator)
 
-    val outputPanel = injector.outputPanel.getOrCreate(editor, context)
-    outputPanel.addText(MessageHelper.message("ex.show.all.actions.0.1", lineSeparator, actions))
-    outputPanel.show()
+    ExOutputModel.getInstance(editor.ij).output(MessageHelper.message("ex.show.all.actions.0.1", lineSeparator, actions))
     return ExecutionResult.Success
   }
 }

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/BufferListCommand.kt

@@ -17,8 +17,8 @@ import com.intellij.vim.annotations.ExCommand
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.ex.ranges.Range
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.vimLine
@@ -45,9 +45,7 @@ internal data class BufferListCommand(val range: Range, val argument: String) :
     val filter = pruneUnsupportedFilters(arg)
     val bufferList = getBufferList(context, filter)
 
-    val outputPanel = injector.outputPanel.getOrCreate(editor, context)
-    outputPanel.addText(bufferList.joinToString(separator = "\n"))
-    outputPanel.show()
+    ExOutputModel.getInstance(editor.ij).output(bufferList.joinToString(separator = "\n"))
 
     return ExecutionResult.Success
   }

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/CmdFilterCommand.kt

@@ -15,7 +15,6 @@ import com.intellij.vim.annotations.ExCommand
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ExException
 import com.maddyhome.idea.vim.ex.ExOutputModel
@@ -75,9 +74,7 @@ internal data class CmdFilterCommand(val range: Range, val argument: String) : C
       if (range.size() == 0) {
         // Show command output in a window
         VimPlugin.getProcess().executeCommand(editor, command, null, workingDirectory)?.let {
-          val outputPanel = injector.outputPanel.getOrCreate(editor, context)
-          outputPanel.addText(it)
-          outputPanel.show()
+          ExOutputModel.getInstance(editor.ij).output(it)
         }
         lastCommand = command
         ExecutionResult.Success

src/main/resources/dictionaries/ideavim.dic

@@ -44,7 +44,6 @@ viminfo
 virtualedit
 visualbell
 visualdelay
-whichwrap
 wrapscan
 
 nobomb

src/main/resources/ksp-generated/intellij_commands.json

@@ -1,82 +0,0 @@
-[
-    {
-        "keys": ".",
-        "class": "com.maddyhome.idea.vim.action.change.RepeatChangeAction",
-        "modes": "N"
-    },
-    {
-        "keys": "<C-I>",
-        "class": "com.maddyhome.idea.vim.action.editor.VimEditorTab",
-        "modes": "I"
-    },
-    {
-        "keys": "<C-L>",
-        "class": "com.maddyhome.idea.vim.action.RedrawAction",
-        "modes": "N"
-    },
-    {
-        "keys": "<Del>",
-        "class": "com.maddyhome.idea.vim.action.editor.VimEditorDelete",
-        "modes": "I"
-    },
-    {
-        "keys": "<Down>",
-        "class": "com.maddyhome.idea.vim.action.editor.VimEditorDown",
-        "modes": "I"
-    },
-    {
-        "keys": "<Tab>",
-        "class": "com.maddyhome.idea.vim.action.editor.VimEditorTab",
-        "modes": "I"
-    },
-    {
-        "keys": "<Up>",
-        "class": "com.maddyhome.idea.vim.action.editor.VimEditorUp",
-        "modes": "I"
-    },
-    {
-        "keys": "<kDown>",
-        "class": "com.maddyhome.idea.vim.action.editor.VimEditorDown",
-        "modes": "I"
-    },
-    {
-        "keys": "<kUp>",
-        "class": "com.maddyhome.idea.vim.action.editor.VimEditorUp",
-        "modes": "I"
-    },
-    {
-        "keys": "J",
-        "class": "com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesSpacesAction",
-        "modes": "N"
-    },
-    {
-        "keys": "J",
-        "class": "com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesSpacesAction",
-        "modes": "X"
-    },
-    {
-        "keys": "K",
-        "class": "com.maddyhome.idea.vim.action.editor.VimQuickJavaDoc",
-        "modes": "N"
-    },
-    {
-        "keys": "g@",
-        "class": "com.maddyhome.idea.vim.action.change.OperatorAction",
-        "modes": "N"
-    },
-    {
-        "keys": "g@",
-        "class": "com.maddyhome.idea.vim.action.change.VisualOperatorAction",
-        "modes": "X"
-    },
-    {
-        "keys": "gJ",
-        "class": "com.maddyhome.idea.vim.action.change.delete.DeleteJoinLinesAction",
-        "modes": "N"
-    },
-    {
-        "keys": "gJ",
-        "class": "com.maddyhome.idea.vim.action.change.delete.DeleteJoinVisualLinesAction",
-        "modes": "X"
-    }
-]

src/main/resources/ksp-generated/intellij_ex_commands.json

@@ -1,9 +0,0 @@
-{
-    "!": "com.maddyhome.idea.vim.vimscript.model.commands.CmdFilterCommand",
-    "actionl[ist]": "com.maddyhome.idea.vim.vimscript.model.commands.ActionListCommand",
-    "b[uffer]": "com.maddyhome.idea.vim.vimscript.model.commands.BufferCommand",
-    "buffers": "com.maddyhome.idea.vim.vimscript.model.commands.BufferListCommand",
-    "files": "com.maddyhome.idea.vim.vimscript.model.commands.BufferListCommand",
-    "h[elp]": "com.maddyhome.idea.vim.vimscript.model.commands.HelpCommand",
-    "ls": "com.maddyhome.idea.vim.vimscript.model.commands.BufferListCommand"
-}

src/main/resources/ksp-generated/intellij_vimscript_functions.json

@@ -1,6 +0,0 @@
-{
-    "col": "com.maddyhome.idea.vim.vimscript.model.functions.handlers.ColFunctionHandler",
-    "has": "com.maddyhome.idea.vim.vimscript.model.functions.handlers.HasFunctionHandler",
-    "line": "com.maddyhome.idea.vim.vimscript.model.functions.handlers.LineFunctionHandler",
-    "submatch": "com.maddyhome.idea.vim.vimscript.model.functions.handlers.SubmatchFunctionHandler"
-}

src/test/java/org/jetbrains/plugins/ideavim/action/ChangeActionTest.kt

@@ -7,7 +7,6 @@
  */
 package org.jetbrains.plugins.ideavim.action
 
-import com.intellij.idea.TestFor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.ReturnTo
@@ -1069,14 +1068,4 @@ foobaz
       Mode.NORMAL(),
     )
   }
-
-  @Test
-  @TestFor(issues = ["VIM-2074"])
-  fun `backspace with replace mode`() {
-    configureByText("${c}Hello world")
-    typeText("R1111")
-    assertState("1111o world")
-    typeText("<BS><BS><BS>")
-    assertState("1ello world")
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/action/CopyActionTest.kt

@@ -109,7 +109,7 @@ class CopyActionTest : VimTestCase() {
   @TestWithoutNeovim(reason = SkipNeovimReason.DIFFERENT)
   @Test
   fun testYankRegisterUsesLastEnteredRegister() {
-    typeTextInFile("\"a\"byl" + "\"bp", "hel<caret>lo world\n")
+    typeTextInFile("\"a\"byl" + "\"ap", "hel<caret>lo world\n")
     assertState("helllo world\n")
   }
 

src/test/java/org/jetbrains/plugins/ideavim/action/motion/leftright/MotionBackspaceActionTest.kt

@@ -85,33 +85,4 @@ class MotionBackspaceActionTest : VimTestCase() {
       enterCommand("set whichwrap=b")
     }
   }
-
-  @TestWithoutNeovim(SkipNeovimReason.OPTION)
-  @Test
-  fun `test backspace motion with operator`() {
-    doTest(
-      "d<BS>",
-      """
-        lorem ${c}ipsum dolor sit amet
-      """.trimIndent(),
-      """
-        lorem${c}ipsum dolor sit amet
-      """.trimIndent(),
-    )
-  }
-
-  @TestWithoutNeovim(SkipNeovimReason.OPTION)
-  @Test
-  fun `test backspace motion with operator at start of line`() {
-    doTest(
-      "d<BS>",
-      """
-        lorem ipsum dolor sit amet
-        ${c}lorem ipsum dolor sit amet
-      """.trimIndent(),
-      """
-        lorem ipsum dolor sit amet${c}lorem ipsum dolor sit amet
-      """.trimIndent(),
-    )
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/action/motion/leftright/MotionSpaceActionTest.kt

@@ -85,35 +85,4 @@ class MotionSpaceActionTest : VimTestCase() {
       enterCommand("set whichwrap=s")
     }
   }
-
-  @Suppress("SpellCheckingInspection")
-  @TestWithoutNeovim(SkipNeovimReason.OPTION)
-  @Test
-  fun `test space motion with operator`() {
-    doTest(
-      "d<Space>",
-      """
-        lorem ${c}ipsum dolor sit amet
-      """.trimIndent(),
-      """
-        lorem ${c}psum dolor sit amet
-      """.trimIndent(),
-    )
-  }
-
-  @TestWithoutNeovim(SkipNeovimReason.OPTION)
-  @Test
-  fun `test space motion with operator at end of line`() {
-    doTest(
-      "d<Space>",
-      """
-        lorem ipsum dolor sit ame${c}t
-        lorem ipsum dolor sit amet
-      """.trimIndent(),
-      """
-        lorem ipsum dolor sit am${c}e
-        lorem ipsum dolor sit amet
-      """.trimIndent(),
-    )
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/ex/ExEntryTest.kt

@@ -294,20 +294,20 @@ class ExEntryTest : VimTestCase() {
 //        assertExText("set incsearch")
 
     typeExInput(":<S-Up>")
-    assertExText("set digraph")
-    typeText("<Up>")
     assertExText("set incsearch")
     typeText("<Up>")
     assertExText("digraph")
+    typeText("<Up>")
+    assertExText("set digraph")
 
     deactivateExEntry()
 
     typeExInput(":<PageUp>")
+    assertExText("set incsearch")
+    typeText("<PageUp>")
     assertExText("digraph")
     typeText("<PageUp>")
     assertExText("set digraph")
-    typeText("<PageUp>")
-    assertExText("set incsearch")
   }
 
   @TestWithoutNeovim(SkipNeovimReason.CMD)
@@ -325,20 +325,20 @@ class ExEntryTest : VimTestCase() {
     deactivateExEntry()
 
     typeExInput(":set<S-Up>")
-    assertExText("set digraph")
-    typeText("<S-Up>")
     assertExText("set incsearch")
     typeText("<S-Up>")
     assertExText("digraph")
+    typeText("<S-Up>")
+    assertExText("set digraph")
 
     deactivateExEntry()
 
     typeExInput(":set<PageUp>")
+    assertExText("set incsearch")
+    typeText("<PageUp>")
     assertExText("digraph")
     typeText("<PageUp>")
     assertExText("set digraph")
-    typeText("<PageUp>")
-    assertExText("set incsearch")
   }
 
   @Test
@@ -357,20 +357,20 @@ class ExEntryTest : VimTestCase() {
     deactivateExEntry()
 
     typeExInput("/<S-Up>")
-    assertExText("something cool")
-    typeText("<S-Up>")
     assertExText("so cool")
     typeText("<S-Up>")
     assertExText("not cool")
+    typeText("<S-Up>")
+    assertExText("something cool")
 
     deactivateExEntry()
 
     typeExInput("/<PageUp>")
+    assertExText("so cool")
+    typeText("<PageUp>")
     assertExText("not cool")
     typeText("<PageUp>")
     assertExText("something cool")
-    typeText("<PageUp>")
-    assertExText("so cool")
   }
 
   @VimBehaviorDiffers(description = "Vim reorders history even when cancelling entry")
@@ -394,20 +394,20 @@ class ExEntryTest : VimTestCase() {
 //        assertEquals("set incsearch", exEntryPanel.text)
 
     typeExInput("/so<S-Up>")
-    assertExText("something cool")
-    typeText("<S-Up>")
     assertExText("so cool")
     typeText("<S-Up>")
     assertExText("not cool")
+    typeText("<S-Up>")
+    assertExText("something cool")
 
     deactivateExEntry()
 
     typeExInput("/so<PageUp>")
+    assertExText("so cool")
+    typeText("<PageUp>")
     assertExText("not cool")
     typeText("<PageUp>")
     assertExText("something cool")
-    typeText("<PageUp>")
-    assertExText("so cool")
   }
 
   @Test

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/MapCommandTest.kt

@@ -26,7 +26,6 @@ import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import kotlin.test.assertEquals
-import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
 /**
@@ -268,7 +267,7 @@ class MapCommandTest : VimTestCase() {
     configureByText("${c}foo\n")
     typeText(commandToKeys("imap a b \\| c"))
     typeText(injector.parser.parseKeys("ia"))
-    assertState("b | cfoo\n")
+    assertState("b \\| cfoo\n")
   }
 
   // VIM-666 |:imap|
@@ -278,7 +277,7 @@ class MapCommandTest : VimTestCase() {
     configureByText("${c}foo\n")
     typeText(commandToKeys("imap a b \\| c    |"))
     typeText(injector.parser.parseKeys("ia"))
-    assertState("b | c    foo\n")
+    assertState("b \\| c    foo\n")
   }
 
   // VIM-670 |:map|
@@ -755,23 +754,4 @@ class MapCommandTest : VimTestCase() {
 
     assertTrue(KeyHandler.getInstance().keyStack.isEmpty())
   }
-
-  @TestFor(issues = ["VIM-3601"])
-  @Test
-  fun `mapping to something with bars`() {
-    configureByText(
-      """
-     Lorem Ipsum
-
-     Lorem ipsum dolor sit amet,
-     ${c}consectetur adipiscing elit
-     Sed in orci mauris.
-     Cras id tellus in ex imperdiet egestas. 
-    """.trimIndent()
-    )
-    typeText(commandToKeys("map k :echo 4<CR> \\| :echo 42<CR>"))
-    assertNull(injector.outputPanel.getCurrentOutputPanel())
-    typeText("k")
-    assertEquals("4\n42", injector.outputPanel.getCurrentOutputPanel()!!.text)
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/PrintCommandTest.kt

@@ -32,7 +32,7 @@ class PrintCommandTest : VimTestCase() {
     // We should be waiting for a keypress now, such as <Enter> or <Esc> to close the output panel. But that's handled
     // by a separate key event loop which doesn't operate in tests.
     // Simulate closing the output panel in the same way as if we'd entered the right key
-    injector.outputPanel.getCurrentOutputPanel()?.close()
+    ExOutputModel.getInstance(fixture.editor).close()
     typeText(commandToKeys("p"))
     assertExOutput("    Lorem Ipsum")
   }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/services/VimVariableServiceTest.kt

@@ -15,7 +15,7 @@ class VimVariableServiceTest : VimTestCase() {
   @Test
   fun `test v count variable without count specified`() {
     configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':echo ' .. v:count .. "\<CR>"""")
+    enterCommand("nnoremap <expr> n ':echo ' .. v:count .. \"\\<CR>\"")
     typeText("n")
     assertExOutput("0")
   }
@@ -23,31 +23,15 @@ class VimVariableServiceTest : VimTestCase() {
   @Test
   fun `test v count variable`() {
     configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':' .. "\<C-u>" .. 'echo ' .. v:count .. "\<CR>"""")
+    enterCommand("nnoremap <expr> n ':' .. \"\\<C-u>\" .. 'echo ' .. v:count .. \"\\<CR>\"")
     typeText("5n")
     assertExOutput("5")
   }
 
-  @Test
-  fun `test v count variable with additional count during select register`() {
-    configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':' .. "\<C-u>" .. 'echo ' .. v:count .. "\<CR>"""")
-    typeText("2\"a5n")
-    assertExOutput("10")
-  }
-
-  @Test
-  fun `test v count variable with additional pathological count during select register`() {
-    configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':' .. "\<C-u>" .. 'echo ' .. v:count .. "\<CR>"""")
-    typeText("2\"a3\"b4\"c5n")
-    assertExOutput("120")
-  }
-
   @Test
   fun `test v count1 variable without count specified`() {
     configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':echo ' .. v:count1 .. "\<CR>"""")
+    enterCommand("nnoremap <expr> n ':echo ' .. v:count1 .. \"\\<CR>\"")
     typeText("n")
     assertExOutput("1")
   }
@@ -55,27 +39,11 @@ class VimVariableServiceTest : VimTestCase() {
   @Test
   fun `test v count1 variable`() {
     configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':' .. "\<C-u>" .. 'echo ' .. v:count1 .. "\<CR>"""")
+    enterCommand("nnoremap <expr> n ':' .. \"\\<C-u>\" .. 'echo ' .. v:count1 .. \"\\<CR>\"")
     typeText("5n")
     assertExOutput("5")
   }
 
-  @Test
-  fun `test v count1 variable with additional count during select register`() {
-    configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':' .. "\<C-u>" .. 'echo ' .. v:count1 .. "\<CR>"""")
-    typeText("2\"a5n")
-    assertExOutput("10")
-  }
-
-  @Test
-  fun `test v count1 variable with additional pathological count during select register`() {
-    configureByText("\n")
-    enterCommand("""nnoremap <expr> n ':' .. "\<C-u>" .. 'echo ' .. v:count1 .. "\<CR>"""")
-    typeText("2\"a3\"b4\"c5n")
-    assertExOutput("120")
-  }
-
   @Test
   fun `test mapping with updating jumplist`() {
     configureByText("${c}1\n2\n3\n4\n5\n6\n7\n8\n9\n")

src/test/java/org/jetbrains/plugins/ideavim/extension/argtextobj/VimArgTextObjExtensionTest.kt

@@ -141,16 +141,6 @@ Mode.INSERT,
     )
   }
 
-  @Test
-  fun testDeleteWithMultipleCounts() {
-    doTest(
-      "2d2aa",
-      "function(int <caret>arg1,    char* arg<caret>2=\"a,b,c(d,e)\", bool arg3, string arg4, int arg5)",
-      "function(<caret>)",
-      Mode.NORMAL(),
-    )
-  }
-
   @Test
   fun testSelectTwoArguments() {
     doTest(

src/testFixtures/kotlin/org/jetbrains/plugins/ideavim/VimTestCase.kt

@@ -660,7 +660,7 @@ abstract class VimTestCase {
   }
 
   fun assertExOutput(expected: String, clear: Boolean = true) {
-    val actual = injector.outputPanel.getCurrentOutputPanel()?.text
+    val actual = ExOutputModel.getInstance(fixture.editor).text
     assertNotNull(actual, "No Ex output")
     assertEquals(expected, actual)
     NeovimTesting.typeCommand("<esc>", testInfo, fixture.editor)

tests/java-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/action/ChangeActionJavaTest.kt

@@ -16,7 +16,6 @@ import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimBehaviorDiffers
 import org.jetbrains.plugins.ideavim.VimJavaTestCase
 import org.junit.jupiter.api.Test
-import kotlin.test.assertEquals
 
 class ChangeActionJavaTest : VimJavaTestCase() {
   // VIM-511 |.|
@@ -121,28 +120,6 @@ and some text after""",
     )
   }
 
-  // VIM-566
-  @TestWithoutNeovim(SkipNeovimReason.FOLDING)
-  @Test
-  fun testInsertAfterToggleFold() {
-    configureByJavaText(
-      """
-          $c/**
-           * I should be fold
-           * a little more text
-           * and final fold
-           */
-          and some text after
-      """.trimIndent(),
-    )
-    CodeFoldingManager.getInstance(fixture.project).updateFoldRegions(fixture.editor)
-    assertEquals(FoldingUtil.findFoldRegionStartingAtLine(fixture.editor, 0)!!.isExpanded, true)
-    typeText(injector.parser.parseKeys("za"))
-    assertEquals(FoldingUtil.findFoldRegionStartingAtLine(fixture.editor, 0)!!.isExpanded, false)
-    typeText(injector.parser.parseKeys("za"))
-    assertEquals(FoldingUtil.findFoldRegionStartingAtLine(fixture.editor, 0)!!.isExpanded, true)
-  }
-
   // VIM-287 |zc| |o|
   @TestWithoutNeovim(SkipNeovimReason.FOLDING)
   @Test

tests/property-tests/src/test/kotlin/org/jetbrains/plugins/ideavim/propertybased/RandomActionsPropertyTest.kt

@@ -95,7 +95,7 @@ private class AvailableActions(private val editor: Editor) : ImperativeCommand {
     val currentNode = KeyHandler.getInstance().keyHandlerState.commandBuilder.getCurrentTrie()
 
     // Note: esc is always an option
-    val possibleKeys = (currentNode.children.keys.toList() + esc).sortedBy { injector.parser.toKeyNotation(it) }
+    val possibleKeys = (currentNode.keys.toList() + esc).sortedBy { injector.parser.toKeyNotation(it) }
     println("Keys: ${possibleKeys.joinToString(", ")}")
     val keyGenerator = Generator.integers(0, possibleKeys.lastIndex)
       .suchThat { injector.parser.toKeyNotation(possibleKeys[it]) !in stinkyKeysList }

tests/ui-fixtures/build.gradle.kts

@@ -15,7 +15,7 @@ val javaVersion: String by project
 val remoteRobotVersion: String by project
 
 dependencies {
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
+  testFixturesImplementation("org.junit.jupiter:junit-jupiter:5.10.3")
   compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
   testFixturesImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
   testFixturesImplementation(testFixtures(project(":"))) // The root project

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/KeyHandler.kt

@@ -17,13 +17,14 @@ import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.MappingMode
 import com.maddyhome.idea.vim.command.MappingProcessor
 import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.common.CurrentCommandState
 import com.maddyhome.idea.vim.diagnostic.VimLogger
 import com.maddyhome.idea.vim.diagnostic.trace
 import com.maddyhome.idea.vim.diagnostic.vimLogger
 import com.maddyhome.idea.vim.impl.state.toMappingMode
+import com.maddyhome.idea.vim.key.CommandPartNode
 import com.maddyhome.idea.vim.key.KeyConsumer
 import com.maddyhome.idea.vim.key.KeyStack
-import com.maddyhome.idea.vim.key.RootNode
 import com.maddyhome.idea.vim.key.consumers.CharArgumentConsumer
 import com.maddyhome.idea.vim.key.consumers.CommandConsumer
 import com.maddyhome.idea.vim.key.consumers.CommandCountConsumer
@@ -54,15 +55,8 @@ class KeyHandler {
   private val keyConsumers: List<KeyConsumer> = listOf(ModalInputConsumer(), MappingProcessor, CommandCountConsumer(), DeleteCommandConsumer(), EditorResetConsumer(), CharArgumentConsumer(), RegisterConsumer(), DigraphConsumer(), CommandConsumer(), SelectRegisterConsumer(), ModeInputConsumer())
   private var handleKeyRecursionCount = 0
 
-  // KeyHandlerState requires injector.keyGroup to be initialized and that's why we don't create it immediately and have this here
-  // TODO figure out a better solution
-  private val defaultKeyHandlerState by lazy { KeyHandlerState() }
-  private var mutableKeyHandlerState: KeyHandlerState? = null
-  var keyHandlerState: KeyHandlerState
-    get() = mutableKeyHandlerState ?: defaultKeyHandlerState
-    private set(value) {
-      mutableKeyHandlerState = value
-    }
+  var keyHandlerState: KeyHandlerState = KeyHandlerState()
+    private set
 
   val keyStack: KeyStack = KeyStack()
   val modalEntryKeys: MutableList<KeyStroke> = ArrayList()
@@ -196,9 +190,11 @@ class KeyHandler {
   }
 
   private fun onUnknownKey(editor: VimEditor, keyState: KeyHandlerState) {
+    logger.trace("Command builder is set to BAD")
+    keyState.commandBuilder.commandState = CurrentCommandState.BAD_COMMAND
     editor.resetOpPending()
+    injector.vimState.resetRegisterPending()
     editor.isReplaceCharacter = false
-    // Note that this will also reset the CommandBuilder to NEW_COMMAND
     reset(keyState, editor.mode)
   }
 
@@ -207,6 +203,14 @@ class KeyHandler {
     injector.messages.indicateError()
   }
 
+  fun isDuplicateOperatorKeyStroke(key: KeyStroke, mode: Mode, keyState: KeyHandlerState): Boolean {
+    return isOperatorPending(mode, keyState) && keyState.commandBuilder.isDuplicateOperatorKeyStroke(key)
+  }
+
+  fun isOperatorPending(mode: Mode, keyState: KeyHandlerState): Boolean {
+    return mode is Mode.OP_PENDING && !keyState.commandBuilder.isEmpty
+  }
+
   private fun executeCommand(
     editor: VimEditor,
     context: ExecutionContext,
@@ -215,7 +219,11 @@ class KeyHandler {
   ) {
     logger.trace("Command execution")
     val command = keyState.commandBuilder.buildCommand()
-    val operatorArguments = OperatorArguments(command.rawCount, editorState.mode)
+    val operatorArguments = OperatorArguments(
+      editor.mode is Mode.OP_PENDING,
+      command.rawCount,
+      editorState.mode,
+    )
 
     // If we were in "operator pending" mode, reset back to normal mode.
     // But opening command line should not reset operator pending mode (e.g. `d/foo`
@@ -275,12 +283,11 @@ class KeyHandler {
   // TODO we should have a single reset method
   fun reset(keyState: KeyHandlerState, mode: Mode) {
     logger.trace { "Reset is executed" }
-    injector.commandLine.getActiveCommandLine()?.clearCurrentAction()
     keyHandlerState.partialReset(mode)
     keyState.commandBuilder.resetAll(getKeyRoot(mode.toMappingMode()))
   }
 
-  private fun getKeyRoot(mappingMode: MappingMode): RootNode<LazyVimCommand> {
+  private fun getKeyRoot(mappingMode: MappingMode): CommandPartNode<LazyVimCommand> {
     return injector.keyGroup.getKeyRoot(mappingMode)
   }
 
@@ -326,7 +333,7 @@ class KeyHandler {
   ) : Runnable {
     override fun run() {
       val editorState = injector.vimState
-
+      keyState.commandBuilder.commandState = CurrentCommandState.NEW_COMMAND
       val register = cmd.register
       if (register != null) {
         injector.registerGroup.selectRegister(register)
@@ -346,15 +353,22 @@ class KeyHandler {
       // 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 (editorState.mode is Mode.NORMAL && !cmd.flags.contains(CommandFlags.FLAG_EXPECT_MORE)) {
-        when (editorState.mode.returnTo) {
-          ReturnTo.INSERT -> editor.mode = Mode.INSERT
-          ReturnTo.REPLACE -> editor.mode = Mode.REPLACE
-          null -> {}
+      val myMode = editorState.mode
+      val returnTo = myMode.returnTo
+      if (myMode is Mode.NORMAL && returnTo != null && !cmd.flags.contains(CommandFlags.FLAG_EXPECT_MORE)) {
+        when (returnTo) {
+          ReturnTo.INSERT -> {
+            editor.mode = Mode.INSERT
+          }
+
+          ReturnTo.REPLACE -> {
+            editor.mode = Mode.REPLACE
+          }
         }
       }
-
-      instance.reset(keyState, editorState.mode)
+      if (keyState.commandBuilder.isDone()) {
+        getInstance().reset(keyState, editorState.mode)
+      }
     }
   }
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeCharacterAction.kt

@@ -17,17 +17,23 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.lineLength
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.diagnostic.debug
 import com.maddyhome.idea.vim.diagnostic.vimLogger
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
 import com.maddyhome.idea.vim.state.KeyHandlerState
+import java.util.*
 
 @CommandOrMotion(keys = ["r"], modes = [Mode.NORMAL])
 class ChangeCharacterAction : ChangeEditorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.CHANGE
+
   override val argumentType: Argument.Type = Argument.Type.DIGRAPH
 
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_ALLOW_DIGRAPH)
+
   override fun onStartWaitingForArgument(editor: VimEditor, context: ExecutionContext, keyState: KeyHandlerState) {
     editor.isReplaceCharacter = true
   }
@@ -39,7 +45,7 @@ class ChangeCharacterAction : ChangeEditorActionHandler.ForEachCaret() {
     argument: Argument?,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    return argument is Argument.Character && changeCharacter(editor, caret, operatorArguments.count1, argument.character)
+    return argument != null && changeCharacter(editor, caret, operatorArguments.count1, argument.character)
   }
 }
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.kt

@@ -37,11 +37,12 @@ class ChangeLineAction : ChangeInInsertSequenceAction() {
   ): Boolean {
     // `S` command is a synonym of `cc`
     val motion = MotionDownLess1FirstNonSpaceAction()
+    val command = Command(1, motion, motion.type, motion.flags)
     return injector.changeGroup.changeMotion(
       editor,
       caret,
       context,
-      Argument.Motion(motion, null),
+      Argument(command),
       operatorArguments,
     )
   }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeReplaceAction.kt

@@ -15,7 +15,6 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.common.VimEditorReplaceMask
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
 
 @CommandOrMotion(keys = ["R"], modes = [Mode.NORMAL])
@@ -40,5 +39,4 @@ class ChangeReplaceAction : ChangeEditorActionHandler.SingleExecution() {
  */
 private fun changeReplace(editor: VimEditor, context: ExecutionContext) {
   injector.changeGroup.initInsert(editor, context, com.maddyhome.idea.vim.state.mode.Mode.REPLACE)
-  editor.replaceMask = VimEditorReplaceMask()
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeVisualAction.kt

@@ -39,6 +39,7 @@ class ChangeVisualAction : VisualOperatorActionHandler.ForEachCaret() {
       range.toVimTextRange(false),
       range.type,
       context,
+      operatorArguments,
     )
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeVisualCharacterAction.kt

@@ -15,13 +15,16 @@ import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.diagnostic.debug
 import com.maddyhome.idea.vim.diagnostic.vimLogger
 import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
+import com.maddyhome.idea.vim.helper.enumSetOf
 import com.maddyhome.idea.vim.state.KeyHandlerState
+import java.util.*
 
 /**
  * @author vlan
@@ -29,8 +32,11 @@ import com.maddyhome.idea.vim.state.KeyHandlerState
 @CommandOrMotion(keys = ["r"], modes = [Mode.VISUAL])
 class ChangeVisualCharacterAction : VisualOperatorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.CHANGE
+
   override val argumentType: Argument.Type = Argument.Type.DIGRAPH
 
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_ALLOW_DIGRAPH)
+
   override fun onStartWaitingForArgument(editor: VimEditor, context: ExecutionContext, keyState: KeyHandlerState) {
     editor.isReplaceCharacter = true
   }
@@ -44,7 +50,7 @@ class ChangeVisualCharacterAction : VisualOperatorActionHandler.ForEachCaret() {
     operatorArguments: OperatorArguments,
   ): Boolean {
     val argument = cmd.argument
-    return argument is Argument.Character &&
+    return argument != null &&
       changeCharacterRange(editor, caret, range.toVimTextRange(false), argument.character)
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.kt

@@ -56,6 +56,7 @@ class ChangeVisualLinesAction : VisualOperatorActionHandler.ForEachCaret() {
       lineRange,
       SelectionType.LINE_WISE,
       context,
+      operatorArguments,
     )
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.kt

@@ -53,7 +53,7 @@ class ChangeVisualLinesEndAction : VisualOperatorActionHandler.ForEachCaret() {
         }
       }
       val blockRange = TextRange(starts, ends)
-      injector.changeGroup.changeRange(editor, caret, blockRange, SelectionType.BLOCK_WISE, context)
+      injector.changeGroup.changeRange(editor, caret, blockRange, SelectionType.BLOCK_WISE, context, operatorArguments)
     } else {
       val lineEndForOffset = editor.getLineEndForOffset(vimTextRange.endOffset)
       val endsWithNewLine = if (lineEndForOffset.toLong() == editor.fileSize()) 0 else 1
@@ -61,7 +61,7 @@ class ChangeVisualLinesEndAction : VisualOperatorActionHandler.ForEachCaret() {
         editor.getLineStartForOffset(vimTextRange.startOffset),
         lineEndForOffset + endsWithNewLine,
       )
-      injector.changeGroup.changeRange(editor, caret, lineRange, SelectionType.LINE_WISE, context)
+      injector.changeGroup.changeRange(editor, caret, lineRange, SelectionType.LINE_WISE, context, operatorArguments)
     }
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/change/FilterMotionAction.kt

@@ -31,7 +31,7 @@ class FilterVisualLinesAction : VimActionHandler.SingleExecution(), FilterComman
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     // Start ex entry with the initial text set to the calculated range and `!`
-    startFilterCommand(editor, context, cmd.rawCount)
+    startFilterCommand(editor, context, cmd)
     return true
   }
 }
@@ -63,13 +63,13 @@ class FilterMotionAction : VimActionHandler.SingleExecution(), FilterCommand, Du
 
     // Start ex entry with the initial text set to the calculated range and `!`
     val count = if (start.line < end.line) end.line - start.line + 1 else 1
-    startFilterCommand(editor, context, count)
+    startFilterCommand(editor, context, Argument.EMPTY_COMMAND.copy(rawCount = count))
     return true
   }
 }
 
 interface FilterCommand {
-  fun startFilterCommand(editor: VimEditor, context: ExecutionContext, count0: Int) {
-    injector.commandLine.createCommandPrompt(editor, context, count0, initialText = "!")
+  fun startFilterCommand(editor: VimEditor, context: ExecutionContext, cmd: Command) {
+    injector.commandLine.createCommandPrompt(editor, context, cmd, initialText = "!")
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/delete/DeleteMotionAction.kt

@@ -38,6 +38,6 @@ class DeleteMotionAction : ChangeEditorActionHandler.ForEachCaret(), DuplicableO
     val (range, selectionType) = injector.changeGroup
       .getDeleteRangeAndType(editor, caret, context, argument, false, operatorArguments)
       ?: return false
-    return injector.changeGroup.deleteRange(editor, caret, range, selectionType, false)
+    return injector.changeGroup.deleteRange(editor, caret, range, selectionType, false, operatorArguments)
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/delete/DeleteVisualAction.kt

@@ -40,6 +40,7 @@ class DeleteVisualAction : VisualOperatorActionHandler.ForEachCaret() {
       range.toVimTextRange(false),
       selectionType,
       false,
+      operatorArguments,
     )
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesAction.kt

@@ -56,6 +56,6 @@ class DeleteVisualLinesAction : VisualOperatorActionHandler.ForEachCaret() {
         Triple(caret, lineRange, SelectionType.LINE_WISE)
       }
     }
-    return injector.changeGroup.deleteRange(editor, usedCaret, usedRange, usedType, false)
+    return injector.changeGroup.deleteRange(editor, usedCaret, usedRange, usedType, false, operatorArguments)
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/delete/DeleteVisualLinesEndAction.kt

@@ -58,6 +58,7 @@ class DeleteVisualLinesEndAction : VisualOperatorActionHandler.ForEachCaret() {
         blockRange,
         SelectionType.BLOCK_WISE,
         false,
+        operatorArguments,
       )
     } else {
       val lineEndForOffset = editor.getLineEndForOffset(vimTextRange.endOffset)
@@ -66,7 +67,7 @@ class DeleteVisualLinesEndAction : VisualOperatorActionHandler.ForEachCaret() {
         editor.getLineStartForOffset(vimTextRange.startOffset),
         lineEndForOffset + endsWithNewLine,
       )
-      injector.changeGroup.deleteRange(editor, caret, lineRange, SelectionType.LINE_WISE, false)
+      injector.changeGroup.deleteRange(editor, caret, lineRange, SelectionType.LINE_WISE, false, operatorArguments)
     }
   }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/InsertBackspaceAction.kt

@@ -1,40 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.vim.annotations.CommandOrMotion
-import com.intellij.vim.annotations.Mode
-import com.maddyhome.idea.vim.api.ExecutionContext
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.getLineStartForOffset
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.Command
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.VimActionHandler
-
-@CommandOrMotion(keys = ["<C-H>", "<BS>"], modes = [Mode.INSERT])
-internal class InsertBackspaceAction : VimActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.OTHER_WRITABLE
-
-  override fun execute( editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments, ): Boolean {
-    if (editor.insertMode) {
-      injector.changeGroup.processBackspace(editor, context)
-    } else {
-      for (caret in editor.carets()) {
-        val offset = (caret.offset - 1).takeIf { it > 0 } ?: continue
-        val oldChar = editor.replaceMask?.popChange(editor, offset)
-        if (oldChar != null) {
-          injector.changeGroup.replaceText(editor, caret, offset, offset + 1, oldChar.toString())
-        }
-        caret.moveToOffset(offset)
-      }
-    }
-    return true
-  }
-}

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/InsertCompletedDigraphAction.kt

@@ -52,8 +52,7 @@ class InsertCompletedDigraphAction : VimActionHandler.SingleExecution() {
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     // The converted digraph character has been captured as an argument, push it back through key handler
-    val argument = cmd.argument as? Argument.Character ?: return false
-    val keyStroke = KeyStroke.getKeyStroke(argument.character)
+    val keyStroke = KeyStroke.getKeyStroke(cmd.argument!!.character)
     val keyHandler = KeyHandler.getInstance()
     keyHandler.handleKey(editor, keyStroke, context, keyHandler.keyHandlerState)
     return true

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/InsertCompletedLiteralAction.kt

@@ -52,8 +52,7 @@ class InsertCompletedLiteralAction : VimActionHandler.SingleExecution() {
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     // The converted literal character has been captured as an argument, push it back through key handler
-    val argument = cmd.argument as? Argument.Character ?: return false
-    val keyStroke = KeyStroke.getKeyStroke(argument.character)
+    val keyStroke = KeyStroke.getKeyStroke(cmd.argument!!.character)
     val keyHandler = KeyHandler.getInstance()
     keyHandler.handleKey(editor, keyStroke, context, keyHandler.keyHandlerState)
     return true

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/InsertDeleteInsertedTextAction.kt

@@ -36,7 +36,7 @@ class InsertDeleteInsertedTextAction : ChangeEditorActionHandler.ForEachCaret()
     argument: Argument?,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    return insertDeleteInsertedText(editor, caret)
+    return insertDeleteInsertedText(editor, caret, operatorArguments)
   }
 }
 
@@ -48,7 +48,11 @@ class InsertDeleteInsertedTextAction : ChangeEditorActionHandler.ForEachCaret()
  * @param caret  The caret on which the action is performed
  * @return true if able to delete the text, false if not
  */
-private fun insertDeleteInsertedText(editor: VimEditor, caret: VimCaret): Boolean {
+private fun insertDeleteInsertedText(
+  editor: VimEditor,
+  caret: VimCaret,
+  operatorArguments: OperatorArguments,
+): Boolean {
   var deleteTo = caret.vimInsertStart.startOffset
   val offset = caret.offset
   if (offset == deleteTo) {
@@ -61,6 +65,7 @@ private fun insertDeleteInsertedText(editor: VimEditor, caret: VimCaret): Boolea
       TextRange(deleteTo, offset),
       SelectionType.CHARACTER_WISE,
       false,
+      operatorArguments,
     )
     return true
   }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/InsertDeletePreviousWordAction.kt

@@ -37,7 +37,7 @@ class InsertDeletePreviousWordAction : ChangeEditorActionHandler.ForEachCaret()
     argument: Argument?,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    return insertDeletePreviousWord(editor, caret)
+    return insertDeletePreviousWord(editor, caret, operatorArguments)
   }
 }
 
@@ -50,7 +50,7 @@ class InsertDeletePreviousWordAction : ChangeEditorActionHandler.ForEachCaret()
  * @param editor The editor to delete the text from
  * @return true if able to delete text, false if not
  */
-private fun insertDeletePreviousWord(editor: VimEditor, caret: VimCaret): Boolean {
+private fun insertDeletePreviousWord(editor: VimEditor, caret: VimCaret, operatorArguments: OperatorArguments): Boolean {
   val deleteTo: Int = if (caret.getBufferPosition().column == 0) {
     caret.offset - 1
   } else {
@@ -74,6 +74,6 @@ private fun insertDeletePreviousWord(editor: VimEditor, caret: VimCaret): Boolea
     return false
   }
   val range = TextRange(deleteTo, caret.offset)
-  injector.changeGroup.deleteRange(editor, caret, range, SelectionType.CHARACTER_WISE, true)
+  injector.changeGroup.deleteRange(editor, caret, range, SelectionType.CHARACTER_WISE, true, operatorArguments)
   return true
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/InsertRegisterAction.kt

@@ -18,10 +18,14 @@ import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ExException
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.RWLockLabel
+import com.maddyhome.idea.vim.helper.isCloseKeyStroke
+import com.maddyhome.idea.vim.key.interceptors.VimInputInterceptorBase
 import com.maddyhome.idea.vim.put.PutData
 import com.maddyhome.idea.vim.register.Register
 import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.vimscript.model.Script
+import java.awt.event.KeyEvent
+import javax.swing.KeyStroke
 
 @CommandOrMotion(keys = ["<C-R>"], modes = [Mode.INSERT])
 class InsertRegisterAction : VimActionHandler.SingleExecution() {
@@ -35,8 +39,9 @@ class InsertRegisterAction : VimActionHandler.SingleExecution() {
     cmd: Command,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    val argument = cmd.argument as? Argument.Character ?: return false
-    if (argument.character == '=') {
+    val argument = cmd.argument
+
+    if (argument?.character == '=') {
       injector.commandLine.readInputAndProcess(editor, context, "=", finishOn = null) { input ->
         try {
           if (input.isNotEmpty()) {
@@ -45,7 +50,7 @@ class InsertRegisterAction : VimActionHandler.SingleExecution() {
             val textToStore = expression.toInsertableString()
             injector.registerGroup.storeTextSpecial('=', textToStore)
           }
-          insertRegister(editor, context, '=')
+          insertRegister(editor, context, '=', operatorArguments)
         } catch (e: ExException) {
           injector.messages.indicateError()
           injector.messages.showStatusBarMessage(editor, e.message)
@@ -53,7 +58,7 @@ class InsertRegisterAction : VimActionHandler.SingleExecution() {
       }
       return true
     } else {
-      return insertRegister(editor, context, argument.character)
+      return argument != null && insertRegister(editor, context, argument.character, operatorArguments)
     }
   }
 }
@@ -67,13 +72,18 @@ class InsertRegisterAction : VimActionHandler.SingleExecution() {
  * @return true if able to insert the register contents, false if not
  */
 @RWLockLabel.SelfSynchronized
-private fun insertRegister(editor: VimEditor, context: ExecutionContext, key: Char): Boolean {
+private fun insertRegister(
+  editor: VimEditor,
+  context: ExecutionContext,
+  key: Char,
+  operatorArguments: OperatorArguments,
+): Boolean {
   val register: Register? = injector.registerGroup.getRegister(key)
   if (register != null) {
     val text = register.rawText ?: injector.parser.toPrintableString(register.keys)
     val textData = PutData.TextData(text, SelectionType.CHARACTER_WISE, emptyList(), register.name)
     val putData = PutData(textData, null, 1, insertTextBeforeCaret = true, rawIndent = true, caretAfterInsertedText = true)
-    injector.put.putText(editor, context, putData)
+    injector.put.putText(editor, context, putData, operatorArguments = operatorArguments)
     return true
   }
   return false

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/VisualBlockAppendAction.kt

@@ -36,7 +36,7 @@ class VisualBlockAppendAction : VisualOperatorActionHandler.SingleExecution() {
     if (editor.isOneLineMode()) return false
     val range = caretsAndSelections.values.stream().findFirst().orElse(null) ?: return false
     return if (range.type == SelectionType.BLOCK_WISE) {
-      injector.changeGroup.initBlockInsert(editor, context, range.toVimTextRange(false), true)
+      injector.changeGroup.blockInsert(editor, context, range.toVimTextRange(false), true, operatorArguments)
     } else {
       injector.changeGroup.insertAfterLineEnd(editor, context)
       true

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/change/insert/VisualBlockInsertAction.kt

@@ -36,7 +36,7 @@ class VisualBlockInsertAction : VisualOperatorActionHandler.SingleExecution() {
     if (editor.isOneLineMode()) return false
     val vimSelection = caretsAndSelections.values.stream().findFirst().orElse(null) ?: return false
     return if (vimSelection.type == SelectionType.BLOCK_WISE) {
-      injector.changeGroup.initBlockInsert(editor, context, vimSelection.toVimTextRange(false), false)
+      injector.changeGroup.blockInsert(editor, context, vimSelection.toVimTextRange(false), false, operatorArguments)
     } else {
       injector.changeGroup.insertBeforeFirstNonBlank(editor, context)
       true

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/copy/PutTextAction.kt

@@ -52,7 +52,7 @@ sealed class PutTextBaseAction(
       }
       result
     } else {
-      injector.put.putText(editor, context, getPutData(count))
+      injector.put.putText(editor, context, getPutData(count), operatorArguments)
     }
   }
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/ex/DeleteNextCharAction.kt

@@ -1,46 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package com.maddyhome.idea.vim.action.ex
-
-import com.intellij.vim.annotations.CommandOrMotion
-import com.intellij.vim.annotations.Mode
-import com.maddyhome.idea.vim.api.ExecutionContext
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.Command
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.common.Graphemes
-import com.maddyhome.idea.vim.handler.VimActionHandler
-
-@CommandOrMotion(keys = ["<DEL>"], modes = [Mode.CMD_LINE])
-class DeleteNextCharAction : VimActionHandler.SingleExecution()  {
-  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
-
-  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val commandLine = injector.commandLine.getActiveCommandLine() ?: return false
-    val caretOffset = commandLine.caret.offset
-
-    val oldText = commandLine.actualText
-    if (oldText.isEmpty()) {
-      commandLine.close(refocusOwningEditor = true, resetCaret = false)
-      return true
-    }
-
-    val newText = if (caretOffset == oldText.length) {
-      val preEndOffset = Graphemes.prev(oldText, oldText.length) ?: return true
-      oldText.substring(0, preEndOffset)
-    } else {
-      val nextOffset = Graphemes.next(oldText, caretOffset) ?: return true
-      oldText.substring(0, caretOffset) + oldText.substring(nextOffset)
-    }
-    commandLine.setText(newText)
-
-    return true
-  }
-}

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/ex/DeletePrevWordAction.kt

@@ -1,44 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package com.maddyhome.idea.vim.action.ex
-
-import com.intellij.vim.annotations.CommandOrMotion
-import com.intellij.vim.annotations.Mode
-import com.maddyhome.idea.vim.api.ExecutionContext
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.Command
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.VimActionHandler
-
-@CommandOrMotion(keys = ["<C-W>"], modes = [Mode.CMD_LINE])
-class DeletePrevWordAction : VimActionHandler.SingleExecution()  {
-  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
-
-  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val commandLine = injector.commandLine.getActiveCommandLine() ?: return false
-
-    val caretOffset = commandLine.caret.offset
-    if (caretOffset == 0) return true
-
-    val oldText = commandLine.actualText
-    val motion = injector.motion.findOffsetOfNextWord(oldText, oldText.length, commandLine.caret.offset, -1, true, editor)
-    when (motion) {
-      is Motion.AbsoluteOffset -> {
-        val newText = oldText.substring(0, motion.offset) + oldText.substring(caretOffset)
-        commandLine.caret.offset = motion.offset
-        commandLine.setText(newText)
-      }
-      else -> {}
-    }
-
-    return true
-  }
-}

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/ex/DeletePreviousCharAction.kt

@@ -1,44 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package com.maddyhome.idea.vim.action.ex
-
-import com.intellij.vim.annotations.CommandOrMotion
-import com.intellij.vim.annotations.Mode
-import com.maddyhome.idea.vim.api.ExecutionContext
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.Command
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.common.Graphemes
-import com.maddyhome.idea.vim.handler.VimActionHandler
-
-@CommandOrMotion(keys = ["<BS>", "<C-H>"], modes = [Mode.CMD_LINE])
-class DeletePreviousCharAction : VimActionHandler.SingleExecution()  {
-  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
-
-  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val commandLine = injector.commandLine.getActiveCommandLine() ?: return false
-
-    val oldText = commandLine.actualText
-    if (oldText.isEmpty()) {
-      commandLine.close(refocusOwningEditor = true, resetCaret = false)
-      return true
-    }
-
-    val caretOffset = commandLine.caret.offset
-    if (caretOffset == 0) return true
-
-    val prevOffset = Graphemes.prev(oldText, caretOffset) ?: 0
-    commandLine.caret.offset = prevOffset
-    val newText = oldText.substring(0, prevOffset) + oldText.substring(caretOffset)
-    commandLine.setText(newText)
-
-    return true
-  }
-}

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/ex/DeleteToCaretAction.kt

@@ -1,32 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package com.maddyhome.idea.vim.action.ex
-
-import com.intellij.vim.annotations.CommandOrMotion
-import com.intellij.vim.annotations.Mode
-import com.maddyhome.idea.vim.api.ExecutionContext
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.Command
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.VimActionHandler
-
-@CommandOrMotion(keys = ["<C-U>"], modes = [Mode.CMD_LINE])
-class DeleteToCaretAction  : VimActionHandler.SingleExecution()  {
-  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
-
-  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val commandLine = injector.commandLine.getActiveCommandLine() ?: return false
-    val oldText = commandLine.actualText
-    val newText = oldText.substring(commandLine.caret.offset)
-    commandLine.setText(newText)
-    commandLine.caret.offset = 0
-    return true
-  }
-}

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/action/ex/ExEntryAction.kt

@@ -20,13 +20,13 @@ import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
 
 @CommandOrMotion(keys = [":"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING])
-class ExEntryAction : VimActionHandler.SingleExecution() {
+internal class ExEntryAction : VimActionHandler.SingleExecution() {
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_START_EX)
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     if (editor.isOneLineMode()) return false
-    injector.commandLine.createCommandPrompt(editor, context, cmd.rawCount, initialText = "")
+    injector.commandLine.createCommandPrompt(editor, context, cmd, initialText = "")
     return true
   }
 }