Set plugin version to chylex-37

Revert per-caret registers
Revert "Factor disposable objects on editor opening"
2025-08-17 16:31:45 +02:00 · 2024-07-09 05:56:31 +02:00 · 2024-07-09 05:56:31 +02:00 · 2024-07-09 05:48:41 +02:00 · 2024-07-09 05:48:41 +02:00 · 2024-07-09 05:48:35 +02:00
306 changed files with 4370 additions and 7779 deletions
--- a/.github/workflows/integrationsTest.yml
+++ b/.github/workflows/integrationsTest.yml
@@ -27,7 +27,7 @@ jobs:
          settings-path: ${{ github.workspace }} # location for the settings.xml file

      - name: Run tests
-        run: ./gradlew --no-configuration-cache integrationsTest
+        run: ./gradlew integrationsTest
        env:
          YOUTRACK_TOKEN: ${{ secrets.YOUTRACK_TOKEN }}
          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/runUiOctopusTests.yml
+++ b/.github/workflows/runUiOctopusTests.yml
@@ -16,14 +16,14 @@ jobs:
          java-version: 17
      - name: Setup FFmpeg
        run: brew install ffmpeg
-#      - name: Setup Gradle
-#        uses: gradle/gradle-build-action@v2.4.2
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2.4.2
      - name: Build Plugin
        run: gradle :buildPlugin
      - name: Run Idea
        run: |
          mkdir -p build/reports
-          gradle --no-configuration-cache runIdeForUiTests -Doctopus.handler=false > build/reports/idea.log &
+          gradle runIdeForUiTests -Doctopus.handler=false > build/reports/idea.log &
      - name: Wait for Idea started
        uses: jtalk/url-health-check-action@v3
        with:
@@ -37,7 +37,7 @@ jobs:
        run: mv tests/ui-ij-tests/video build/reports
      - name: Move sandbox logs
        if: always()
-        run: mv build/idea-sandbox/IC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/system/log sandbox-idea-log
      - name: Save report
        if: always()
        uses: actions/upload-artifact@v4
@@ -46,7 +46,7 @@ jobs:
          path: |
            build/reports
            tests/ui-ij-tests/build/reports
-            idea-sandbox-log
+            sandbox-idea-log
 #  build-for-ui-test-linux:
 #    runs-on: ubuntu-latest
 #    steps:
@@ -78,4 +78,4 @@ jobs:
 #        with:
 #          name: ui-test-fails-report-linux
 #          path: |
-#            ui-test-example/build/reports
+#            ui-test-example/build/reports
--- a/.github/workflows/runUiPyTests.yml
+++ b/.github/workflows/runUiPyTests.yml
@@ -19,14 +19,14 @@ jobs:
          python-version: '3.10'
      - name: Setup FFmpeg
        run: brew install ffmpeg
-#      - name: Setup Gradle
-#        uses: gradle/gradle-build-action@v2.4.2
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2.4.2
      - name: Build Plugin
        run: gradle :buildPlugin
      - name: Run Idea
        run: |
          mkdir -p build/reports
-          gradle --no-configuration-cache :runIdeForUiTests -PideaType=PC > build/reports/idea.log &
+          gradle :runIdeForUiTests -PideaType=PC > build/reports/idea.log &
      - name: Wait for Idea started
        uses: jtalk/url-health-check-action@v3
        with:
@@ -40,7 +40,7 @@ jobs:
        run: mv tests/ui-py-tests/video build/reports
      - name: Move sandbox logs
        if: always()
-        run: mv build/idea-sandbox/PC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/system/log sandbox-idea-log
      - name: Save report
        if: always()
        uses: actions/upload-artifact@v4
@@ -49,4 +49,4 @@ jobs:
          path: |
            build/reports
            tests/ui-py-tests/build/reports
-            idea-sandbox-log
+            sandbox-idea-log
--- a/.github/workflows/runUiTests.yml
+++ b/.github/workflows/runUiTests.yml
@@ -16,14 +16,14 @@ jobs:
          java-version: 17
      - name: Setup FFmpeg
        run: brew install ffmpeg
-#      - name: Setup Gradle
-#        uses: gradle/gradle-build-action@v2.4.2
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2.4.2
      - name: Build Plugin
        run: gradle :buildPlugin
      - name: Run Idea
        run: |
          mkdir -p build/reports
-          gradle --no-configuration-cache runIdeForUiTests > build/reports/idea.log &
+          gradle runIdeForUiTests > build/reports/idea.log &
      - name: Wait for Idea started
        uses: jtalk/url-health-check-action@v3
        with:
@@ -37,7 +37,7 @@ jobs:
        run: mv tests/ui-ij-tests/video build/reports
      - name: Move sandbox logs
        if: always()
-        run: mv build/idea-sandbox/IC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/system/log sandbox-idea-log
      - name: Save report
        if: always()
        uses: actions/upload-artifact@v4
@@ -46,7 +46,7 @@ jobs:
          path: |
            build/reports
            tests/ui-ij-tests/build/reports
-            idea-sandbox-log
+            sandbox-idea-log
 #  build-for-ui-test-linux:
 #    runs-on: ubuntu-latest
 #    steps:
@@ -78,4 +78,4 @@ jobs:
 #        with:
 #          name: ui-test-fails-report-linux
 #          path: |
-#            ui-test-example/build/reports
+#            ui-test-example/build/reports
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *.swp
 /.gradle/
-/.intellijPlatform/

 /.idea/
 !/.idea/scopes
@@ -27,8 +26,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
-
-.kotlin
--- a/.idea/runConfigurations/IdeaVim_full_verification.xml
+++ b/.idea/runConfigurations/IdeaVim_full_verification.xml
@@ -12,7 +12,7 @@
      <option name="taskNames">
        <list>
          <option value="check" />
-          <option value="verifyPlugin" />
+          <option value="runPluginVerifier" />
        </list>
      </option>
      <option name="vmOptions" value="" />
@@ -20,7 +20,6 @@
    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
    <DebugAllEnabled>false</DebugAllEnabled>
-    <RunAsTest>false</RunAsTest>
    <method v="2" />
  </configuration>
 </component>
--- a/.teamcity/_Self/Project.kt
+++ b/.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)
--- a/.teamcity/_Self/buildTypes/Compatibility.kt
+++ b/.teamcity/_Self/buildTypes/Compatibility.kt
@@ -37,7 +37,7 @@ object Compatibility : IdeaVimBuildType({
              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}IdeaVimExtension' [latest-IU] -team-city
              # Outdated java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}github.zgqq.intellij-enhance' [latest-IU] -team-city
-              # java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
            """.trimIndent()
--- a/.teamcity/_Self/buildTypes/PluginVerifier.kt
+++ b/.teamcity/_Self/buildTypes/PluginVerifier.kt
@@ -22,7 +22,7 @@ object PluginVerifier : IdeaVimBuildType({

  steps {
    gradle {
-      tasks = "clean verifyPlugin"
+      tasks = "clean runPluginVerifier"
      buildFile = ""
      enableStacktrace = true
    }
--- a/.teamcity/_Self/buildTypes/ReleasePlugin.kt
+++ b/.teamcity/_Self/buildTypes/ReleasePlugin.kt
@@ -144,7 +144,6 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
    gradle {
      name = "Run Integrations"
      tasks = "releaseActions"
-      gradleParams = "--no-configuration-cache"
    }
 //    gradle {
 //      name = "Slack Notification"
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -523,22 +523,6 @@ Contributors:
  [![icon][github]](https://github.com/LazyScaper)
  &nbsp;
  Jake
-* [![icon][mail]](mailto:the1xdeveloper@gmail.com)
-  [![icon][github]](https://github.com/The1xDeveloper)
-  &nbsp;
-  The1xDeveloper
-* [![icon][mail]](mailto:shaunewilliams@gmail.com)
-  [![icon][github]](https://github.com/shaunlebron)
-  &nbsp;
-  shaun
-* [![icon][mail]](mailto:i.i.babko@gmail.com)
-  [![icon][github]](https://github.com/igorbabko)
-  &nbsp;
-  Igor Babko
-* [![icon][mail]](mailto:533601+felixwiemuth@users.noreply.github.com)
-  [![icon][github]](https://github.com/felixwiemuth)
-  &nbsp;
-  Felix Wiemuth

 Previous contributors:

--- a/CHANGES.md
+++ b/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

--- a/CONTRIBUTING.md
+++ b/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`.
--- a/README.md
+++ b/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)
@@ -221,13 +222,13 @@ Ex commands or via `:map` command mappings:
    * Execute an action by `{action_id}`. Works from Ex command line.
    * Please don't use `:action` in mappings. Use `<Action>` instead.

-### Finding action IDs:
+### Finding action ids:

-* IJ provides `IdeaVim: track action IDs` command to show the id of the executed actions.
+* IJ provides `IdeaVim: track action Ids` command to show the id of the executed actions.
  This command can be found in "Search everywhere" (double `shift`).

    <details>
-        <summary><strong>"Track action IDs" Details</strong> (click to see)</summary>
+        <summary><strong>"Track action Ids" Details</strong> (click to see)</summary>
        <picture>
            <source media="(prefers-color-scheme: dark)" srcset="assets/readme/track_action_dark.gif">
            <img src="assets/readme/track_action_light.gif" alt="track action ids"/>
@@ -368,8 +369,6 @@ is the full list of synonyms.
 - Fancy constants for [undolevels](https://vimhelp.org/options.txt.html#%27undolevels%27):
  > The local value is set to -123456 when the global value is to be used.

- Vi (not Vim) is a POSIX standard, and [has a spec](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/vi.html)! Vim is mostly POSIX compliant when Vi compatibility is selected with the `'compatible'` option, but there are still some differences that can be changed with `'copoptions'`. The spec is interesting because it documents the behaviour of different commands in a stricter style than the user documentation, describing the current line and column after the command, for example. [More details can be found by reading `:help posix`](https://vimhelp.org/vi_diff.txt.html#posix).
-
 License
 -------

--- a/annotation-processors/build.gradle.kts
+++ b/annotation-processors/build.gradle.kts
@@ -8,7 +8,7 @@

 plugins {
  kotlin("jvm")
-  kotlin("plugin.serialization") version "2.0.0"
+  kotlin("plugin.serialization") version "1.9.22"
 }

 val kotlinxSerializationVersion: String by project
@@ -21,7 +21,7 @@ repositories {
 }

 dependencies {
-  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.0.0-1.0.24")
+  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.0.0-1.0.22")
  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:$kotlinxSerializationVersion") {
    // kotlin stdlib is provided by IJ, so there is no need to include it into the distribution
    exclude("org.jetbrains.kotlin", "kotlin-stdlib")
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/processors/CommandOrMotionProcessor.kt
+++ b/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()
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/processors/ExCommandProcessor.kt
+++ b/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()
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/processors/VimscriptFunctionProcessor.kt
+++ b/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()
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,8 +32,6 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.RepositoryBuilder
 import org.intellij.markdown.ast.getTextInNode
 import org.jetbrains.changelog.Changelog
-import org.jetbrains.intellij.platform.gradle.TestFrameworkType
-import org.jetbrains.intellij.platform.gradle.tasks.aware.SplitModeAware
 import org.kohsuke.github.GHUser
 import java.net.HttpURLConnection
 import java.net.URL
@@ -45,7 +43,7 @@ buildscript {
  }

  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
    classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
    classpath("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")

@@ -66,23 +64,25 @@ buildscript {

 plugins {
  java
-  kotlin("jvm") version "2.0.0"
+  kotlin("jvm") version "1.9.22"
  application
  id("java-test-fixtures")
-  id("org.jetbrains.intellij.platform") version "2.0.0-rc2"
-  id("org.jetbrains.changelog") version "2.2.1"
+
+  id("org.jetbrains.intellij") version "1.17.3"
+  id("org.jetbrains.changelog") version "2.2.0"
+
  id("org.jetbrains.kotlinx.kover") version "0.6.1"
  id("com.dorongold.task-tree") version "4.0.0"
-  id("com.google.devtools.ksp") version "2.0.0-1.0.23"
-}

-val moduleSources by configurations.registering
+  id("com.google.devtools.ksp") version "1.9.22-1.0.17"
+}

 // Import variables from gradle.properties file
 val javaVersion: String by project
 val kotlinVersion: String by project
 val ideaVersion: String by project
 val ideaType: String by project
+val downloadIdeaSources: String by project
 val instrumentPluginCode: String by project
 val remoteRobotVersion: String by project
 val splitModeVersion: String by project
@@ -97,9 +97,7 @@ val releaseType: String? by project

 repositories {
  mavenCentral()
-  intellijPlatform {
-    defaultRepositories()
-  }
+  maven { url = uri("https://cache-redirector.jetbrains.com/intellij-dependencies") }
 }

 dependencies {
@@ -110,28 +108,10 @@ dependencies {
  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
  compileOnly("org.jetbrains:annotations:24.1.0")

-  intellijPlatform {
-    // Note that it is also possible to use local("...") to compile against a locally installed IDE
-    // E.g. local("/Users/{user}/Applications/IntelliJ IDEA Ultimate.app")
-    // Or something like: intellijIdeaUltimate(ideaVersion)
-    create(ideaType, ideaVersion)
-
-    pluginVerifier()
-    zipSigner()
-    instrumentationTools()
-
-    testFramework(TestFrameworkType.Platform)
-    testFramework(TestFrameworkType.JUnit5)
-
-    // AceJump is an optional dependency. We use their SessionManager class to check if it's active
-    plugin("AceJump", "3.8.19")
-    plugin("com.intellij.classic.ui", "242.20224.159")
-  }
-
-  moduleSources(project(":vim-engine", "sourcesJarArtifacts"))
-
  // --------- Test dependencies ----------

+  testImplementation(testFixtures(project(":")))
+
  testApi("com.squareup.okhttp3:okhttp:4.12.0")

  // https://mvnrepository.com/artifact/com.ensarsarajcic.neovim.java/neovim-api
@@ -145,7 +125,7 @@ dependencies {
  testFixturesImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")

  // https://mvnrepository.com/artifact/org.mockito.kotlin/mockito-kotlin
-  testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")
+  testImplementation("org.mockito.kotlin:mockito-kotlin:5.3.1")

  testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3")
  testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.3")
@@ -153,12 +133,6 @@ dependencies {
  testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3")
  testFixturesImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.3")
  testFixturesImplementation("org.junit.jupiter:junit-jupiter-params:5.10.3")
-
-  // Temp workaround suggested in https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#junit5-test-framework-refers-to-junit4
-  // Can be removed when IJPL-159134 is fixed
-//  testRuntimeOnly("junit:junit:4.13.2")
-  testImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
-//  testFixturesImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
 }

 configurations {
@@ -198,94 +172,60 @@ tasks {
      // See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
      // For the list of bundled versions
      apiVersion = "1.9"
-      freeCompilerArgs = listOf(
-        "-Xjvm-default=all-compatibility",
-
-        // Needed to compile the AceJump which uses kotlin beta
-        //  Without these two option compilation fails
-        "-Xskip-prerelease-check",
-        "-Xallow-unstable-dependencies",
-      )
+      freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
 //            allWarningsAsErrors = true
    }
  }

  compileTestKotlin {
-    enabled = false
-    
    kotlinOptions {
      jvmTarget = javaVersion
      apiVersion = "1.9"
-
-      // Needed to compile the AceJump which uses kotlin beta
-      //  Without these two option compilation fails
-      freeCompilerArgs += listOf("-Xskip-prerelease-check", "-Xallow-unstable-dependencies")
 //            allWarningsAsErrors = true
    }
  }

-  // Note that this will run the plugin installed in the IDE specified in dependencies. To run in a different IDE, use
-  // a custom task (see below)
  runIde {
    systemProperty("octopus.handler", System.getProperty("octopus.handler") ?: true)
  }

-  // Uncomment to run the plugin in a custom IDE, rather than the IDE specified as a compile target in dependencies
-  // Note that the version must be greater than the plugin's target version, for obvious reasons
-//  val runIdeCustom by intellijPlatformTesting.runIde.registering {
-//    type = IntelliJPlatformType.Rider
-//    version = "2024.1.2"
-//  }
-
-  // Uncomment to run the plugin in a locally installed IDE
-//  val runIdeLocal by intellijPlatformTesting.runIde.registering {
-//    localPath = file("/Users/{user}/Applications/WebStorm.app")
-//  }
-
-  val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
-    task {
-      jvmArgumentProviders += CommandLineArgumentProvider {
-        listOf(
-          "-Drobot-server.port=8082",
-          "-Dide.mac.message.dialogs.as.sheets=false",
-          "-Djb.privacy.policy.text=<!--999.999-->",
-          "-Djb.consents.confirmation.enabled=false",
-          "-Dide.show.tips.on.startup.default.value=false",
-          "-Doctopus.handler=" + (System.getProperty("octopus.handler") ?: true),
-        )
-      }
-    }
-
-    plugins {
-      robotServerPlugin(remoteRobotVersion)
-    }
+  downloadRobotServerPlugin {
+    version.set(remoteRobotVersion)
  }

-  val runIdeSplitMode by intellijPlatformTesting.runIde.registering {
-    splitMode = true
-    splitModeTarget = SplitModeAware.SplitModeTarget.FRONTEND
+  runIdeForUiTests {
+    systemProperty("robot-server.port", "8082")
+    systemProperty("ide.mac.message.dialogs.as.sheets", "false")
+    systemProperty("jb.privacy.policy.text", "<!--999.999-->")
+    systemProperty("jb.consents.confirmation.enabled", "false")
+    systemProperty("ide.show.tips.on.startup.default.value", "false")

-    // Frontend split mode support requires 242+
-    // TODO: Remove this once IdeaVim targets 242, as the task will naturally use the target version to run
-    version.set(splitModeVersion)
+    systemProperty("octopus.handler", System.getProperty("octopus.handler") ?: true)
  }

  // Add plugin open API sources to the plugin ZIP
-  val sourcesJar by registering(Jar::class) {
-    dependsOn(moduleSources)
+  val createOpenApiSourceJar by registering(Jar::class) {
+    // Java sources
+    from(sourceSets.main.get().java) {
+      include("**/com/maddyhome/idea/vim/**/*.java")
+    }
+    from(project(":vim-engine").sourceSets.main.get().java) {
+      include("**/com/maddyhome/idea/vim/**/*.java")
+    }
+    // Kotlin sources
+    from(kotlin.sourceSets.main.get().kotlin) {
+      include("**/com/maddyhome/idea/vim/**/*.kt")
+    }
+    from(project(":vim-engine").kotlin.sourceSets.main.get().kotlin) {
+      include("**/com/maddyhome/idea/vim/**/*.kt")
+    }
    destinationDirectory.set(layout.buildDirectory.dir("libs"))
-    archiveClassifier.set(DocsType.SOURCES)
-    from(sourceSets.main.map { it.kotlin })
-    from(provider {
-      moduleSources.map {
-        it.map { jarFile -> zipTree(jarFile) }
-      }
-    })
+    archiveClassifier.set("src")
  }

  buildPlugin {
-    dependsOn(sourcesJar)
-    from(sourcesJar) { into("lib/src") }
+    dependsOn(createOpenApiSourceJar)
+    from(createOpenApiSourceJar) { into("lib/src") }
  }
 }

@@ -310,51 +250,44 @@ gradle.projectsEvaluated {

 // --- Intellij plugin

-intellijPlatform {
-  pluginConfiguration {
-    name = "IdeaVim"
-    changeNotes.set(
-      """
-        Undo in IdeaVim now works like in Vim<br/>
-        Caret movement is no longer a separate undo step, and full insert is undoable in one step.<br/>
-        <a href="https://youtrack.jetbrains.com/issue/VIM-547/Undo-splits-Insert-mode-edits-into-separate-undo-chunks">Share Feedback</a>
-        <br/>
-        <br/>
-        <a href="https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20Fix%20versions:%20${version.get()}">Changelog</a>
-        """.trimIndent()
-    )
+intellij {
+  version.set(ideaVersion)
+  type.set(ideaType)
+  pluginName.set("IdeaVim")

-    ideaVersion {
-      // Let the Gradle plugin set the since-build version. It defaults to the version of the IDE we're building against
-      // specified as two components, `{branch}.{build}` (e.g., "241.15989"). There is no third component specified.
-      // The until-build version defaults to `{branch}.*`, but we want to support _all_ future versions, so we set it
-      // with a null provider (the provider is important).
-      // By letting the Gradle plugin handle this, the Plugin DevKit IntelliJ plugin cannot help us with the "Usage of
-      // IntelliJ API not available in older IDEs" inspection. However, since our since-build is the version we compile
-      // against, we can never get an API that's newer - it would be an unresolved symbol.
-      untilBuild.set(provider { null })
-    }
-  }
+  updateSinceUntilBuild.set(false)

-  publishing {
+  downloadSources.set(downloadIdeaSources.toBoolean())
+  instrumentCode.set(instrumentPluginCode.toBoolean())
+  intellijRepository.set("https://www.jetbrains.com/intellij-repository")
+  plugins.set(listOf("AceJump:3.8.11"))
+}
+
+tasks {
+  publishPlugin {
    channels.set(publishChannels.split(","))
    token.set(publishToken)
  }

-  signing {
+  signPlugin {
    certificateChain.set(providers.environmentVariable("CERTIFICATE_CHAIN"))
    privateKey.set(providers.environmentVariable("PRIVATE_KEY"))
    password.set(providers.environmentVariable("PRIVATE_KEY_PASSWORD"))
  }

-  verifyPlugin {
-    teamCityOutputFormat = true
-    ides {
-      recommended()
-    }
+  runPluginVerifier {
+    downloadDir.set("${project.buildDir}/pluginVerifier/ides")
+    teamCityOutputFormat.set(true)
  }

-  instrumentCode.set(instrumentPluginCode.toBoolean())
+  patchPluginXml {
+    // Don't forget to update plugin.xml
+    sinceBuild.set("241.15989.150")
+
+    changeNotes.set(
+      """<a href="https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20Fix%20versions:%20${version.get()}">Changelog</a>"""
+    )
+  }
 }

 ksp {
@@ -958,12 +891,12 @@ fun changes(): List<Change> {
  println("Start changes processing")
  for (message in messages) {
    println("Processing '$message'...")
-    val lowercaseMessage = message.lowercase()
+    val lowercaseMessage = message.toLowerCase()
    val regex = "^fix\\((vim-\\d+)\\):".toRegex()
    val findResult = regex.find(lowercaseMessage)
    if (findResult != null) {
      println("Message matches")
-      val value = findResult.groups[1]!!.value.uppercase()
+      val value = findResult.groups[1]!!.value.toUpperCase()
      val shortMessage = message.drop(findResult.range.last + 1).trim()
      newFixes += Change(value, shortMessage)
    } else {
--- a/doc/Home.md
+++ b/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)
--- a/doc/IdeaVim
+++ b/doc/IdeaVim
@@ -82,7 +82,7 @@ Original plugin: [NERDTree](https://github.com/preservim/nerdtree).
   
 ### Instructions
   
-[See here](NERDTree-support).
+[See here](NERDTree-support.md).

 </details>

--- a/doc/marketplace-plugin-example.md
+++ b/doc/marketplace-plugin-example.md
@@ -5,9 +5,9 @@ Using actions from external plugins is the same, as tracking and reusing any IDE
 1. Install the plugin via Marketplace
 2. Enable action tracking. You can enable it by one of the following ways:
    * Execute `:set trackactionids` ex command or just `:set tai`
-    * Open the "Find actions" window by pressing `Ctrl-Shift-A` and search for "Track Action IDs" to find the toggle that enables and disables action tracking
+    * Open the "Find actions" window by pressing `Ctrl-Shift-A` and search for "Track Action Ids" to find the toggle that enables and disables action tracking
 3. Execute the plugin action the way intended by plugin author "See Edit menu or use ⇧ + ⌥ + U / Shift + Alt + U" or just find the `Toggle Camel Case` action in the "Find actions" window (`Ctrl-Shift-A`). If you action tracking is on, you will see this notification in your right bottom corner:
   
   <img alt="Notification" src="images/action-id-notification.png"/>
 4. Copy the action id from the notification to create the following mapping in your .ideavimrc
-```map <leader>t <Action>(de.netnexus.CamelCasePlugin.ToggleCamelCase)```
+```map <leader>t <Action>(de.netnexus.CamelCasePlugin.ToggleCamelCase)```
--- a/doc/set-commands.md
+++ b/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
--- a/doc/support-guide.md
+++ b/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.
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,13 +16,14 @@
 # https://data.services.jetbrains.com/products?code=IC
 # Maven releases are here: https://www.jetbrains.com/intellij-repository/releases
 # And snapshots: https://www.jetbrains.com/intellij-repository/snapshots
-ideaVersion=2024.2
+ideaVersion=2024.1.1
 # Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 ideaType=IC
+downloadIdeaSources=true
 instrumentPluginCode=true
-version=chylex-41
+version=chylex-37
 javaVersion=17
-remoteRobotVersion=0.11.23
+remoteRobotVersion=0.11.22
 antlrVersion=4.10.1

 # [VERSION UPDATE] 2024.2 - remove when IdeaVim targets 2024.2
@@ -34,7 +35,7 @@ splitModeVersion=242-EAP-SNAPSHOT

 # Please don't forget to update kotlin version in buildscript section
 # Also update kotlinxSerializationVersion version
-kotlinVersion=2.0.0
+kotlinVersion=1.9.22
 publishToken=token
 publishChannels=eap

--- a/qodana.yaml
+++ b/qodana.yaml
@@ -19,8 +19,9 @@ 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/vimscript/parser/generated
+      - 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
      - tests/ui-fixtures
 dependencyIgnores:
--- a/scripts/build.gradle.kts
+++ b/scripts/build.gradle.kts
@@ -20,7 +20,7 @@ repositories {
 }

 dependencies {
-  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.25")
+  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.24")

  implementation("io.ktor:ktor-client-core:2.3.12")
  implementation("io.ktor:ktor-client-cio:2.3.10")
--- a/src/main/java/com/maddyhome/idea/vim/PluginStartup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/PluginStartup.kt
@@ -8,23 +8,14 @@

 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
 import com.intellij.openapi.project.ProjectManagerListener
 import com.intellij.openapi.startup.ProjectActivity
-import com.intellij.openapi.updateSettings.impl.UpdateSettings
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.initInjector
-import com.maddyhome.idea.vim.ui.JoinEap
-import com.maddyhome.idea.vim.ui.JoinEap.EAP_LINK

 /**
 * @author Alex Plate
@@ -37,32 +28,14 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {
    if (firstInitializationOccurred) return
    firstInitializationOccurred = true

-    if (!VimPlugin.getVimState().wasSubscibedToEAPAutomatically && ApplicationManager.getApplication().isEAP && !JoinEap.eapActive()) {
-      VimPlugin.getVimState().wasSubscibedToEAPAutomatically = true
-      UpdateSettings.getInstance().storedPluginHosts += EAP_LINK
-    }
-
    // 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")
-        }
-      }
-    })
  }
 }

 // This is a temporal workaround for VIM-2487
 internal class PyNotebooksCloseWorkaround : ProjectManagerListener {
  override fun projectClosingBeforeSave(project: Project) {
-    initInjector()
    // TODO: Confirm context in CWM scenario
    if (injector.globalIjOptions().closenotebooks) {
      injector.editorGroup.getEditors().forEach { vimEditor ->
--- a/src/main/java/com/maddyhome/idea/vim/VimPlugin.java
+++ b/src/main/java/com/maddyhome/idea/vim/VimPlugin.java
@@ -37,7 +37,6 @@ import com.maddyhome.idea.vim.group.visual.VisualMotionGroup;
 import com.maddyhome.idea.vim.helper.MacKeyRepeat;
 import com.maddyhome.idea.vim.listener.VimListenerManager;
 import com.maddyhome.idea.vim.newapi.IjVimInjector;
-import com.maddyhome.idea.vim.newapi.IjVimInjectorKt;
 import com.maddyhome.idea.vim.newapi.IjVimSearchGroup;
 import com.maddyhome.idea.vim.ui.StatusBarIconFactory;
 import com.maddyhome.idea.vim.vimscript.services.VariableService;
@@ -68,7 +67,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
  private static final Logger LOG = Logger.getInstance(VimPlugin.class);

  static {
-    IjVimInjectorKt.initInjector();
+    VimInjectorKt.setInjector(new IjVimInjector());
  }

  private final @NotNull VimState state = new VimState();
--- a/src/main/java/com/maddyhome/idea/vim/VimProjectService.kt
+++ b/src/main/java/com/maddyhome/idea/vim/VimProjectService.kt
@@ -18,7 +18,7 @@ import com.maddyhome.idea.vim.ui.ex.ExEntryPanel
 internal class VimProjectService(val project: Project) : Disposable {
  override fun dispose() {
    // Not sure if this is a best solution
-    ExEntryPanel.getInstance().setEditor(null)
+    ExEntryPanel.getInstance().editor = null
  }

  companion object {
--- a/src/main/java/com/maddyhome/idea/vim/action/VimRunLastMacroInOpenFiles.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/VimRunLastMacroInOpenFiles.kt
@@ -1,52 +0,0 @@
-package com.maddyhome.idea.vim.action
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.command.UndoConfirmationPolicy
-import com.intellij.openapi.command.WriteCommandAction
-import com.intellij.openapi.fileEditor.TextEditor
-import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
-import com.intellij.openapi.project.DumbAwareAction
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
-import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.Mode
-
-class VimRunLastMacroInOpenFiles : DumbAwareAction() {
-  override fun update(e: AnActionEvent) {
-    val lastRegister = injector.macro.lastRegister
-    val isEnabled = lastRegister != 0.toChar()
-
-    e.presentation.isEnabled = isEnabled
-    e.presentation.text = if (isEnabled) "Run Macro '${lastRegister}' in Open Files" else "Run Last Macro in Open Files"
-  }
-
-  override fun getActionUpdateThread(): ActionUpdateThread {
-    return ActionUpdateThread.EDT
-  }
-
-  override fun actionPerformed(e: AnActionEvent) {
-    val project = e.project ?: return
-    val fileEditorManager = FileEditorManagerEx.getInstanceExIfCreated(project) ?: return
-    val editors = fileEditorManager.allEditors.filterIsInstance<TextEditor>()
-    
-    WriteCommandAction.writeCommandAction(project)
-      .withName(e.presentation.text)
-      .withGlobalUndo()
-      .withUndoConfirmationPolicy(UndoConfirmationPolicy.REQUEST_CONFIRMATION)
-      .run<RuntimeException> {
-        val reg = injector.macro.lastRegister
-        
-        for (editor in editors) {
-          fileEditorManager.openFile(editor.file, true)
-          
-          val vimEditor = editor.editor.vim
-          vimEditor.mode = Mode.NORMAL()
-          KeyHandler.getInstance().reset(vimEditor)
-          
-          injector.macro.playbackRegister(vimEditor, IjEditorExecutionContext(e.dataContext), reg, 1)
-        }
-      }
-  }
-}
--- a/src/main/java/com/maddyhome/idea/vim/action/VimShortcutKeyAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/VimShortcutKeyAction.kt
@@ -43,7 +43,6 @@ import com.maddyhome.idea.vim.key.ShortcutOwnerInfo
 import com.maddyhome.idea.vim.listener.AceJumpService
 import com.maddyhome.idea.vim.listener.AppCodeTemplates.appCodeTemplateCaptured
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.ui.ex.ExEntryPanel
 import com.maddyhome.idea.vim.ui.ex.ExTextField
@@ -62,13 +61,10 @@ import javax.swing.KeyStroke
 *   way to get ideavim keys for this plugin. See VIM-3085
 */
 class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
-
-  init {
-    initInjector()
-  }
-
  private val traceTime: Boolean
    get() {
+      // Make sure the injector is initialized
+      VimPlugin.getInstance()
      return injector.globalOptions().ideatracetime
    }

@@ -261,7 +257,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
  private fun getEditor(e: AnActionEvent): Editor? {
    return e.getData(PlatformDataKeys.EDITOR)
      ?: if (e.getData(PlatformDataKeys.CONTEXT_COMPONENT) is ExTextField) {
-        ExEntryPanel.getInstance().ijEditor
+        ExEntryPanel.getInstance().editor
      } else {
        null
      }
--- a/src/main/java/com/maddyhome/idea/vim/action/change/OperatorAction.kt
+++ b/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
--- a/src/main/java/com/maddyhome/idea/vim/action/change/RepeatChangeAction.kt
+++ b/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

--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesAction.kt
+++ b/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(
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinLinesSpacesAction.kt
+++ b/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
      }
    }
--- a/src/main/java/com/maddyhome/idea/vim/action/editor/VimEditorActions.kt
+++ b/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
@@ -74,7 +79,7 @@ internal class VimQuickJavaDoc : VimActionHandler.SingleExecution() {
  override val type: Command.Type = Command.Type.OTHER_READONLY

  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    injector.actionExecutor.executeAction(editor, IdeActions.ACTION_QUICK_JAVADOC, context)
+    injector.actionExecutor.executeAction(IdeActions.ACTION_QUICK_JAVADOC, context)
    return true
  }
 }
--- a/src/main/java/com/maddyhome/idea/vim/command/CommandState.kt
+++ b/src/main/java/com/maddyhome/idea/vim/command/CommandState.kt
@@ -1,72 +0,0 @@
-/*
- * 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.command
-
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.state.VimStateMachine
-
-/**
- * COMPATIBILITY-LAYER: Additional class
- * Please see: https://jb.gg/zo8n0r
- */
-@Deprecated("Use `injector.vimState`")
-class CommandState(private val machine: VimStateMachine) {
-
-  val mode: Mode
-    get() {
-      val myMode = machine.mode
-      return when (myMode) {
-        is com.maddyhome.idea.vim.state.mode.Mode.CMD_LINE -> Mode.CMD_LINE
-        com.maddyhome.idea.vim.state.mode.Mode.INSERT -> Mode.INSERT
-        is com.maddyhome.idea.vim.state.mode.Mode.NORMAL -> Mode.COMMAND
-        is com.maddyhome.idea.vim.state.mode.Mode.OP_PENDING -> Mode.OP_PENDING
-        com.maddyhome.idea.vim.state.mode.Mode.REPLACE -> Mode.REPLACE
-        is com.maddyhome.idea.vim.state.mode.Mode.SELECT -> Mode.SELECT
-        is com.maddyhome.idea.vim.state.mode.Mode.VISUAL -> Mode.VISUAL
-      }
-    }
-
-  @Deprecated("Use `KeyHandler.keyHandlerState.commandBuilder", ReplaceWith(
-    "KeyHandler.getInstance().keyHandlerState.commandBuilder",
-    "com.maddyhome.idea.vim.KeyHandler"
-  )
-  )
-  val commandBuilder: CommandBuilder
-    get() = KeyHandler.getInstance().keyHandlerState.commandBuilder
-
-  @Deprecated("Use `KeyHandler.keyHandlerState.mappingState", ReplaceWith(
-    "KeyHandler.getInstance().keyHandlerState.mappingState",
-    "com.maddyhome.idea.vim.KeyHandler"
-  )
-  )
-  val mappingState: MappingState
-    get() = KeyHandler.getInstance().keyHandlerState.mappingState
-
-  enum class Mode {
-    // Basic modes
-    COMMAND, VISUAL, SELECT, INSERT, CMD_LINE, /*EX*/
-
-    // Additional modes
-    OP_PENDING, REPLACE /*, VISUAL_REPLACE*/, INSERT_NORMAL, INSERT_VISUAL, INSERT_SELECT
-  }
-
-  enum class SubMode {
-    NONE, VISUAL_CHARACTER, VISUAL_LINE, VISUAL_BLOCK
-  }
-
-  companion object {
-    @JvmStatic
-    @Deprecated("Use `injector.vimState`")
-    fun getInstance(editor: Editor): CommandState {
-      return CommandState(injector.vimState)
-    }
-  }
-}
--- a/src/main/java/com/maddyhome/idea/vim/common/IndentConfig.kt
+++ b/src/main/java/com/maddyhome/idea/vim/common/IndentConfig.kt
@@ -12,17 +12,17 @@ import com.intellij.application.options.CodeStyle
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings.IndentOptions
-import com.maddyhome.idea.vim.api.VimIndentConfig

-internal class IndentConfig private constructor(indentOptions: IndentOptions): VimIndentConfig {
+internal class IndentConfig private constructor(indentOptions: IndentOptions) {
  private val indentSize = indentOptions.INDENT_SIZE
  private val tabSize = indentOptions.TAB_SIZE
  private val isUseTabs = indentOptions.USE_TAB_CHARACTER

-  override fun getIndentSize(depth: Int): Int = indentSize * depth
-  override fun createIndentByDepth(depth: Int): String = createIndentBySize(getIndentSize(depth))
+  fun getTotalIndent(count: Int): Int = indentSize * count

-  override fun createIndentBySize(size: Int): String {
+  fun createIndentByCount(count: Int): String = createIndentBySize(getTotalIndent(count))
+
+  fun createIndentBySize(size: Int): String {
    val tabCount: Int
    val spaceCount: Int
    if (isUseTabs) {
--- a/src/main/java/com/maddyhome/idea/vim/config/VimState.kt
+++ b/src/main/java/com/maddyhome/idea/vim/config/VimState.kt
@@ -18,8 +18,6 @@ import kotlin.reflect.KProperty
 internal class VimState {
  var isIdeaJoinNotified by StateProperty("idea-join")
  var isIdeaPutNotified by StateProperty("idea-put")
-  var isNewUndoNotified by StateProperty("idea-undo")
-  var wasSubscibedToEAPAutomatically by StateProperty("was-automatically-subscribed-to-eap")

  fun readData(element: Element) {
    val notifications = element.getChild("notifications")
--- a/src/main/java/com/maddyhome/idea/vim/ex/ExOutputModel.kt
+++ b/src/main/java/com/maddyhome/idea/vim/ex/ExOutputModel.kt
@@ -9,15 +9,14 @@ package com.maddyhome.idea.vim.ex

 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.api.VimOutputPanelBase
+import com.maddyhome.idea.vim.api.VimOutputPanel
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.vimExOutput
 import com.maddyhome.idea.vim.ui.ExOutputPanel
 import java.lang.ref.WeakReference
-import javax.swing.KeyStroke

 // TODO: We need a nicer way to handle output, especially wrt testing, appending + clearing
-class ExOutputModel(private val myEditor: WeakReference<Editor>) : VimOutputPanelBase() {
+class ExOutputModel(private val myEditor: WeakReference<Editor>) : VimOutputPanel {
  private var isActiveInTestMode = false

  val editor get() = myEditor.get()
@@ -49,24 +48,6 @@ class ExOutputModel(private val myEditor: WeakReference<Editor>) : VimOutputPane
    }
  }

-  override fun scrollPage() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.scrollPage()
-  }
-
-  override fun scrollHalfPage() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.scrollHalfPage()
-  }
-
-  override fun scrollLine() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.scrollLine()
-  }
-
  override var text: String = ""
    get() = if (!ApplicationManager.getApplication().isUnitTestMode) {
      editor?.let { ExOutputPanel.getInstance(it).text } ?: ""
@@ -85,17 +66,6 @@ class ExOutputModel(private val myEditor: WeakReference<Editor>) : VimOutputPane
        isActiveInTestMode = newValue.isNotEmpty()
      }
    }
-  override var label: String
-    get() {
-      val notNullEditor = editor ?: return ""
-      val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return ""
-      return panel.myLabel.text
-    }
-    set(value) {
-      val notNullEditor = editor ?: return
-      val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-      panel.myLabel.text = value
-    }

  fun output(text: String) {
    this.text = text
@@ -105,25 +75,6 @@ class ExOutputModel(private val myEditor: WeakReference<Editor>) : VimOutputPane
    text = ""
  }

-  override val atEnd: Boolean
-    get() {
-      val notNullEditor = editor ?: return false
-      val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return false
-      return panel.isAtEnd()
-    }
-
-  override fun onBadKey() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.onBadKey()
-  }
-
-  override fun close(key: KeyStroke?) {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.close(key)
-  }
-
  override fun close() {
    if (!ApplicationManager.getApplication().isUnitTestMode) {
      editor?.let { ExOutputPanel.getInstance(it).close() }
--- a/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionFacade.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionFacade.kt
@@ -31,7 +31,6 @@ import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.ui.ModalEntry
-import com.maddyhome.idea.vim.ui.ex.ExEntryPanelService
 import com.maddyhome.idea.vim.vimscript.model.Executable
 import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 import com.maddyhome.idea.vim.vimscript.model.VimLContext
@@ -184,7 +183,7 @@ object VimExtensionFacade {
  /** Returns a string typed in the input box similar to 'input()'. */
  @JvmStatic
  fun inputString(editor: Editor, context: DataContext, prompt: String, finishOn: Char?): String {
-    return (injector.commandLine as ExEntryPanelService).inputString(editor.vim, context.vim, prompt, finishOn) ?: ""
+    return injector.commandLine.inputString(editor.vim, context.vim, prompt, finishOn) ?: ""
  }

  /** Get the current contents of the given register similar to 'getreg()'. */
--- a/src/main/java/com/maddyhome/idea/vim/extension/argtextobj/VimArgTextObjExtension.java
+++ b/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;
      }
--- a/src/main/java/com/maddyhome/idea/vim/extension/commentary/CommentaryExtension.kt
+++ b/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 {

@@ -75,12 +79,11 @@ internal class CommentaryExtension : VimExtension {

        val project = editor.ij.project!!
        val callback = { afterCommenting(mode, editor, resetCaret, range) }
-        actions.any { executeActionWithCallbackOnSuccess(editor, it, project, context, callback) }
+        actions.any { executeActionWithCallbackOnSuccess(it, project, context, callback) }
      }
    }

    private fun executeActionWithCallbackOnSuccess(
-      editor: VimEditor,
      action: String,
      project: Project,
      context: ExecutionContext,
@@ -89,7 +92,7 @@ internal class CommentaryExtension : VimExtension {
      val res = Ref.create<Boolean>(false)
      AsyncActionExecutionService.getInstance(project).withExecutionAfterAction(
        action,
-        { res.set(injector.actionExecutor.executeAction(editor, name = action, context = context)) },
+        { res.set(injector.actionExecutor.executeAction(action, context)) },
        { if (res.get()) callback() })
      return res.get()
    }
@@ -180,8 +183,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))
    }
  }

--- a/src/main/java/com/maddyhome/idea/vim/extension/highlightedyank/VimHighlightedYank.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/highlightedyank/VimHighlightedYank.kt
@@ -23,15 +23,13 @@ import com.intellij.util.Alarm
 import com.intellij.util.Alarm.ThreadToUse
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.common.ModeChangeListener
 import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.common.VimYankListener
 import com.maddyhome.idea.vim.extension.VimExtension
 import com.maddyhome.idea.vim.helper.MessageHelper
 import com.maddyhome.idea.vim.helper.VimNlsSafe
+import com.maddyhome.idea.vim.listener.VimInsertListener
+import com.maddyhome.idea.vim.listener.VimYankListener
 import com.maddyhome.idea.vim.newapi.ij
-import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimDataType
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString
 import org.jetbrains.annotations.NonNls
@@ -77,7 +75,7 @@ internal class HighlightColorResetter : LafManagerListener {
 *
 * When a new text is yanked or user starts editing, the old highlighting would be deleted.
 */
-internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeListener {
+internal class VimHighlightedYank : VimExtension, VimYankListener, VimInsertListener {
  private val highlightHandler = HighlightHandler()
  private var initialised = false

@@ -85,8 +83,8 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis

  override fun init() {
    // Note that these listeners will still be registered when IdeaVim is disabled. However, they'll never get called
-    injector.listenersNotifier.modeChangeListeners.add(this)
-    injector.listenersNotifier.yankListeners.add(this)
+    VimPlugin.getYank().addListener(this)
+    VimPlugin.getChange().addInsertListener(this)

    // Register our own disposable to remove highlights when IdeaVim is disabled. Somehow, we need to re-register when
    // IdeaVim is re-enabled. We don't get a call back for that, but because the listeners are active until the
@@ -107,8 +105,8 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis

  override fun dispose() {
    // Called when the extension is disabled with `:set no{extension}` or if the plugin owning the extension unloads
-    injector.listenersNotifier.modeChangeListeners.remove(this)
-    injector.listenersNotifier.yankListeners.remove(this)
+    VimPlugin.getYank().removeListener(this)
+    VimPlugin.getChange().removeInsertListener(this)

    highlightHandler.clearYankHighlighters()
    initialised = false
@@ -119,8 +117,7 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis
    highlightHandler.highlightYankRange(editor.ij, range)
  }

-  override fun modeChanged(editor: VimEditor, oldMode: Mode) {
-    if (editor.mode !is Mode.INSERT) return
+  override fun insertModeStarted(editor: Editor) {
    ensureInitialised()
    highlightHandler.clearYankHighlighters()
  }
--- a/src/main/java/com/maddyhome/idea/vim/extension/matchit/Matchit.kt
+++ b/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
  }
 }
--- a/src/main/java/com/maddyhome/idea/vim/extension/nerdtree/NerdTree.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/nerdtree/NerdTree.kt
@@ -481,9 +481,6 @@ internal class NerdTree : VimExtension {
    registerCommand("NERDTreeMapNewFile", "n", NerdAction.ToIj("NewFile"))
    registerCommand("NERDTreeMapNewDir", "N", NerdAction.ToIj("NewDir"))
    registerCommand("NERDTreeMapDelete", "d", NerdAction.ToIj("\$Delete"))
-    registerCommand("NERDTreeMapCopy", "y", NerdAction.ToIj("\$Copy"))
-    registerCommand("NERDTreeMapPaste", "v", NerdAction.ToIj("\$Paste"))
-    registerCommand("NERDTreeMapRename", "<C-r>", NerdAction.ToIj("RenameElement"))
    registerCommand("NERDTreeMapRefreshRoot", "R", NerdAction.ToIj("Synchronize"))
    registerCommand("NERDTreeMapMenu", "m", NerdAction.ToIj("ShowPopupMenu"))
    registerCommand("NERDTreeMapQuit", "q", NerdAction.ToIj("HideActiveWindow"))
@@ -555,13 +552,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()
--- a/src/main/java/com/maddyhome/idea/vim/extension/replacewithregister/ReplaceWithRegister.kt
+++ b/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
    )
  }
--- a/src/main/java/com/maddyhome/idea/vim/extension/surround/VimSurroundExtension.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/surround/VimSurroundExtension.kt
@@ -36,7 +36,6 @@ import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissin
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.setRegisterForCaret
 import com.maddyhome.idea.vim.extension.exportOperatorFunction
 import com.maddyhome.idea.vim.group.findBlockRange
-import com.maddyhome.idea.vim.helper.exitVisualMode
 import com.maddyhome.idea.vim.helper.runWithEveryCaretAndRestore
 import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.IjVimCaret
@@ -51,7 +50,6 @@ import com.maddyhome.idea.vim.state.mode.selectionType
 import org.jetbrains.annotations.NonNls
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
-import com.maddyhome.idea.vim.state.mode.returnTo

 /**
 * Port of vim-surround.
@@ -117,9 +115,6 @@ internal class VimSurroundExtension : VimExtension {
 //        it.moveToOffset(lineStartOffset)
      }
      // Jump back to start
-      if (editor.mode !is Mode.NORMAL) {
-        editor.mode = Mode.NORMAL()
-      }
      executeNormalWithoutMapping(injector.parser.parseKeys("`["), ijEditor)
    }

@@ -141,7 +136,7 @@ internal class VimSurroundExtension : VimExtension {
      }
      runWriteAction {
        // Leave visual mode
-        editor.exitVisualMode()
+        executeNormalWithoutMapping(injector.parser.parseKeys("<Esc>"), editor.ij)
      }
    }
  }
@@ -311,10 +306,8 @@ internal class VimSurroundExtension : VimExtension {

    private fun getSurroundRange(caret: VimCaret): TextRange? {
      val editor = caret.editor
-      if (editor.mode is Mode.CMD_LINE) {
-        editor.mode = (editor.mode as Mode.CMD_LINE).returnTo()
-      }
-      return when (editor.mode) {
+      val ijEditor = editor.ij
+      return when (ijEditor.vim.mode) {
        is Mode.NORMAL -> injector.markService.getChangeMarks(caret)
        is Mode.VISUAL -> caret.run { TextRange(selectionStart, selectionEnd) }
        else -> null
@@ -357,9 +350,6 @@ private fun getSurroundPair(c: Char): Pair<String, String>? = if (c in SURROUND_

 private fun inputTagPair(editor: Editor, context: DataContext): Pair<String, String>? {
  val tagInput = inputString(editor, context, "<", '>')
-  if (editor.vim.mode is Mode.CMD_LINE) {
-    editor.vim.mode = editor.vim.mode.returnTo()
-  }
  val matcher = tagNameAndAttributesCapturePattern.matcher(tagInput)
  return if (matcher.find()) {
    val tagName = matcher.group(1)
@@ -376,9 +366,6 @@ private fun inputFunctionName(
  withInternalSpaces: Boolean,
 ): Pair<String, String>? {
  val functionNameInput = inputString(editor, context, "function: ", null)
-  if (editor.vim.mode is Mode.CMD_LINE) {
-    editor.vim.mode = editor.vim.mode.returnTo()
-  }
  if (functionNameInput.isEmpty()) return null
  return if (withInternalSpaces) "$functionNameInput( " to " )" else "$functionNameInput(" to ")"
 }
--- a/src/main/java/com/maddyhome/idea/vim/extension/textobjentire/VimTextObjEntireExtension.java
+++ b/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))));
      }
    }
  }
--- a/src/main/java/com/maddyhome/idea/vim/extension/textobjindent/VimIndentObject.java
+++ b/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))));
      }
    }
  }
--- a/src/main/java/com/maddyhome/idea/vim/group/ChangeGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/ChangeGroup.kt
@@ -15,35 +15,77 @@ import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.UndoConfirmationPolicy
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.LogicalPosition
 import com.intellij.openapi.editor.actions.EnterAction
 import com.intellij.openapi.editor.event.EditorMouseEvent
 import com.intellij.openapi.editor.event.EditorMouseListener
+import com.intellij.openapi.editor.impl.TextRangeInterval
 import com.intellij.openapi.util.UserDataHolder
+import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.codeStyle.CodeStyleManager
 import com.intellij.psi.util.PsiUtilBase
+import com.intellij.util.containers.ContainerUtil
 import com.maddyhome.idea.vim.EventFacade
+import com.maddyhome.idea.vim.api.BufferPosition
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimCaret
 import com.maddyhome.idea.vim.api.VimChangeGroupBase
 import com.maddyhome.idea.vim.api.VimEditor
+import com.maddyhome.idea.vim.api.VimMotionGroupBase
+import com.maddyhome.idea.vim.api.anyNonWhitespace
 import com.maddyhome.idea.vim.api.getLineEndForOffset
+import com.maddyhome.idea.vim.api.getLineEndOffset
 import com.maddyhome.idea.vim.api.getLineStartForOffset
+import com.maddyhome.idea.vim.api.getText
 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.api.lineLength
+import com.maddyhome.idea.vim.api.normalizeOffset
+import com.maddyhome.idea.vim.api.options
+import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.common.IndentConfig.Companion.create
 import com.maddyhome.idea.vim.common.TextRange
+import com.maddyhome.idea.vim.ex.ranges.LineRange
+import com.maddyhome.idea.vim.group.MotionGroup.Companion.getMotionRange2
+import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.group.visual.vimSetSystemSelectionSilently
+import com.maddyhome.idea.vim.handler.Motion
+import com.maddyhome.idea.vim.handler.Motion.AbsoluteOffset
 import com.maddyhome.idea.vim.handler.commandContinuation
+import com.maddyhome.idea.vim.helper.CharacterHelper
+import com.maddyhome.idea.vim.helper.CharacterHelper.changeCase
+import com.maddyhome.idea.vim.helper.CharacterHelper.charType
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.NumberType
+import com.maddyhome.idea.vim.helper.endOffsetInclusive
+import com.maddyhome.idea.vim.helper.findNumberUnderCursor
+import com.maddyhome.idea.vim.helper.findNumbersInRange
 import com.maddyhome.idea.vim.helper.inInsertMode
+import com.maddyhome.idea.vim.helper.moveToInlayAwareLogicalPosition
+import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
 import com.maddyhome.idea.vim.key.KeyHandlerKeeper.Companion.getInstance
 import com.maddyhome.idea.vim.listener.VimInsertListener
+import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
 import com.maddyhome.idea.vim.newapi.IjVimCaret
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.ij
+import com.maddyhome.idea.vim.regexp.VimRegex
+import com.maddyhome.idea.vim.regexp.match.VimMatchResult
 import com.maddyhome.idea.vim.state.mode.Mode
+import com.maddyhome.idea.vim.state.mode.Mode.VISUAL
+import com.maddyhome.idea.vim.state.mode.SelectionType
+import com.maddyhome.idea.vim.vimscript.model.commands.SortOption
+import org.jetbrains.annotations.TestOnly
+import java.math.BigInteger
+import java.util.*
+import java.util.function.Consumer
+import kotlin.math.max

 /**
 * Provides all the insert/replace related functionality
 */
 class ChangeGroup : VimChangeGroupBase() {
+  private val insertListeners = ContainerUtil.createLockFreeCopyOnWriteList<VimInsertListener>()
  private val listener: EditorMouseListener = object : EditorMouseListener {
    override fun mouseClicked(event: EditorMouseEvent) {
      val editor = event.editor
@@ -103,9 +145,161 @@ 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)
+  override fun getDeleteRangeAndType2(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext,
+    argument: Argument,
+    isChange: Boolean,
+    operatorArguments: OperatorArguments,
+  ): Pair<TextRange, SelectionType>? {
+    val range = getMotionRange2(
+      (editor as IjVimEditor).editor,
+      (caret as IjVimCaret).caret,
+      (context as IjEditorExecutionContext).context,
+      argument,
+      operatorArguments
+    )
+      ?: return null
+
+    // Delete motion commands that are not linewise become linewise if all the following are true:
+    // 1) The range is across multiple lines
+    // 2) There is only whitespace before the start of the range
+    // 3) There is only whitespace after the end of the range
+    var type: SelectionType
+    type = if (argument.motion.isLinewiseMotion()) {
+      SelectionType.LINE_WISE
+    } else {
+      SelectionType.CHARACTER_WISE
+    }
+    val motion = argument.motion
+    if (!isChange && !motion.isLinewiseMotion()) {
+      val start = editor.offsetToBufferPosition(range.startOffset)
+      val end = editor.offsetToBufferPosition(range.endOffset)
+      if (start.line != end.line) {
+        val offset1 = range.startOffset
+        if (!editor.anyNonWhitespace(offset1, -1)) {
+          val offset = range.endOffset
+          if (!editor.anyNonWhitespace(offset, 1)) {
+            type = SelectionType.LINE_WISE
+          }
+        }
+      }
+    }
+    return Pair(range, type)
+  }
+
+  /**
+   * Toggles the case of count characters
+   *
+   * @param editor The editor to change
+   * @param caret  The caret on which the operation is performed
+   * @param count  The number of characters to change
+   * @return true if able to change count characters
+   */
+  override fun changeCaseToggleCharacter(editor: VimEditor, caret: VimCaret, count: Int): Boolean {
+    val allowWrap = injector.options(editor).whichwrap.contains("~")
+    var motion = injector.motion.getHorizontalMotion(editor, caret, count, true, allowWrap)
+    if (motion is Motion.Error) return false
+    changeCase(editor, caret, caret.offset, (motion as AbsoluteOffset).offset, CharacterHelper.CASE_TOGGLE)
+    motion = injector.motion.getHorizontalMotion(
+      editor,
+      caret,
+      count,
+      false,
+      allowWrap
+    ) // same but without allow end because we can change till end, but can't move caret there
+    if (motion is AbsoluteOffset) {
+      caret.moveToOffset(editor.normalizeOffset(motion.offset, false))
+    }
+    return true
+  }
+
+  override fun blockInsert(
+    editor: VimEditor,
+    context: ExecutionContext,
+    range: TextRange,
+    append: Boolean,
+    operatorArguments: OperatorArguments,
+  ): Boolean {
+    val lines = getLinesCountInVisualBlock(editor, range)
+    val startPosition = editor.offsetToBufferPosition(range.startOffset)
+    val mode = operatorArguments.mode
+    val visualBlockMode = mode is VISUAL && mode.selectionType === SelectionType.BLOCK_WISE
+    for (caret in editor.carets()) {
+      val line = startPosition.line
+      var column = startPosition.column
+      if (!visualBlockMode) {
+        column = 0
+      } else if (append) {
+        column += range.maxLength
+        if (caret.vimLastColumn == VimMotionGroupBase.LAST_COLUMN) {
+          column = VimMotionGroupBase.LAST_COLUMN
+        }
+      }
+      val lineLength = editor.lineLength(line)
+      if (column < VimMotionGroupBase.LAST_COLUMN && lineLength < column) {
+        val pad = EditorHelper.pad((editor as IjVimEditor).editor, line, column)
+        val offset = editor.getLineEndOffset(line)
+        insertText(editor, caret, offset, pad)
+      }
+      if (visualBlockMode || !append) {
+        (caret as IjVimCaret).caret.moveToInlayAwareLogicalPosition(LogicalPosition(line, column))
+      }
+      if (visualBlockMode) {
+        setInsertRepeat(lines, column, append)
+      }
+    }
+    if (visualBlockMode || !append) {
+      insertBeforeCursor(editor, context)
+    } else {
+      insertAfterCursor(editor, context)
+    }
+    return true
+  }
+
+  /**
+   * Changes the case of all the characters in the range
+   *
+   * @param editor The editor to change
+   * @param caret  The caret to be moved
+   * @param range  The range to change
+   * @param type   The case change type (TOGGLE, UPPER, LOWER)
+   * @return true if able to delete the text, false if not
+   */
+  override fun changeCaseRange(editor: VimEditor, caret: VimCaret, range: TextRange, type: Char): Boolean {
+    val starts = range.startOffsets
+    val ends = range.endOffsets
+    for (i in ends.indices.reversed()) {
+      changeCase(editor, caret, starts[i], ends[i], type)
+    }
+    caret.moveToOffset(range.startOffset)
+    return true
+  }
+
+  /**
+   * This performs the actual case change.
+   *
+   * @param editor The editor to change
+   * @param start  The start offset to change
+   * @param end    The end offset to change
+   * @param type   The type of change (TOGGLE, UPPER, LOWER)
+   */
+  private fun changeCase(editor: VimEditor, caret: VimCaret, start: Int, end: Int, type: Char) {
+    var start = start
+    var end = end
+    if (start > end) {
+      val t = end
+      end = start
+      start = t
+    }
+    end = editor.normalizeOffset(end, true)
+    val chars = editor.text()
+    val sb = StringBuilder()
+    for (i in start until end) {
+      sb.append(changeCase(chars[i], type))
+    }
+    replaceText(editor, caret, start, end, sb.toString())
  }

  private fun restoreCursor(editor: VimEditor, caret: VimCaret, startLine: Int) {
@@ -116,13 +310,88 @@ class ChangeGroup : VimChangeGroupBase() {
    }
  }

-  override fun reformatCode(editor: VimEditor, start: Int, end: Int) {
+  /**
+   * Changes the case of all the character moved over by the motion argument.
+   *
+   * @param editor   The editor to change
+   * @param caret    The caret on which motion pretends to be performed
+   * @param context  The data context
+   * @param type     The case change type (TOGGLE, UPPER, LOWER)
+   * @param argument The motion command
+   * @return true if able to delete the text, false if not
+   */
+  override fun changeCaseMotion(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext?,
+    type: Char,
+    argument: Argument,
+    operatorArguments: OperatorArguments,
+  ): Boolean {
+    val range = injector.motion.getMotionRange(
+      editor, caret, context!!, argument,
+      operatorArguments
+    )
+    return range != null && changeCaseRange(editor, caret, range, type)
+  }
+
+  override fun reformatCodeMotion(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext,
+    argument: Argument,
+    operatorArguments: OperatorArguments,
+  ): Boolean {
+    val range = injector.motion.getMotionRange(
+      editor, caret, context, argument,
+      operatorArguments
+    )
+    return range != null && reformatCodeRange(editor, caret, range)
+  }
+
+  override fun reformatCodeSelection(editor: VimEditor, caret: VimCaret, range: VimSelection) {
+    val textRange = range.toVimTextRange(true)
+    reformatCodeRange(editor, caret, textRange)
+  }
+
+  private fun reformatCodeRange(editor: VimEditor, caret: VimCaret, range: TextRange): Boolean {
+    val starts = range.startOffsets
+    val ends = range.endOffsets
+    val firstLine = editor.offsetToBufferPosition(range.startOffset).line
+    for (i in ends.indices.reversed()) {
+      val startOffset = editor.getLineStartForOffset(starts[i])
+      val offset = ends[i] - if (startOffset == ends[i]) 0 else 1
+      val endOffset = editor.getLineEndForOffset(offset)
+      reformatCode(editor, startOffset, endOffset)
+    }
+    val newOffset = injector.motion.moveCaretToLineStartSkipLeading(editor, firstLine)
+    caret.moveToOffset(newOffset)
+    return true
+  }
+
+  private fun reformatCode(editor: VimEditor, start: Int, end: Int) {
    val project = (editor as IjVimEditor).editor.project ?: return
    val file = PsiUtilBase.getPsiFileInEditor(editor.editor, project) ?: return
    val textRange = com.intellij.openapi.util.TextRange.create(start, end)
    CodeStyleManager.getInstance(project).reformatText(file, listOf(textRange))
  }

+  override fun autoIndentMotion(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext,
+    argument: Argument,
+    operatorArguments: OperatorArguments,
+  ) {
+    val range = injector.motion.getMotionRange(editor, caret, context, argument, operatorArguments)
+    if (range != null) {
+      autoIndentRange(
+        editor, caret, context,
+        TextRange(range.startOffset, range.endOffsetInclusive)
+      )
+    }
+  }
+
  override fun autoIndentRange(
    editor: VimEditor,
    caret: VimCaret,
@@ -177,14 +446,361 @@ class ChangeGroup : VimChangeGroupBase() {
    }
  }

-  @Deprecated(message = "Please use listenersNotifier", replaceWith = ReplaceWith("injector.listenersNotifier.modeChangeListeners.add", imports = ["import com.maddyhome.idea.vim.api.injector"]))
-  fun addInsertListener(listener: VimInsertListener) {
-    injector.listenersNotifier.modeChangeListeners.add(listener)
+  override fun indentLines(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext,
+    lines: Int,
+    dir: Int,
+    operatorArguments: OperatorArguments,
+  ) {
+    val start = caret.offset
+    val end = injector.motion.moveCaretToRelativeLineEnd(editor, caret, lines - 1, true)
+    indentRange(editor, caret, context, TextRange(start, end), 1, dir, operatorArguments)
+  }
+
+  override fun indentMotion(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext,
+    argument: Argument,
+    dir: Int,
+    operatorArguments: OperatorArguments,
+  ) {
+    val range = injector.motion.getMotionRange(editor, caret, context, argument, operatorArguments)
+    if (range != null) {
+      indentRange(editor, caret, context, range, 1, dir, operatorArguments)
+    }
+  }
+
+  override fun indentRange(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext,
+    range: TextRange,
+    count: Int,
+    dir: Int,
+    operatorArguments: OperatorArguments,
+  ) {
+    if (logger.isDebugEnabled) {
+      logger.debug("count=$count")
+    }
+
+    // Remember the current caret column
+    val intendedColumn = caret.vimLastColumn
+    val indentConfig = create((editor as IjVimEditor).editor)
+    val sline = editor.offsetToBufferPosition(range.startOffset).line
+    val endLogicalPosition = editor.offsetToBufferPosition(range.endOffset)
+    val eline = if (endLogicalPosition.column == 0) max((endLogicalPosition.line - 1).toDouble(), 0.0)
+      .toInt() else endLogicalPosition.line
+    if (range.isMultiple) {
+      val from = editor.offsetToBufferPosition(range.startOffset).column
+      if (dir == 1) {
+        // Right shift blockwise selection
+        val indent = indentConfig.createIndentByCount(count)
+        for (l in sline..eline) {
+          val len = editor.lineLength(l)
+          if (len > from) {
+            val spos = BufferPosition(l, from, false)
+            insertText(editor, caret, spos, indent)
+          }
+        }
+      } else {
+        // Left shift blockwise selection
+        val chars = editor.text()
+        for (l in sline..eline) {
+          val len = editor.lineLength(l)
+          if (len > from) {
+            val spos = BufferPosition(l, from, false)
+            val epos = BufferPosition(l, from + indentConfig.getTotalIndent(count) - 1, false)
+            val wsoff = editor.bufferPositionToOffset(spos)
+            val weoff = editor.bufferPositionToOffset(epos)
+            var pos: Int
+            pos = wsoff
+            while (pos <= weoff) {
+              if (charType(editor, chars[pos], false) !== CharacterHelper.CharacterType.WHITESPACE) {
+                break
+              }
+              pos++
+            }
+            if (pos > wsoff) {
+              deleteText(editor, TextRange(wsoff, pos), null, caret, operatorArguments, true)
+            }
+          }
+        }
+      }
+    } else {
+      // Shift non-blockwise selection
+      for (l in sline..eline) {
+        val soff = editor.getLineStartOffset(l)
+        val eoff = editor.getLineEndOffset(l, true)
+        val woff = injector.motion.moveCaretToLineStartSkipLeading(editor, l)
+        val col = editor.offsetToBufferPosition(woff).column
+        val limit = max(0.0, (col + dir * indentConfig.getTotalIndent(count)).toDouble())
+          .toInt()
+        if (col > 0 || soff != eoff) {
+          val indent = indentConfig.createIndentBySize(limit)
+          replaceText(editor, caret, soff, woff, indent)
+        }
+      }
+    }
+    if (!editor.editor.inInsertMode) {
+      if (!range.isMultiple) {
+        // The caret has moved, so reset the intended column before trying to get the expected offset
+        val newCaret = caret.setVimLastColumnAndGetCaret(intendedColumn)
+        val offset = injector.motion.moveCaretToLineWithStartOfLineOption(editor, sline, caret)
+        newCaret.moveToOffset(offset)
+      } else {
+        caret.moveToOffset(range.startOffset)
+      }
+    }
+  }
+
+  /**
+   * Sort range of text with a given comparator
+   *
+   * @param editor         The editor to replace text in
+   * @param range          The range to sort
+   * @param lineComparator The comparator to use to sort
+   * @param sortOptions     The option to sort the range
+   * @return true if able to sort the text, false if not
+   */
+  override fun sortRange(
+    editor: VimEditor, caret: VimCaret, range: LineRange, lineComparator: Comparator<String>,
+    sortOptions: SortOption,
+  ): Boolean {
+    val startLine = range.startLine
+    val endLine = range.endLine
+    val count = range.size
+    if (count < 2) {
+      return false
+    }
+    val startOffset = editor.getLineStartOffset(startLine)
+    val endOffset = editor.getLineEndOffset(endLine)
+
+    val selectedText = (editor as IjVimEditor).editor.document.getText(TextRangeInterval(startOffset, endOffset))
+    val lines = selectedText.split("\n")
+    val modifiedLines = sortOptions.pattern?.let {
+      if (sortOptions.sortOnPattern) {
+        extractPatternFromLines(editor, lines, startLine, it)
+      } else {
+        deletePatternFromLines(editor, lines, startLine, it)
+      }
+    } ?: lines
+    val sortedLines = lines.zip(modifiedLines)
+      .sortedWith { l1, l2 -> lineComparator.compare(l1.second, l2.second) }
+      .map {it.first}
+      .toMutableList()
+
+    if (sortOptions.unique) {
+      val iterator = sortedLines.iterator()
+      var previous: String? = null
+      while (iterator.hasNext()) {
+        val current = iterator.next()
+        if (current == previous || sortOptions.ignoreCase && current.equals(previous, ignoreCase = true)) {
+          iterator.remove()
+        } else {
+          previous = current
+        }
+      }
+    }
+    if (sortedLines.isEmpty()) {
+      return false
+    }
+    replaceText(editor, caret, startOffset, endOffset, StringUtil.join(sortedLines, "\n"))
+    return true
+  }
+
+  private fun extractPatternFromLines(editor: VimEditor, lines: List<String>, startLine: Int, pattern: String): List<String> {
+    val regex = VimRegex(pattern)
+    return lines.mapIndexed { i: Int, line: String ->
+      val result = regex.findInLine(editor, startLine + i, 0)
+      when (result) {
+        is VimMatchResult.Success -> result.value
+        is VimMatchResult.Failure -> line
+      }
+    }
+  }
+
+  private fun deletePatternFromLines(editor: VimEditor, lines: List<String>, startLine: Int, pattern: String): List<String> {
+    val regex = VimRegex(pattern)
+    return lines.mapIndexed { i: Int, line: String ->
+      val result = regex.findInLine(editor, startLine + i, 0)
+      when (result) {
+        is VimMatchResult.Success -> line.substring(result.value.length, line.length)
+        is VimMatchResult.Failure -> line
+      }
+    }
+  }
+
+  /**
+   * Perform increment and decrement for numbers in visual mode
+   *
+   *
+   * Flag [avalanche] marks if increment (or decrement) should be performed in avalanche mode
+   * (for v_g_Ctrl-A and v_g_Ctrl-X commands)
+   *
+   * @return true
+   */
+  override fun changeNumberVisualMode(
+    editor: VimEditor,
+    caret: VimCaret,
+    selectedRange: TextRange,
+    count: Int,
+    avalanche: Boolean,
+  ): Boolean {
+
+    val nf: List<String> = injector.options(editor).nrformats
+    val alpha = nf.contains("alpha")
+    val hex = nf.contains("hex")
+    val octal = nf.contains("octal")
+    val numberRanges = findNumbersInRange((editor as IjVimEditor).editor, selectedRange, alpha, hex, octal)
+    val newNumbers: MutableList<String?> = ArrayList()
+    for (i in numberRanges.indices) {
+      val numberRange = numberRanges[i]
+      val iCount = if (avalanche) (i + 1) * count else count
+      val newNumber = changeNumberInRange(editor, numberRange, iCount, alpha, hex, octal)
+      newNumbers.add(newNumber)
+    }
+    for (i in newNumbers.indices.reversed()) {
+      // Replace text bottom up. In other direction ranges will be desynchronized after inc numbers like 99
+      val (first) = numberRanges[i]
+      val newNumber = newNumbers[i]
+      replaceText(editor, caret, first.startOffset, first.endOffset, newNumber!!)
+    }
+    (caret as IjVimCaret).caret.moveToInlayAwareOffset(selectedRange.startOffset)
+    return true
+  }
+
+  override fun changeNumber(editor: VimEditor, caret: VimCaret, count: Int): Boolean {
+    val nf: List<String> = injector.options(editor).nrformats
+    val alpha = nf.contains("alpha")
+    val hex = nf.contains("hex")
+    val octal = nf.contains("octal")
+    val range = findNumberUnderCursor((editor as IjVimEditor).editor, (caret as IjVimCaret).caret, alpha, hex, octal)
+    if (range == null) {
+      logger.debug("no number on line")
+      return false
+    }
+    val newNumber = changeNumberInRange(editor, range, count, alpha, hex, octal)
+    return if (newNumber == null) {
+      false
+    } else {
+      replaceText(editor, caret, range.first.startOffset, range.first.endOffset, newNumber)
+      caret.caret.moveToInlayAwareOffset(range.first.startOffset + newNumber.length - 1)
+      true
+    }
+  }
+
+  override fun reset() {
+    strokes.clear()
+    repeatCharsCount = 0
+    if (lastStrokes != null) {
+      lastStrokes!!.clear()
+    }
+  }
+
+  override fun saveStrokes(newStrokes: String?) {
+    val chars = newStrokes!!.toCharArray()
+    strokes.add(chars)
+  }
+
+  private fun changeNumberInRange(
+    editor: VimEditor,
+    range: Pair<TextRange, NumberType>,
+    count: Int,
+    alpha: Boolean,
+    hex: Boolean,
+    octal: Boolean,
+  ): String? {
+    val text = editor.getText(range.first)
+    val numberType = range.second
+    if (logger.isDebugEnabled) {
+      logger.debug("found range $range")
+      logger.debug("text=$text")
+    }
+    var number = text
+    if (text.isEmpty()) {
+      return null
+    }
+    var ch = text[0]
+    if (hex && NumberType.HEX == numberType) {
+      if (!text.lowercase(Locale.getDefault()).startsWith(HEX_START)) {
+        throw RuntimeException("Hex number should start with 0x: $text")
+      }
+      for (i in text.length - 1 downTo 2) {
+        val index = "abcdefABCDEF".indexOf(text[i])
+        if (index >= 0) {
+          lastLower = index < 6
+          break
+        }
+      }
+      var num = BigInteger(text.substring(2), 16)
+      num = num.add(BigInteger.valueOf(count.toLong()))
+      if (num.compareTo(BigInteger.ZERO) < 0) {
+        num = BigInteger(MAX_HEX_INTEGER, 16).add(BigInteger.ONE).add(num)
+      }
+      number = num.toString(16)
+      number = number.padStart(text.length - 2, '0')
+      if (!lastLower) {
+        number = number.uppercase(Locale.getDefault())
+      }
+      number = text.substring(0, 2) + number
+    } else if (octal && NumberType.OCT == numberType && text.length > 1) {
+      if (!text.startsWith("0")) throw RuntimeException("Oct number should start with 0: $text")
+      var num = BigInteger(text, 8).add(BigInteger.valueOf(count.toLong()))
+      if (num.compareTo(BigInteger.ZERO) < 0) {
+        num = BigInteger("1777777777777777777777", 8).add(BigInteger.ONE).add(num)
+      }
+      number = num.toString(8)
+      number = "0" + number.padStart(text.length - 1, '0')
+    } else if (alpha && NumberType.ALPHA == numberType) {
+      if (!Character.isLetter(ch)) throw RuntimeException("Not alpha number : $text")
+      ch += count.toChar().code
+      if (Character.isLetter(ch)) {
+        number = ch.toString()
+      }
+    } else if (NumberType.DEC == numberType) {
+      if (ch != '-' && !Character.isDigit(ch)) throw RuntimeException("Not dec number : $text")
+      var pad = ch == '0'
+      var len = text.length
+      if (ch == '-' && text[1] == '0') {
+        pad = true
+        len--
+      }
+      var num = BigInteger(text)
+      num = num.add(BigInteger.valueOf(count.toLong()))
+      number = num.toString()
+      if (!octal && pad) {
+        var neg = false
+        if (number[0] == '-') {
+          neg = true
+          number = number.substring(1)
+        }
+        number = number.padStart(len, '0')
+        if (neg) {
+          number = "-$number"
+        }
+      }
+    }
+    return number
+  }
+
+  fun addInsertListener(listener: VimInsertListener) {
+    insertListeners.add(listener)
  }

-  @Deprecated(message = "Please use listenersNotifier", replaceWith = ReplaceWith("injector.listenersNotifier.modeChangeListeners.remove", imports = ["import com.maddyhome.idea.vim.api.injector"]))
  fun removeInsertListener(listener: VimInsertListener) {
-    injector.listenersNotifier.modeChangeListeners.remove(listener)
+    insertListeners.remove(listener)
+  }
+
+  override fun notifyListeners(editor: VimEditor) {
+    insertListeners.forEach(Consumer { listener: VimInsertListener -> listener.insertModeStarted((editor as IjVimEditor).editor) })
+  }
+
+  @TestOnly
+  override fun resetRepeat() {
+    setInsertRepeat(0, 0, false)
  }

  private companion object {
--- a/src/main/java/com/maddyhome/idea/vim/group/DigraphGroup.java
+++ b/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());
--- a/src/main/java/com/maddyhome/idea/vim/group/EditorGroup.java
+++ b/src/main/java/com/maddyhome/idea/vim/group/EditorGroup.java
@@ -8,7 +8,9 @@

 package com.maddyhome.idea.vim.group;

+import com.intellij.execution.impl.ConsoleViewImpl;
 import com.intellij.find.EditorSearchSession;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.client.ClientAppSession;
 import com.intellij.openapi.client.ClientKind;
 import com.intellij.openapi.client.ClientSessionsManager;
@@ -21,10 +23,12 @@ import com.intellij.openapi.editor.event.CaretListener;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.ex.EditorGutterComponentEx;
 import com.intellij.openapi.project.Project;
+import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.*;
 import com.maddyhome.idea.vim.ex.ExOutputModel;
 import com.maddyhome.idea.vim.helper.CaretVisualAttributesHelperKt;
+import com.maddyhome.idea.vim.helper.CommandStateHelper;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import com.maddyhome.idea.vim.helper.UserDataManager;
 import com.maddyhome.idea.vim.newapi.IjVimDocument;
@@ -214,9 +218,7 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
      editorEx.addPropertyChangeListener(FontSizeChangeListener.INSTANCE);
    }

-    if (injector.getApplication().isUnitTest()) {
-      updateCaretsVisualAttributes(new IjVimEditor(editor));
-    }
+    updateCaretsVisualAttributes(new IjVimEditor(editor));
  }

  public void editorDeinit(@NotNull Editor editor) {
@@ -238,8 +240,9 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
    VimPlugin.getNotifications(project).notifyAboutIdeaJoin(editor);
  }

+  @Nullable
  @Override
-  public @Nullable Element getState() {
+  public Element getState() {
    Element element = new Element("editor");
    saveData(element);
    return element;
@@ -315,16 +318,18 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
      .collect(Collectors.toList());
  }

+  @NotNull
  @Override
-  public @NotNull Collection<VimEditor> getEditors() {
+  public Collection<VimEditor> getEditors() {
    return getLocalEditors()
      .filter(UserDataManager::getVimInitialised)
      .map(IjVimEditor::new)
      .collect(Collectors.toList());
  }

+  @NotNull
  @Override
-  public @NotNull Collection<VimEditor> getEditors(@NotNull VimDocument buffer) {
+  public Collection<VimEditor> getEditors(@NotNull VimDocument buffer) {
    final Document document = ((IjVimDocument)buffer).getDocument();
    return getLocalEditors()
      .filter(editor -> UserDataManager.getVimInitialised(editor) && editor.getDocument().equals(document))
@@ -344,7 +349,7 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
    // events such as document change (to update search highlights), and these can come from CWM guests, and we'd get
    // the remote editors.
    // This invocation will always get local editors, regardless of the current context.
-    List<ClientAppSession> appSessions = ClientSessionsManager.getAppSessions(ClientKind.LOCAL);
+    List<ClientAppSession> appSessions = ClientSessionsManager.getAppSessions(ClientKind.ALL);
    if (!appSessions.isEmpty()) {
      ClientAppSession localSession = appSessions.get(0);
      return localSession.getService(ClientEditorManager.class).editors();
@@ -372,15 +377,11 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
          // Note that IDE scale is handled by LafManager.lookAndFeelChanged
          VimCommandLine activeCommandLine = injector.getCommandLine().getActiveCommandLine();
          if (activeCommandLine != null) {
-            activeCommandLine.close(true, false);
+            injector.getProcessGroup().cancelExEntry(new IjVimEditor(editor), true, false);
          }
-          VimOutputPanel outputPanel = injector.getOutputPanel().getCurrentOutputPanel();
-          if (outputPanel != null) {
-            outputPanel.close();
-          }
-          VimModalInput modalInput = injector.getModalInput().getCurrentModalInput();
-          if (modalInput != null) {
-            modalInput.deactivate(true, false);
+          ExOutputModel exOutputModel = ExOutputModel.tryGetInstance(editor);
+          if (exOutputModel != null) {
+            exOutputModel.close();
          }
        }
      }
--- a/src/main/java/com/maddyhome/idea/vim/group/FileGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/FileGroup.kt
@@ -173,20 +173,20 @@ class FileGroup : VimFileBase() {
  /**
   * Saves specific file in the project.
   */
-  override fun saveFile(editor: VimEditor, context: ExecutionContext) {
+  override fun saveFile(context: ExecutionContext) {
    val action = if (injector.globalIjOptions().ideawrite.contains(IjOptionConstants.ideawrite_all)) {
      injector.nativeActionManager.saveAll
    } else {
      injector.nativeActionManager.saveCurrent
    }
-    action.execute(editor, context)
+    action.execute(context)
  }

  /**
   * Saves all files in the project.
   */
-  override fun saveFiles(editor: VimEditor, context: ExecutionContext) {
-    injector.nativeActionManager.saveAll.execute(editor, context)
+  override fun saveFiles(context: ExecutionContext) {
+    injector.nativeActionManager.saveAll.execute(context)
  }

  /**
--- a/src/main/java/com/maddyhome/idea/vim/group/HistoryGroup.java
+++ b/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() {
--- a/src/main/java/com/maddyhome/idea/vim/group/IjVimPsiService.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/IjVimPsiService.kt
@@ -26,7 +26,7 @@ class IjVimPsiService: VimPsiService {
    val psiFile = PsiHelper.getFile(editor.ij) ?: return null
    val psiElement = psiFile.findElementAt(pos) ?: return null
    val language = psiElement.language
-    val commenter = LanguageCommenters.INSTANCE.forLanguage(language) ?: return null
+    val commenter = LanguageCommenters.INSTANCE.forLanguage(language)
    val psiComment = PsiTreeUtil.getParentOfType(psiElement, PsiComment::class.java, false) ?: return null
    val commentText = psiComment.text

--- a/src/main/java/com/maddyhome/idea/vim/group/KeyGroup.java
+++ b/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());
  }
 }
--- a/src/main/java/com/maddyhome/idea/vim/group/MotionGroup.kt
+++ b/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
@@ -47,14 +47,11 @@ import com.maddyhome.idea.vim.helper.getNormalizedScrollOffset
 import com.maddyhome.idea.vim.helper.getNormalizedSideScrollOffset
 import com.maddyhome.idea.vim.helper.isEndAllowed
 import com.maddyhome.idea.vim.helper.vimLastColumn
-import com.maddyhome.idea.vim.impl.state.VimStateMachineImpl
 import com.maddyhome.idea.vim.listener.AppCodeTemplates
 import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
 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.ReturnTo
-import com.maddyhome.idea.vim.state.mode.returnTo
 import org.jetbrains.annotations.Range
 import kotlin.math.max
 import kotlin.math.min
@@ -193,16 +190,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 +213,8 @@ internal class MotionGroup : VimMotionGroupBase() {
            editor.vim,
            caret.vim,
            IjEditorExecutionContext(context!!),
-            argument.argument,
-            operatorArguments
+            cmd.argument,
+            operatorArguments.withCount0(raw),
          )

          // Invalid motion
@@ -228,32 +230,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 +255,6 @@ internal class MotionGroup : VimMotionGroupBase() {
          }
        }
      }
-
      return TextRange(start, end)
    }

@@ -321,26 +312,13 @@ internal class MotionGroup : VimMotionGroupBase() {
                KeyHandler.getInstance().reset(vimEditor)
              }
              is Mode.CMD_LINE -> {
-                val commandLine = injector.commandLine.getActiveCommandLine() ?: return
-                commandLine.close(refocusOwningEditor = false, resetCaret = false)
-                injector.outputPanel.getCurrentOutputPanel()?.close()
+                injector.processGroup.cancelExEntry(vimEditor, refocusOwningEditor = false, resetCaret = false)
+                ExOutputModel.tryGetInstance(editor)?.close()
              }
              else -> {}
            }
          }
        }
-      } else {
-        val state = injector.vimState as VimStateMachineImpl
-        if (state.mode is Mode.VISUAL) {
-          val returnTo = state.mode.returnTo
-          when (returnTo) {
-            ReturnTo.INSERT -> state.mode = Mode.INSERT
-            ReturnTo.REPLACE -> state.mode = Mode.REPLACE
-            null -> state.mode = Mode.NORMAL()
-          }
-        }
-        val keyHandler = KeyHandler.getInstance()
-        KeyHandler.getInstance().reset(keyHandler.keyHandlerState, state.mode)
      }
    }
  }
--- a/src/main/java/com/maddyhome/idea/vim/group/NotificationService.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/NotificationService.kt
@@ -62,25 +62,6 @@ internal class NotificationService(private val project: Project?) {
  @Suppress("unused")
  constructor() : this(null)

-  fun notifyAboutNewUndo() {
-    val notification = Notification(
-      IDEAVIM_NOTIFICATION_ID,
-      "Undo in IdeaVim now works like in Vim",
-      """
-        Caret movement is no longer a separate undo step, and full insert is undoable in one step.
-      """.trimIndent(),
-      NotificationType.INFORMATION,
-    )
-
-    notification.addAction(object : DumbAwareAction("Share Feedback") {
-      override fun actionPerformed(p0: AnActionEvent) {
-        BrowserUtil.browse("https://youtrack.jetbrains.com/issue/VIM-547/Undo-splits-Insert-mode-edits-into-separate-undo-chunks")
-      }
-    })
-
-    notification.notify(project)
-  }
-
  fun notifyAboutIdeaPut() {
    val notification = Notification(
      IDEAVIM_NOTIFICATION_ID,
@@ -201,8 +182,8 @@ internal class NotificationService(private val project: Project?) {
    ).notify(project)
  }

-  fun notifyActionId(id: String?, candidates: List<String>? = null) {
-    ActionIdNotifier.notifyActionId(id, project, candidates)
+  fun notifyActionId(id: String?) {
+    ActionIdNotifier.notifyActionId(id, project)
  }

  fun notifyKeymapIssues(issues: ArrayList<KeyMapIssue>) {
@@ -278,31 +259,20 @@ internal class NotificationService(private val project: Project?) {

  object ActionIdNotifier {
    private var notification: Notification? = null
+    private const val NO_ID = "<i>Cannot detect action id</i>"

-    fun notifyActionId(id: String?, project: Project?, candidates: List<String>? = null) {
+    fun notifyActionId(id: String?, project: Project?) {
      notification?.expire()

-      val possibleIDs = candidates?.distinct()?.sorted()
-      val content = when {
-        id != null -> "Action ID: <code>$id</code><br><br>"
-        possibleIDs.isNullOrEmpty() -> "<i>Cannot detect action ID</i><br><br>"
-        possibleIDs.size == 1 -> "Possible action ID: <code>${possibleIDs[0]}</code><br><br>"
-        else -> {
-          buildString {
-            append("<p>Multiple possible action IDs. Candidates include:<ul>")
-            possibleIDs.forEach { append("<li><code>$it</code></li>") }
-            append("</ul></p>")
-          }
-        }
-      } + "<small>See the ${ActionCenter.getToolwindowName()} tool window for previous IDs</small>"
-
-      notification = Notification(IDEAVIM_NOTIFICATION_ID, IDEAVIM_NOTIFICATION_TITLE, content, NotificationType.INFORMATION).also {
+      val content = if (id != null) "Action id: $id" else NO_ID
+      Notification(IDEAVIM_NOTIFICATION_ID, IDEAVIM_NOTIFICATION_TITLE, content, NotificationType.INFORMATION).let {
+        notification = it
        it.whenExpired { notification = null }
+        it.setContent(it.content + "<br><br><small>Use ${ActionCenter.getToolwindowName()} to see previous ids</small>")
+
        it.addAction(StopTracking())

-        if (id != null || possibleIDs?.size == 1) {
-          it.addAction(CopyActionId(id ?: possibleIDs?.get(0), project))
-        }
+        if (id != null) it.addAction(CopyActionId(id, project))

        it.notify(project)
      }
--- a/src/main/java/com/maddyhome/idea/vim/group/ProcessGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/ProcessGroup.kt
@@ -95,6 +95,8 @@ class ProcessGroup : VimProcessGroupBase() {
        val progressIndicator = ProgressIndicatorProvider.getInstance().progressIndicator
        val output = handler.runProcessWithProgressIndicator(progressIndicator)

+        lastCommand = command
+
        if (output.isCancelled) {
          // TODO: Vim will use whatever text has already been written to stdout
          // For whatever reason, we're not getting any here, so just throw an exception
--- a/src/main/java/com/maddyhome/idea/vim/group/RegisterGroup.java
+++ b/src/main/java/com/maddyhome/idea/vim/group/RegisterGroup.java
@@ -14,8 +14,6 @@ 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.api.VimInjectorKt;
-import com.maddyhome.idea.vim.newapi.IjVimInjectorKt;
 import com.maddyhome.idea.vim.register.Register;
 import com.maddyhome.idea.vim.register.VimRegisterGroupBase;
 import com.maddyhome.idea.vim.state.mode.SelectionType;
@@ -37,10 +35,6 @@ import java.util.List;
 })
 public class RegisterGroup extends VimRegisterGroupBase implements PersistentStateComponent<Element> {

-  static {
-    IjVimInjectorKt.initInjector();
-  }
-
  private static final Logger logger = Logger.getInstance(RegisterGroup.class);

  public RegisterGroup() {
--- a/src/main/java/com/maddyhome/idea/vim/group/VimJumpServiceImpl.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/VimJumpServiceImpl.kt
@@ -25,7 +25,6 @@ import com.maddyhome.idea.vim.mark.Jump
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.globalIjOptions
 import com.maddyhome.idea.vim.newapi.ij
-import com.maddyhome.idea.vim.newapi.initInjector
 import org.jdom.Element

@State(name = "VimJumpsSettings", storages = [Storage(value = "\$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)])
@@ -66,7 +65,6 @@ internal class VimJumpServiceImpl : VimJumpServiceBase(), PersistentStateCompone
  }

  override fun loadState(state: Element) {
-    initInjector()
    val projectElements = state.getChildren("project")
    for (projectElement in projectElements) {
      val jumps = mutableListOf<Jump>()
@@ -91,7 +89,6 @@ internal class VimJumpServiceImpl : VimJumpServiceBase(), PersistentStateCompone

 internal class JumpsListener(val project: Project) : RecentPlacesListener {
  override fun recentPlaceAdded(changePlace: PlaceInfo, isChanged: Boolean) {
-    initInjector()
    if (!injector.globalIjOptions().unifyjumps) return
    
    val jumpService = injector.jumpService
--- a/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt
@@ -46,7 +46,6 @@ import com.maddyhome.idea.vim.put.PutData
 import com.maddyhome.idea.vim.put.VimPasteProvider
 import com.maddyhome.idea.vim.put.VimPutBase
 import com.maddyhome.idea.vim.register.RegisterConstants
-import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.state.mode.isBlock
 import com.maddyhome.idea.vim.state.mode.isChar
@@ -84,7 +83,7 @@ internal class PutGroup : VimPutBase() {
    val editor = (vimEditor as IjVimEditor).editor
    val context = vimContext.context as DataContext
    val carets: MutableMap<Caret, RangeMarker> = mutableMapOf()
-    if (injector.vimState.mode is Mode.INSERT) {
+    if (editor.isInsertMode) {
      val undo = injector.undo
      val nanoTime = System.nanoTime()
      vimEditor.forEachCaret { undo.startInsertSequence(it, it.offset, nanoTime) }
--- a/src/main/java/com/maddyhome/idea/vim/handler/EditorHandlersChainLogger.kt
+++ b/src/main/java/com/maddyhome/idea/vim/handler/EditorHandlersChainLogger.kt
@@ -16,7 +16,6 @@ import com.intellij.openapi.keymap.ex.KeymapManagerEx
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.ProjectActivity
 import com.maddyhome.idea.vim.api.key
-import com.maddyhome.idea.vim.newapi.initInjector

 /**
 * Logs the chain of handlers for esc and enter
@@ -35,8 +34,6 @@ internal class EditorHandlersChainLogger : ProjectActivity {
  private val editorHandlers = ExtensionPointName<EditorActionHandlerBean>("com.intellij.editorActionHandler")

  override suspend fun execute(project: Project) {
-    initInjector()
-
    if (!enableOctopus) return

    val escHandlers = editorHandlers.extensionList
--- a/src/main/java/com/maddyhome/idea/vim/handler/IdeActionHandler.kt
+++ b/src/main/java/com/maddyhome/idea/vim/handler/IdeActionHandler.kt
@@ -19,7 +19,7 @@ import com.maddyhome.idea.vim.command.OperatorArguments
 */
 internal abstract class IdeActionHandler(private val actionName: String) : VimActionHandler.SingleExecution() {
  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    injector.actionExecutor.executeAction(editor, name = actionName, context = context)
+    injector.actionExecutor.executeAction(actionName, context)
    injector.scroll.scrollCaretIntoView(editor)
    return true
  }
--- a/src/main/java/com/maddyhome/idea/vim/handler/VimEnterHandler.kt
+++ b/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
  }
 }

--- a/src/main/java/com/maddyhome/idea/vim/helper/CaretVisualAttributesHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/CaretVisualAttributesHelper.kt
@@ -19,7 +19,6 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.common.EditorListener
 import com.maddyhome.idea.vim.common.IsReplaceCharListener
 import com.maddyhome.idea.vim.common.ModeChangeListener
 import com.maddyhome.idea.vim.newapi.IjVimEditor
@@ -87,7 +86,6 @@ private fun isBlockCursorOverride() = EditorSettingsExternalizable.getInstance()

 private fun Editor.updatePrimaryCaretVisualAttributes() {
  if (VimPlugin.isNotEnabled()) thisLogger().error("The caret attributes should not be updated if the IdeaVim is disabled")
-  if (isIdeaVimDisabledHere) return
  caretModel.primaryCaret.visualAttributes = AttributesCache.getCaretVisualAttributes(this)

  // Make sure the caret is visible as soon as it's set. It might be invisible while blinking
@@ -101,7 +99,6 @@ private fun Editor.updatePrimaryCaretVisualAttributes() {

 private fun Editor.updateSecondaryCaretsVisualAttributes() {
  if (VimPlugin.isNotEnabled()) thisLogger().error("The caret attributes should not be updated if the IdeaVim is disabled")
-  if (isIdeaVimDisabledHere) return
  // IntelliJ simulates visual block with multiple carets with selections. Do our best to hide them
  val attributes = if (this.vim.inBlockSelection) HIDDEN else AttributesCache.getCaretVisualAttributes(this)
  this.caretModel.allCarets.forEach {
@@ -147,28 +144,24 @@ private object AttributesCache {
@TestOnly
 internal fun getGuiCursorMode(editor: Editor) = editor.guicursorMode()

-class CaretVisualAttributesListener : IsReplaceCharListener, ModeChangeListener, EditorListener {
+class CaretVisualAttributesListener : IsReplaceCharListener, ModeChangeListener {
  override fun isReplaceCharChanged(editor: VimEditor) {
-    updateCaretsVisual(editor)
+    updateCaretsVisual()
  }

  override fun modeChanged(editor: VimEditor, oldMode: Mode) {
-    updateCaretsVisual(editor)
+    updateCaretsVisual()
  }

-  override fun focusGained(editor: VimEditor) {
-    updateCaretsVisual(editor)
-  }
-
-  private fun updateCaretsVisual(editor: VimEditor) {
-    val ijEditor = (editor as IjVimEditor).editor
-    ijEditor.updateCaretsVisualAttributes()
-    ijEditor.updateCaretsVisualPosition()
+  private fun updateCaretsVisual() {
+    updateAllEditorsCaretsVisual()
  }

  fun updateAllEditorsCaretsVisual() {
    injector.editorGroup.getEditors().forEach { editor ->
-      updateCaretsVisual(editor)
+      val ijEditor = (editor as IjVimEditor).editor
+      ijEditor.updateCaretsVisualAttributes()
+      ijEditor.updateCaretsVisualPosition()
    }
  }
 }
--- a/src/main/java/com/maddyhome/idea/vim/helper/IjActionExecutor.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/IjActionExecutor.kt
@@ -13,23 +13,23 @@ import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.actionSystem.AnActionResult
 import com.intellij.openapi.actionSystem.DataContextWrapper
 import com.intellij.openapi.actionSystem.EmptyAction
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.actionSystem.PlatformDataKeys
+import com.intellij.openapi.actionSystem.ex.ActionManagerEx
 import com.intellij.openapi.actionSystem.ex.ActionUtil
-import com.intellij.openapi.actionSystem.ex.ActionUtil.performDumbAwareWithCallbacks
 import com.intellij.openapi.actionSystem.impl.ProxyShortcutSet
 import com.intellij.openapi.actionSystem.impl.Utils
-import com.intellij.openapi.application.ex.ApplicationManagerEx
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.UndoConfirmationPolicy
 import com.intellij.openapi.components.Service
-import com.intellij.openapi.diagnostic.thisLogger
 import com.intellij.openapi.editor.actionSystem.DocCommandGroupId
-import com.intellij.openapi.progress.util.ProgressIndicatorUtils
+import com.intellij.openapi.project.IndexNotReadyException
 import com.intellij.openapi.ui.popup.JBPopupFactory
 import com.intellij.openapi.util.NlsContexts
+import com.intellij.util.SlowOperations
 import com.maddyhome.idea.vim.RegisterActions
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.NativeAction
@@ -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
@@ -72,12 +69,6 @@ internal class IjActionExecutor : VimActionExecutor {
   * @param context The context to run it in
   */
  override fun executeAction(editor: VimEditor?, action: NativeAction, context: ExecutionContext): Boolean {
-    val applicationEx = ApplicationManagerEx.getApplicationEx()
-    if (ProgressIndicatorUtils.isWriteActionRunningOrPending(applicationEx)) {
-      // This is needed for VIM-3376 and it should turn into error at soeme moment
-      thisLogger().warn(RuntimeException("Actions cannot be updated when write-action is running or pending", ))
-    }
-
    val ijAction = (action as IjNativeAction).action

    /**
@@ -130,15 +121,51 @@ internal class IjActionExecutor : VimActionExecutor {
    }
  }

+  // This is taken directly from ActionUtil.performActionDumbAwareWithCallbacks
+  // But with one check removed. With this check some actions (like `:w` doesn't work)
+  // https://youtrack.jetbrains.com/issue/VIM-2691/File-is-not-saved-on-w
+  private fun performDumbAwareWithCallbacks(
+    action: AnAction,
+    event: AnActionEvent,
+    performRunnable: Runnable,
+  ) {
+    val project = event.project
+    var indexError: IndexNotReadyException? = null
+    val manager = ActionManagerEx.getInstanceEx()
+    manager.fireBeforeActionPerformed(action, event)
+    var result: AnActionResult? = null
+    try {
+      SlowOperations.allowSlowOperations(SlowOperations.ACTION_PERFORM).use {
+        performRunnable.run()
+        result = AnActionResult.PERFORMED
+      }
+    } catch (ex: IndexNotReadyException) {
+      indexError = ex
+      result = AnActionResult.failed(ex)
+    } catch (ex: RuntimeException) {
+      result = AnActionResult.failed(ex)
+      throw ex
+    } catch (ex: Error) {
+      result = AnActionResult.failed(ex)
+      throw ex
+    } finally {
+      if (result == null) result = AnActionResult.failed(Throwable())
+      manager.fireAfterActionPerformed(action, event, result!!)
+    }
+    if (indexError != null) {
+      ActionUtil.showDumbModeWarning(project, action, event)
+    }
+  }
+
  /**
   * Execute an action by name
   *
   * @param name    The name of the action to execute
   * @param context The context to run it in
   */
-  override fun executeAction(editor: VimEditor, name: @NonNls String, context: ExecutionContext): Boolean {
+  override fun executeAction(name: @NonNls String, context: ExecutionContext): Boolean {
    val action = getAction(name, context)
-    return action != null && executeAction(editor, IjNativeAction(action), context)
+    return action != null && executeAction(null, IjNativeAction(action), context)
  }
  
  private fun getAction(name: String, context: ExecutionContext): AnAction? {
@@ -184,8 +211,8 @@ internal class IjActionExecutor : VimActionExecutor {
    CommandProcessor.getInstance().executeCommand(editor?.ij?.project, runnable, name, groupId)
  }

-  override fun executeEsc(editor: VimEditor, context: ExecutionContext): Boolean {
-    return executeAction(editor, IdeActions.ACTION_EDITOR_ESCAPE, context)
+  override fun executeEsc(context: ExecutionContext): Boolean {
+    return executeAction(IdeActions.ACTION_EDITOR_ESCAPE, context)
  }

  override fun executeVimAction(
--- a/src/main/java/com/maddyhome/idea/vim/helper/IjEditorHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/IjEditorHelper.kt
@@ -14,7 +14,6 @@ import com.intellij.openapi.editor.VisualPosition
 import com.intellij.openapi.editor.actionSystem.EditorActionManager
 import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.maddyhome.idea.vim.api.EngineEditorHelper
-import com.maddyhome.idea.vim.api.EngineEditorHelperBase
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimRangeMarker
 import com.maddyhome.idea.vim.api.VimVisualPosition
@@ -23,7 +22,7 @@ import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim

@Service
-internal class IjEditorHelper : EngineEditorHelperBase() {
+internal class IjEditorHelper : EngineEditorHelper {
  override fun amountOfInlaysBeforeVisualPosition(editor: VimEditor, pos: VimVisualPosition): Int {
    return (editor as IjVimEditor).editor.amountOfInlaysBeforeVisualPosition(
      VisualPosition(
@@ -52,6 +51,10 @@ internal class IjEditorHelper : EngineEditorHelperBase() {
    return EditorHelper.getVisualLineAtBottomOfScreen(editor.ij)
  }

+  override fun pad(editor: VimEditor, line: Int, to: Int): String {
+    return EditorHelper.pad(editor.ij, line, to)
+  }
+
  override fun inlayAwareOffsetToVisualPosition(editor: VimEditor, offset: Int): VimVisualPosition {
    return EditorUtil.inlayAwareOffsetToVisualPosition(editor.ij, offset).vim
  }
--- a/src/main/java/com/maddyhome/idea/vim/helper/ModeExtensions.kt
+++ b/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)
 }
--- a/src/main/java/com/maddyhome/idea/vim/helper/SearchHelperKt.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/SearchHelperKt.kt
@@ -16,15 +16,18 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.spellchecker.SpellCheckerSeveritiesProvider
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.getLineEndOffset
+import com.maddyhome.idea.vim.api.getText
 import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.helper.CharacterHelper.charType
 import com.maddyhome.idea.vim.newapi.IjVimEditor
+import com.maddyhome.idea.vim.newapi.vim
 import it.unimi.dsi.fastutil.ints.IntComparator
 import it.unimi.dsi.fastutil.ints.IntIterator
 import it.unimi.dsi.fastutil.ints.IntRBTreeSet
 import it.unimi.dsi.fastutil.ints.IntSortedSet
+import java.util.*

 /**
 * Check ignorecase and smartcase options to see if a case insensitive search should be performed with the given pattern.
@@ -94,6 +97,210 @@ fun countWords(
  return CountPosition(count, position)
 }

+fun findNumbersInRange(
+  editor: Editor,
+  textRange: TextRange,
+  alpha: Boolean,
+  hex: Boolean,
+  octal: Boolean,
+): List<Pair<TextRange, NumberType>> {
+  val result: MutableList<Pair<TextRange, NumberType>> = ArrayList()
+
+
+  for (i in 0 until textRange.size()) {
+    val startOffset = textRange.startOffsets[i]
+    val end = textRange.endOffsets[i]
+    val text: String = editor.vim.getText(startOffset, end)
+    val textChunks = text.split("\\n".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+    var chunkStart = 0
+    for (chunk in textChunks) {
+      val number = findNumberInText(chunk, 0, alpha, hex, octal)
+
+      if (number != null) {
+        result.add(
+          Pair(
+            TextRange(
+              number.first.startOffset + startOffset + chunkStart,
+              number.first.endOffset + startOffset + chunkStart
+            ),
+            number.second
+          )
+        )
+      }
+      chunkStart += 1 + chunk.length
+    }
+  }
+  return result
+}
+
+fun findNumberUnderCursor(
+  editor: Editor,
+  caret: Caret,
+  alpha: Boolean,
+  hex: Boolean,
+  octal: Boolean,
+): Pair<TextRange, NumberType>? {
+  val lline = caret.logicalPosition.line
+  val text = IjVimEditor(editor).getLineText(lline).lowercase(Locale.getDefault())
+  val startLineOffset = IjVimEditor(editor).getLineStartOffset(lline)
+  val posOnLine = caret.offset - startLineOffset
+
+  val numberTextRange = findNumberInText(text, posOnLine, alpha, hex, octal) ?: return null
+
+  return Pair(
+    TextRange(
+      numberTextRange.first.startOffset + startLineOffset,
+      numberTextRange.first.endOffset + startLineOffset
+    ),
+    numberTextRange.second
+  )
+}
+
+/**
+ * Search for number in given text from start position
+ *
+ * @param textInRange    - text to search in
+ * @param startPosOnLine - start offset to search
+ * @return - text range with number
+ */
+fun findNumberInText(
+  textInRange: String,
+  startPosOnLine: Int,
+  alpha: Boolean,
+  hex: Boolean,
+  octal: Boolean,
+): Pair<TextRange, NumberType>? {
+  if (logger.isDebugEnabled) {
+    logger.debug("text=$textInRange")
+  }
+
+  var pos = startPosOnLine
+  val lineEndOffset = textInRange.length
+
+  while (true) {
+    // Skip over current whitespace if any
+    while (pos < lineEndOffset && !isNumberChar(textInRange[pos], alpha, hex, octal, true)) {
+      pos++
+    }
+
+    if (logger.isDebugEnabled) logger.debug("pos=$pos")
+    if (pos >= lineEndOffset) {
+      logger.debug("no number char on line")
+      return null
+    }
+
+    val isHexChar = "abcdefABCDEF".indexOf(textInRange[pos]) >= 0
+
+    if (hex) {
+      // Ox and OX handling
+      if (textInRange[pos] == '0' && pos < lineEndOffset - 1 && "xX".indexOf(textInRange[pos + 1]) >= 0) {
+        pos += 2
+      } else if ("xX".indexOf(textInRange[pos]) >= 0 && pos > 0 && textInRange[pos - 1] == '0') {
+        pos++
+      }
+
+      logger.debug("checking hex")
+      val range = findRange(textInRange, pos, false, true, false, false)
+      val start = range.first
+      val end = range.second
+
+      // Ox and OX
+      if (start >= 2 && textInRange.substring(start - 2, start).equals("0x", ignoreCase = true)) {
+        logger.debug("found hex")
+        return Pair(TextRange(start - 2, end), NumberType.HEX)
+      }
+
+      if (!isHexChar || alpha) {
+        break
+      } else {
+        pos++
+      }
+    } else {
+      break
+    }
+  }
+
+  if (octal) {
+    logger.debug("checking octal")
+    val range = findRange(textInRange, pos, false, false, true, false)
+    val start = range.first
+    val end = range.second
+
+    if (end - start == 1 && textInRange[start] == '0') {
+      return Pair(TextRange(start, end), NumberType.DEC)
+    }
+    if (textInRange[start] == '0' && end > start &&
+      !(start > 0 && isNumberChar(textInRange[start - 1], false, false, false, true))
+    ) {
+      logger.debug("found octal")
+      return Pair(TextRange(start, end), NumberType.OCT)
+    }
+  }
+
+  if (alpha) {
+    if (logger.isDebugEnabled) logger.debug("checking alpha for " + textInRange[pos])
+    if (isNumberChar(textInRange[pos], true, false, false, false)) {
+      if (logger.isDebugEnabled) logger.debug("found alpha at $pos")
+      return Pair(TextRange(pos, pos + 1), NumberType.ALPHA)
+    }
+  }
+
+  val range = findRange(textInRange, pos, false, false, false, true)
+  var start = range.first
+  val end = range.second
+  if (start > 0 && textInRange[start - 1] == '-') {
+    start--
+  }
+
+  return Pair(TextRange(start, end), NumberType.DEC)
+}
+
+/**
+ * Searches for digits block that matches parameters
+ */
+private fun findRange(
+  text: String,
+  pos: Int,
+  alpha: Boolean,
+  hex: Boolean,
+  octal: Boolean,
+  decimal: Boolean,
+): Pair<Int, Int> {
+  var end = pos
+  while (end < text.length && isNumberChar(text[end], alpha, hex, octal, decimal || octal)) {
+    end++
+  }
+  var start = pos
+  while (start >= 0 && isNumberChar(text[start], alpha, hex, octal, decimal || octal)) {
+    start--
+  }
+  if (start < end &&
+    (start == -1 ||
+      0 <= start && start < text.length &&
+      !isNumberChar(text[start], alpha, hex, octal, decimal || octal))
+  ) {
+    start++
+  }
+  if (octal) {
+    for (i in start until end) {
+      if (!isNumberChar(text[i], false, false, true, false)) return Pair(0, 0)
+    }
+  }
+  return Pair(start, end)
+}
+
+private fun isNumberChar(ch: Char, alpha: Boolean, hex: Boolean, octal: Boolean, decimal: Boolean): Boolean {
+  return if (alpha && ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))) {
+    true
+  } else if (octal && (ch >= '0' && ch <= '7')) {
+    true
+  } else if (hex && ((ch >= '0' && ch <= '9') || "abcdefABCDEF".indexOf(ch) >= 0)) {
+    true
+  } else {
+    decimal && (ch >= '0' && ch <= '9')
+  }
+}
+
 /**
 * Find the word under the cursor or the next word to the right of the cursor on the current line.
 *
--- a/src/main/java/com/maddyhome/idea/vim/helper/UndoRedoHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/UndoRedoHelper.kt
@@ -16,7 +16,6 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.registry.Registry
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
@@ -24,8 +23,8 @@ import com.maddyhome.idea.vim.api.VimCaret
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.ChangesListener
-import com.maddyhome.idea.vim.common.InsertSequence
 import com.maddyhome.idea.vim.newapi.IjVimCaret
+import com.maddyhome.idea.vim.common.InsertSequence
 import com.maddyhome.idea.vim.newapi.globalIjOptions
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.state.mode.SelectionType
@@ -71,7 +70,6 @@ internal class UndoRedoHelper : UndoRedoBase() {
        restoreVisualMode(editor)
      }
    } else {
-      notifyAboutNewUndo(editor.ij.project)
      runWithBooleanRegistryOption("ide.undo.transparent.caret.movement", true) {
        var nextUndoNanoTime = undoManager.getNextUndoNanoTime(fileEditor)
        val insertInfo = (editor.primaryCaret() as IjVimCaret).getInsertSequenceForTime(nextUndoNanoTime)
@@ -92,13 +90,6 @@ internal class UndoRedoHelper : UndoRedoBase() {
    }
  }

-  private fun notifyAboutNewUndo(project: Project?) {
-    if (VimPlugin.getVimState().isNewUndoNotified) return
-    VimPlugin.getVimState().isNewUndoNotified = true
-
-    VimPlugin.getNotifications(project).notifyAboutNewUndo()
-  }
-
  private fun hasSelection(editor: VimEditor): Boolean {
    return editor.primaryCaret().ij.hasSelection()
  }
--- a/src/main/java/com/maddyhome/idea/vim/helper/UserDataManager.kt
+++ b/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() }
--- a/src/main/java/com/maddyhome/idea/vim/listener/IJEditorFocusListener.kt
+++ b/src/main/java/com/maddyhome/idea/vim/listener/IJEditorFocusListener.kt
@@ -10,15 +10,16 @@ package com.maddyhome.idea.vim.listener

 import com.intellij.execution.impl.ConsoleViewImpl
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.editor.EditorKind
 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.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.EditorListener
+import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.newapi.ij
-import com.maddyhome.idea.vim.state.mode.Mode

 /**
 * This listener is similar to the one we introduce in vim-engine to handle focus change,
@@ -28,11 +29,6 @@ import com.maddyhome.idea.vim.state.mode.Mode
 */
 class IJEditorFocusListener : EditorListener {
  override fun focusGained(editor: VimEditor) {
-    val editorInFocus = KeyHandler.getInstance().editorInFocus
-    if (editorInFocus != null && editorInFocus.ij == editor.ij) return
-
-    KeyHandler.getInstance().editorInFocus = editor
-
    // We add Vim bindings to all opened editors, including editors used as UI controls rather than just project file
    // editors. This includes editors used as part of the UI, such as the VCS commit message, or used as read-only
    // viewers for text output, such as log files in run configurations or the Git Console tab. And editors are used for
@@ -52,21 +48,17 @@ class IJEditorFocusListener : EditorListener {
    // not file based, is writable, and not a viewer, but we don't want to treat this as an interactive editor.
    // Note that we need a similar check in `VimEditor.isWritable` to allow Escape to work to exit insert mode. We need
    // to know that a read-only editor that is hosting a console view with a running process can be treated as writable.
-
-    val ijEditor = editor.ij
-
-
    val switchToInsertMode = Runnable {
      val context: ExecutionContext = injector.executionContextManager.getEditorExecutionContext(editor)
      VimPlugin.getChange().insertBeforeCursor(editor, context)
    }
-    if (!ijEditor.document.isWritable) {
-      val context: ExecutionContext = injector.executionContextManager.getEditorExecutionContext(editor)
-      val mode = injector.vimState.mode
-      when (mode) {
-        is Mode.INSERT -> editor.exitInsertMode(context)
-        else -> {}
-      }
+    val ijEditor = editor.ij
+    if (!ijEditor.isViewer &&
+      !EditorHelper.isFileEditor(ijEditor) &&
+      ijEditor.document.isWritable &&
+      !ijEditor.inInsertMode && ijEditor.editorKind != EditorKind.DIFF
+    ) {
+      switchToInsertMode.run()
    }
    ApplicationManager.getApplication().invokeLater {
      if (ijEditor.isDisposed) return@invokeLater
@@ -77,5 +69,4 @@ class IJEditorFocusListener : EditorListener {
    }
    KeyHandler.getInstance().reset(editor)
  }
-}
-
+}
--- a/src/main/java/com/maddyhome/idea/vim/listener/IdeaSpecifics.kt
+++ b/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
@@ -31,7 +29,6 @@ import com.intellij.openapi.actionSystem.ex.AnActionListener
 import com.intellij.openapi.actionSystem.impl.ProxyShortcutSet
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.impl.ScrollingModelImpl
-import com.intellij.openapi.keymap.KeymapManager
 import com.intellij.openapi.project.DumbAwareToggleAction
 import com.intellij.openapi.util.TextRange
 import com.maddyhome.idea.vim.KeyHandler
@@ -41,7 +38,6 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.group.NotificationService
 import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.inNormalMode
@@ -64,7 +60,6 @@ internal object IdeaSpecifics {
    private var caretOffset = -1
    private var completionPrevDocumentLength: Int? = null
    private var completionPrevDocumentOffset: Int? = null
-
    override fun beforeActionPerformed(action: AnAction, event: AnActionEvent) {
      if (VimPlugin.isNotEnabled()) return

@@ -78,24 +73,7 @@ internal object IdeaSpecifics {
      if (!isVimAction && injector.globalIjOptions().trackactionids) {
        if (action !is NotificationService.ActionIdNotifier.CopyActionId && action !is NotificationService.ActionIdNotifier.StopTracking) {
          val id: String? = ActionManager.getInstance().getId(action) ?: (action.shortcutSet as? ProxyShortcutSet)?.actionId
-          val candidates = if (id == null) {
-            // Some actions are specific to the component they're registered for, and are copies of a global action,
-            // reusing the action ID and shortcuts (e.g. `NextTab` is different for editor tabs and tool window tabs).
-            // Unfortunately, ActionManager doesn't know about these "local" actions, so can't return the action ID.
-            // However, the new "local" action does copy the shortcuts of the global template action, so we can look up
-            // all actions with matching shortcuts. We might return more action IDs than expected, so this is a list of
-            // candidates, not a definite match of the action being executed, but the list should include our target
-            // action. Note that we might return duplicate IDs because the keymap might have multiple shortcuts mapped
-            // to the same action. The notifier will handle de-duplication and sorting as a presentation detail.
-            action.shortcutSet.shortcuts.flatMap { KeymapManager.getInstance().activeKeymap.getActionIdList(it) }
-          }
-          else {
-            emptyList()
-          }
-
-          // We can still get empty ID and empty candidates. Notably, for the tool window toggle buttons on the new UI.
-          // We could filter out action events with `place == ActionPlaces.TOOLWINDOW_TOOLBAR_BAR`
-          VimPlugin.getNotifications(event.dataContext.getData(CommonDataKeys.PROJECT)).notifyActionId(id, candidates)
+          VimPlugin.getNotifications(event.dataContext.getData(CommonDataKeys.PROJECT)).notifyActionId(id)
        }
      }

@@ -154,10 +132,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) {
@@ -251,13 +225,9 @@ internal object IdeaSpecifics {

 //region Find action ID
 internal class FindActionIdAction : DumbAwareToggleAction() {
-  override fun isSelected(e: AnActionEvent): Boolean {
-    initInjector()
-    return injector.globalIjOptions().trackactionids
-  }
+  override fun isSelected(e: AnActionEvent): Boolean = injector.globalIjOptions().trackactionids

  override fun setSelected(e: AnActionEvent, state: Boolean) {
-    initInjector()
    injector.globalIjOptions().trackactionids = !injector.globalIjOptions().trackactionids
  }

--- a/src/main/java/com/maddyhome/idea/vim/listener/VimInsertListener.kt
+++ b/src/main/java/com/maddyhome/idea/vim/listener/VimInsertListener.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2024 The IdeaVim authors
+ * 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
@@ -9,18 +9,7 @@
 package com.maddyhome.idea.vim.listener

 import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.common.ModeChangeListener
-import com.maddyhome.idea.vim.newapi.ij
-import com.maddyhome.idea.vim.state.mode.Mode
-
-@Deprecated(message = "Please use ModeChangeListener", replaceWith = ReplaceWith("ModeChangeListener", imports = ["import com.maddyhome.idea.vim.common.ModeChangeListener"]))
-interface VimInsertListener : ModeChangeListener {
-  override fun modeChanged(editor: VimEditor, oldMode: Mode) {
-    if (editor.mode == Mode.INSERT) {
-      insertModeStarted(editor.ij)
-    }
-  }

+interface VimInsertListener {
  fun insertModeStarted(editor: Editor)
 }
--- a/src/main/java/com/maddyhome/idea/vim/listener/VimListenerManager.kt
+++ b/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
@@ -93,8 +94,8 @@ import com.maddyhome.idea.vim.helper.updateCaretsVisualAttributes
 import com.maddyhome.idea.vim.helper.vimDisabled
 import com.maddyhome.idea.vim.helper.vimInitialised
 import com.maddyhome.idea.vim.newapi.IjVimEditor
-import com.maddyhome.idea.vim.newapi.IjVimSearchGroup
 import com.maddyhome.idea.vim.newapi.InsertTimeRecorder
+import com.maddyhome.idea.vim.newapi.IjVimSearchGroup
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.Mode
@@ -160,7 +161,6 @@ internal object VimListenerManager {
    check(keyCheckRequests.tryEmit(Unit))

    val caretVisualAttributesListener = CaretVisualAttributesListener()
-    injector.listenersNotifier.myEditorListeners.add(caretVisualAttributesListener)
    injector.listenersNotifier.modeChangeListeners.add(caretVisualAttributesListener)
    injector.listenersNotifier.isReplaceCharListeners.add(caretVisualAttributesListener)
    caretVisualAttributesListener.updateAllEditorsCaretsVisual()
@@ -394,8 +394,6 @@ internal object VimListenerManager {
          editor.vim.mode = Mode.NORMAL()
          KeyHandler.getInstance().reset(editor.vim)
        }
-        // Breaks relativenumber for some reason
-//        injector.scroll.scrollCaretIntoView(editor.vim)
      }
      
      MotionGroup.fileEditorManagerSelectionChangedCallback(event)
@@ -745,10 +743,12 @@ internal object VimListenerManager {

      if (event.area == EditorMouseEventArea.EDITING_AREA) {
        val editor = event.editor
-        injector.commandLine.getActiveCommandLine()?.close(refocusOwningEditor = true, resetCaret = false)
-        injector.modalInput.getCurrentModalInput()?.deactivate(refocusOwningEditor = true, resetCaret = false)
+        val commandLine = injector.commandLine.getActiveCommandLine()
+        if (commandLine != null) {
+          injector.processGroup.cancelExEntry(editor.vim, refocusOwningEditor = true, resetCaret = false)
+        }

-        injector.outputPanel.getCurrentOutputPanel()?.close()
+        ExOutputModel.tryGetInstance(editor)?.close()

        val caretModel = editor.caretModel
        if (editor.vim.mode.selectionType != null) {
@@ -774,10 +774,12 @@ internal object VimListenerManager {
        event.area != EditorMouseEventArea.FOLDING_OUTLINE_AREA &&
        event.mouseEvent.button != MouseEvent.BUTTON3
      ) {
-        injector.commandLine.getActiveCommandLine()?.close(refocusOwningEditor = true, resetCaret = false)
-        injector.modalInput.getCurrentModalInput()?.deactivate(refocusOwningEditor = true, resetCaret = false)
+        val commandLine = injector.commandLine.getActiveCommandLine()
+        if (commandLine != null) {
+          injector.processGroup.cancelExEntry(event.editor.vim, refocusOwningEditor = true, resetCaret = false)
+        }

-        injector.outputPanel.getCurrentOutputPanel()?.close()
+        ExOutputModel.getInstance(event.editor).close()
      }
    }
  }
--- a/src/main/java/com/maddyhome/idea/vim/newapi/ExecuteExtension.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/ExecuteExtension.kt
@@ -11,13 +11,12 @@ package com.maddyhome.idea.vim.newapi
 import com.intellij.openapi.editor.VisualPosition
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.NativeAction
-import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimVisualPosition
 import com.maddyhome.idea.vim.api.injector

-internal fun NativeAction?.execute(editor: VimEditor, context: ExecutionContext) {
+internal fun NativeAction?.execute(context: ExecutionContext) {
  if (this == null) return
-  injector.actionExecutor.executeAction(editor, this, context)
+  injector.actionExecutor.executeAction(null, this, context)
 }

 internal val VisualPosition.vim: VimVisualPosition
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjLiveRange.kt
+++ b/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
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjVimEditor.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjVimEditor.kt
@@ -30,20 +30,17 @@ import com.maddyhome.idea.vim.api.VimCaret
 import com.maddyhome.idea.vim.api.VimCaretListener
 import com.maddyhome.idea.vim.api.VimDocument
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.VimEditorBase
 import com.maddyhome.idea.vim.api.VimFoldRegion
-import com.maddyhome.idea.vim.api.VimIndentConfig
 import com.maddyhome.idea.vim.api.VimScrollingModel
 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.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,10 +50,8 @@ 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
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.state.mode.inBlockSelection
@@ -64,7 +59,7 @@ import org.jetbrains.annotations.ApiStatus
 import java.lang.System.identityHashCode

@ApiStatus.Internal
-internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase() {
+internal class IjVimEditor(editor: Editor) : MutableLinearEditor() {
  companion object {
    // For cases where Editor does not have a project (for some reason)
    // It's something IJ Platform related and stored here because of this reason
@@ -76,19 +71,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
-  }
-
-  override fun updateIsReplaceCharacter(isReplaceCharacter: Boolean) {
-    (injector.vimState as VimStateMachineImpl).isReplaceCharacter = isReplaceCharacter
-  }

  override val lfMakesNewLine: Boolean = true
  override var vimChangeActionSwitchMode: Mode?
@@ -96,8 +78,6 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
    set(value) {
      editor.vimChangeActionSwitchMode = value
    }
-  override val indentConfig: VimIndentConfig
-    get() = IndentConfig.create(editor)

  override fun fileSize(): Long = editor.fileSize.toLong()

@@ -139,7 +119,7 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
  }

  override fun insertText(caret: VimCaret, atPosition: Int, text: CharSequence) {
-    if (injector.vimState.mode is Mode.INSERT) {
+    if (editor.isInsertMode) {
      injector.undo.startInsertSequence(caret, atPosition, System.nanoTime())
    }
    editor.document.insertString(atPosition, text)
@@ -404,8 +384,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) {
@@ -470,14 +450,13 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
      // This is faster than simply calling Editor#logicalToVisualPosition
      return editor.offsetToVisualLine(editor.document.getLineStartOffset(line))
    }
-    return super<MutableLinearEditor>.bufferLineToVisualLine(line)
+    return super.bufferLineToVisualLine(line)
  }

  override var insertMode: Boolean
    get() = (editor as? EditorEx)?.isInsertMode ?: false
    set(value) {
      (editor as? EditorEx)?.isInsertMode = value
-      forgetAllReplaceMasks()
    }

  override val document: VimDocument
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjVimInjector.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjVimInjector.kt
@@ -22,7 +22,6 @@ import com.maddyhome.idea.vim.api.VimApplication
 import com.maddyhome.idea.vim.api.VimChangeGroup
 import com.maddyhome.idea.vim.api.VimClipboardManager
 import com.maddyhome.idea.vim.api.VimCommandGroup
-import com.maddyhome.idea.vim.api.VimCommandLine
 import com.maddyhome.idea.vim.api.VimCommandLineService
 import com.maddyhome.idea.vim.api.VimDigraphGroup
 import com.maddyhome.idea.vim.api.VimEditor
@@ -37,7 +36,6 @@ import com.maddyhome.idea.vim.api.VimKeyGroup
 import com.maddyhome.idea.vim.api.VimLookupManager
 import com.maddyhome.idea.vim.api.VimMarkService
 import com.maddyhome.idea.vim.api.VimMessages
-import com.maddyhome.idea.vim.api.VimModalInputService
 import com.maddyhome.idea.vim.api.VimMotionGroup
 import com.maddyhome.idea.vim.api.VimOptionGroup
 import com.maddyhome.idea.vim.api.VimOutputPanelService
@@ -58,9 +56,8 @@ import com.maddyhome.idea.vim.api.VimrcFileState
 import com.maddyhome.idea.vim.api.VimscriptExecutor
 import com.maddyhome.idea.vim.api.VimscriptFunctionService
 import com.maddyhome.idea.vim.api.VimscriptParser
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.api.isInjectorInitialized
 import com.maddyhome.idea.vim.diagnostic.VimLogger
+import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.extension.VimExtensionRegistrar
 import com.maddyhome.idea.vim.group.CommandGroup
 import com.maddyhome.idea.vim.group.EditorGroup
@@ -86,7 +83,6 @@ import com.maddyhome.idea.vim.put.VimPut
 import com.maddyhome.idea.vim.register.VimRegisterGroup
 import com.maddyhome.idea.vim.state.VimStateMachine
 import com.maddyhome.idea.vim.ui.VimRcFileState
-import com.maddyhome.idea.vim.ui.ex.ExEntryPanelService
 import com.maddyhome.idea.vim.undo.VimUndoRedo
 import com.maddyhome.idea.vim.vimscript.Executor
 import com.maddyhome.idea.vim.vimscript.services.VariableService
@@ -94,16 +90,6 @@ import com.maddyhome.idea.vim.yank.VimYankGroup
 import com.maddyhome.idea.vim.yank.YankGroupBase
 import javax.swing.JTextArea

-/**
- * Currently, injector has to be initialized in all "entry points" from the IJ platform.
- * This means Project Activities, listeners, status bar widgets, statistic collectors, etc.
- * This is a bad pattern and we need to find a solution where the plugin doesn't have an "uninitialized state"
- */
-internal fun initInjector() {
-  if (isInjectorInitialized()) return
-  injector = IjVimInjector()
-}
-
 internal class IjVimInjector : VimInjectorBase() {
  override fun <T : Any> getLogger(clazz: Class<T>): VimLogger = IjVimLogger(Logger.getInstance(clazz))

@@ -197,8 +183,6 @@ internal class IjVimInjector : VimInjectorBase() {
    get() = com.maddyhome.idea.vim.vimscript.parser.VimscriptParser
  override val commandLine: VimCommandLineService
    get() = service()
-  override val modalInput: VimModalInputService
-    get() = commandLine as ExEntryPanelService
  override val outputPanel: VimOutputPanelService
    get() = service()

--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjVimSearchGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjVimSearchGroup.kt
@@ -97,6 +97,59 @@ open class IjVimSearchGroup : VimSearchGroupBase(), PersistentStateComponent<Ele
    updateSearchHighlights(getLastUsedPattern(), lastIgnoreSmartCase, showSearchHighlight, true)
  }

+  override fun confirmChoice(
+    editor: VimEditor,
+    context: ExecutionContext,
+    match: String,
+    caret: VimCaret,
+    startOffset: Int,
+  ): ReplaceConfirmationChoice {
+    val result: Ref<ReplaceConfirmationChoice> = Ref.create(ReplaceConfirmationChoice.QUIT)
+    val keyStrokeProcessor: Function1<KeyStroke, Boolean> = label@{ key: KeyStroke ->
+      val choice: ReplaceConfirmationChoice
+      val c = key.keyChar
+      choice = if (key.isCloseKeyStroke() || c == 'q') {
+        ReplaceConfirmationChoice.QUIT
+      } else if (c == 'y') {
+        ReplaceConfirmationChoice.SUBSTITUTE_THIS
+      } else if (c == 'l') {
+        ReplaceConfirmationChoice.SUBSTITUTE_LAST
+      } else if (c == 'n') {
+        ReplaceConfirmationChoice.SKIP
+      } else if (c == 'a') {
+        ReplaceConfirmationChoice.SUBSTITUTE_ALL
+      } else {
+        return@label true
+      }
+      // TODO: Handle <C-E> and <C-Y>
+      result.set(choice)
+      false
+    }
+    if (ApplicationManager.getApplication().isUnitTestMode) {
+      caret.moveToOffset(startOffset)
+      val inputModel = getInstance(editor.ij)
+      var key = inputModel.nextKeyStroke()
+      while (key != null) {
+        if (!keyStrokeProcessor.invoke(key)) {
+          break
+        }
+        key = inputModel.nextKeyStroke()
+      }
+    } else {
+      // XXX: The Ex entry panel is used only for UI here, its logic might be inappropriate for this method
+      val exEntryPanel = injector.commandLine.createWithoutShortcuts(
+        editor,
+        context,
+        MessageHelper.message("replace.with.0", match),
+        "",
+      )
+      caret.moveToOffset(startOffset)
+      ModalEntry.activate(editor, keyStrokeProcessor)
+      exEntryPanel.deactivate(refocusOwningEditor = true, resetCaret = false)
+    }
+    return result.get()
+  }
+
  override fun addSubstitutionConfirmationHighlight(
    editor: VimEditor,
    startOffset: Int,
--- a/src/main/java/com/maddyhome/idea/vim/package-info.java
+++ b/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;
--- a/src/main/java/com/maddyhome/idea/vim/statistic/OptionsState.kt
+++ b/src/main/java/com/maddyhome/idea/vim/statistic/OptionsState.kt
@@ -19,16 +19,11 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.group.IjOptionConstants
 import com.maddyhome.idea.vim.group.IjOptions
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.options.OptionAccessScope
 import com.maddyhome.idea.vim.options.OptionConstants

 internal class OptionsState : ApplicationUsagesCollector() {

-  init {
-    initInjector()
-  }
-
  override fun getGroup(): EventLogGroup = GROUP

  override fun getMetrics(): Set<MetricEvent> {
--- a/src/main/java/com/maddyhome/idea/vim/statistic/VimscriptState.kt
+++ b/src/main/java/com/maddyhome/idea/vim/statistic/VimscriptState.kt
@@ -13,16 +13,11 @@ import com.intellij.internal.statistic.eventLog.EventLogGroup
 import com.intellij.internal.statistic.eventLog.events.EventFields
 import com.intellij.internal.statistic.eventLog.events.VarargEventId
 import com.intellij.internal.statistic.service.fus.collectors.ApplicationUsagesCollector
-import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.statistic.PluginState.Util.extensionNames
 import com.maddyhome.idea.vim.vimscript.services.VimRcService

 internal class VimscriptState : ApplicationUsagesCollector() {

-  init {
-    initInjector()
-  }
-
  override fun getGroup(): EventLogGroup = GROUP

  override fun getMetrics(): Set<MetricEvent> {
--- a/src/main/java/com/maddyhome/idea/vim/troubleshooting/Troubleshooter.kt
+++ b/src/main/java/com/maddyhome/idea/vim/troubleshooting/Troubleshooter.kt
@@ -44,7 +44,7 @@ internal class Troubleshooter {
  }

  companion object {
-    fun getInstance() = service<Troubleshooter>()
+    val instance = service<Troubleshooter>()
  }
 }

--- a/src/main/java/com/maddyhome/idea/vim/ui/ExOutputPanel.java
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ExOutputPanel.java
@@ -19,7 +19,6 @@ 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.VimEditor;
-import com.maddyhome.idea.vim.api.VimOutputPanel;
 import com.maddyhome.idea.vim.diagnostic.VimLogger;
 import com.maddyhome.idea.vim.helper.MessageHelper;
 import com.maddyhome.idea.vim.helper.UiHelper;
@@ -47,11 +46,12 @@ import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
 public class ExOutputPanel extends JPanel {
  private final @NotNull Editor myEditor;

-  public final @NotNull JLabel myLabel = new JLabel("more");
+  private final @NotNull JLabel myLabel = new JLabel("more");
  private final @NotNull JTextArea myText = new JTextArea();
  private final @NotNull JScrollPane myScrollPane =
    new JBScrollPane(myText, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
  private final @NotNull ComponentAdapter myAdapter;
+  private boolean myAtEnd = false;
  private int myLineHeight = 0;

  private @Nullable JComponent myOldGlass = null;
@@ -224,31 +224,42 @@ public class ExOutputPanel extends JPanel {
    myLabel.setFont(UiHelper.selectEditorFont(myEditor, myLabel.getText()));
  }

-  public void scrollLine() {
+  private void scrollLine() {
    scrollOffset(myLineHeight);
  }

-  public void scrollPage() {
+  private void scrollPage() {
    scrollOffset(myScrollPane.getVerticalScrollBar().getVisibleAmount());
  }

-  public void scrollHalfPage() {
+  private void scrollHalfPage() {
    double sa = myScrollPane.getVerticalScrollBar().getVisibleAmount() / 2.0;
    double offset = Math.ceil(sa / myLineHeight) * myLineHeight;
    scrollOffset((int)offset);
  }

-  public void onBadKey() {
+  private void handleEnter() {
+    if (myAtEnd) {
+      close();
+    }
+    else {
+      scrollLine();
+    }
+  }
+
+  private void badKey() {
    myLabel.setText(MessageHelper.message("more.ret.line.space.page.d.half.page.q.quit"));
    myLabel.setFont(UiHelper.selectEditorFont(myEditor, myLabel.getText()));
  }

  private void scrollOffset(int more) {
+    myAtEnd = false;
    int val = myScrollPane.getVerticalScrollBar().getValue();
    myScrollPane.getVerticalScrollBar().setValue(val + more);
    myScrollPane.getHorizontalScrollBar().setValue(0);
    if (val + more >=
        myScrollPane.getVerticalScrollBar().getMaximum() - myScrollPane.getVerticalScrollBar().getVisibleAmount()) {
+      myAtEnd = true;
      myLabel.setText(MessageHelper.message("hit.enter.or.type.command.to.continue"));
    }
    else {
@@ -257,11 +268,6 @@ public class ExOutputPanel extends JPanel {
    myLabel.setFont(UiHelper.selectEditorFont(myEditor, myLabel.getText()));
  }

-  public boolean isAtEnd() {
-    int val = myScrollPane.getVerticalScrollBar().getValue();
-    return val >= myScrollPane.getVerticalScrollBar().getMaximum() - myScrollPane.getVerticalScrollBar().getVisibleAmount();
-  }
-
  private void positionPanel() {
    final JComponent contentComponent = myEditor.getContentComponent();
    Container scroll = SwingUtilities.getAncestorOfClass(JScrollPane.class, contentComponent);
@@ -302,13 +308,14 @@ public class ExOutputPanel extends JPanel {
    close(null);
  }

-  public void close(final @Nullable KeyStroke key) {
+  private void close(final @Nullable KeyEvent e) {
    ApplicationManager.getApplication().invokeLater(() -> {
      deactivate(true);

      final Project project = myEditor.getProject();

-      if (project != null && key != null && key.getKeyChar() != '\n') {
+      if (project != null && e != null && e.getKeyChar() != '\n') {
+        final KeyStroke key = KeyStroke.getKeyStrokeForEvent(e);
        final List<KeyStroke> keys = new ArrayList<>(1);
        keys.add(key);
        if (LOG.isTrace()) {
@@ -317,9 +324,7 @@ public class ExOutputPanel extends JPanel {
        }
        KeyHandler.getInstance().getKeyStack().addKeys(keys);
        ExecutionContext context = injector.getExecutionContextManager().getEditorExecutionContext(new IjVimEditor(myEditor));
-        injector.getApplication().runWriteAction(() -> { VimPlugin.getMacro().playbackKeys(new IjVimEditor(myEditor), context, 1);
-          return null;
-        });
+        VimPlugin.getMacro().playbackKeys(new IjVimEditor(myEditor), context, 1);
      }
    });
  }
@@ -336,14 +341,40 @@ public class ExOutputPanel extends JPanel {
     */
    @Override
    public void keyTyped(@NotNull KeyEvent e) {
-      VimOutputPanel currentPanel = injector.getOutputPanel().getCurrentOutputPanel();
-      if (currentPanel == null) return;
-
-      int keyCode = e.getKeyCode();
-      Character keyChar = e.getKeyChar();
-      int modifiers = e.getModifiersEx();
-      KeyStroke keyStroke = (keyChar == KeyEvent.CHAR_UNDEFINED) ? KeyStroke.getKeyStroke(keyCode, modifiers) : KeyStroke.getKeyStroke(keyChar, modifiers);
-      currentPanel.handleKey(keyStroke);
+      if (myExOutputPanel.myAtEnd) {
+        myExOutputPanel.close(e);
+      }
+      else {
+        switch (e.getKeyChar()) {
+          case ' ':
+            myExOutputPanel.scrollPage();
+            break;
+          case 'd':
+            myExOutputPanel.scrollHalfPage();
+            break;
+          case 'q':
+          case '\u001b':
+            myExOutputPanel.close();
+            break;
+          case '\n':
+            myExOutputPanel.handleEnter();
+            break;
+          case KeyEvent.CHAR_UNDEFINED: {
+            switch (e.getKeyCode()) {
+              case KeyEvent.VK_ENTER:
+                myExOutputPanel.handleEnter();
+                break;
+              case KeyEvent.VK_ESCAPE:
+                myExOutputPanel.close();
+                break;
+              default:
+                myExOutputPanel.badKey();
+            }
+          }
+          default:
+            myExOutputPanel.badKey();
+        }
+      }
    }
  }

--- a/src/main/java/com/maddyhome/idea/vim/ui/ReloadVimRc.kt
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ReloadVimRc.kt
@@ -150,7 +150,7 @@ internal class ReloadVimRc : DumbAwareAction() {
  override fun actionPerformed(e: AnActionEvent) {
    val editor = e.getData(PlatformDataKeys.EDITOR) ?: return
    injector.keyGroup.removeKeyMapping(MappingOwner.IdeaVim.InitScript)
-    Troubleshooter.getInstance().removeByType("old-action-notation-in-mappings")
+    Troubleshooter.instance.removeByType("old-action-notation-in-mappings")

    // Reload the ideavimrc in the context of the current window, as though we had called `:source ~/.ideavimrc`
    executeIdeaVimRc(editor.vim)
--- a/src/main/java/com/maddyhome/idea/vim/ui/ShowCmd.kt
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ShowCmd.kt
@@ -20,6 +20,7 @@ import com.intellij.openapi.wm.WindowManager
 import com.intellij.openapi.wm.impl.status.EditorBasedWidget
 import com.intellij.util.Consumer
 import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
@@ -27,7 +28,6 @@ import com.maddyhome.idea.vim.common.EditorListener
 import com.maddyhome.idea.vim.helper.EngineStringHelper
 import com.maddyhome.idea.vim.helper.VimNlsSafe
 import com.maddyhome.idea.vim.newapi.ij
-import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.options.GlobalOptionChangeListener
 import org.jetbrains.annotations.NonNls
 import java.awt.Component
@@ -72,11 +72,6 @@ internal object ShowCmdOptionChangeListener : GlobalOptionChangeListener {
 }

 internal class ShowCmdStatusBarWidgetFactory : StatusBarWidgetFactory/*, LightEditCompatible*/ {
-
-  init {
-    initInjector()
-  }
-
  override fun getId() = ShowCmd.ID

  override fun getDisplayName(): String = ShowCmd.displayName
@@ -86,6 +81,7 @@ internal class ShowCmdStatusBarWidgetFactory : StatusBarWidgetFactory/*, LightEd
  }

  override fun isAvailable(project: Project): Boolean {
+    VimPlugin.getInstance()
    return injector.globalOptions().showcmd
  }

--- a/src/main/java/com/maddyhome/idea/vim/ui/StatusBar.kt
+++ b/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)
@@ -274,7 +267,7 @@ private object ShortcutConflictsSettings : DumbAwareAction(MessageHelper.message
 }

 internal object JoinEap : DumbAwareAction()/*, LightEditCompatible*/ {
-  const val EAP_LINK = "https://plugins.jetbrains.com/plugins/eap/ideavim"
+  private const val EAP_LINK = "https://plugins.jetbrains.com/plugins/eap/ideavim"

  fun eapActive() = EAP_LINK in UpdateSettings.getInstance().storedPluginHosts

--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExActions.kt
+++ b/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>()
+  }
+}
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExDocument.java
+++ b/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;
  }
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEditorKit.kt
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEditorKit.kt
@@ -7,19 +7,57 @@
 */
 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
 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 +69,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 +92,47 @@ 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 entry = ExEntryPanel.getInstance().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()
      }
    }
  }
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.java
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.java
@@ -25,12 +25,10 @@ import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.action.VimShortcutKeyAction;
 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.api.VimKeyGroupBase;
 import com.maddyhome.idea.vim.ex.ranges.LineRange;
 import com.maddyhome.idea.vim.helper.SearchHighlightsHelper;
 import com.maddyhome.idea.vim.helper.UiHelper;
-import com.maddyhome.idea.vim.key.interceptors.VimInputInterceptor;
 import com.maddyhome.idea.vim.newapi.IjVimCaret;
 import com.maddyhome.idea.vim.newapi.IjVimEditor;
 import com.maddyhome.idea.vim.ui.ExPanelBorder;
@@ -38,8 +36,6 @@ import com.maddyhome.idea.vim.vimscript.model.commands.Command;
 import com.maddyhome.idea.vim.vimscript.model.commands.GlobalCommand;
 import com.maddyhome.idea.vim.vimscript.model.commands.SubstituteCommand;
 import com.maddyhome.idea.vim.vimscript.parser.VimscriptParser;
-import kotlin.Unit;
-import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -63,13 +59,9 @@ 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;
-  public Function1<String, Unit> inputProcessing = null;
-  public Character finishOn = null;
-
  private ExEntryPanel(boolean enableShortcuts) {
    label = new JLabel(" ");
    entry = new ExTextField();
@@ -87,13 +79,15 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    layout.setConstraints(entry, gbc);
    add(entry);

-    // This does not need to be unregistered, it's registered as a custom UI property on this
-    EventFacade.getInstance().registerCustomShortcutSet(
-      VimShortcutKeyAction.getInstance(),
-      toShortcutSet(((VimKeyGroupBase) injector.getKeyGroup()).getRequiredShortcutKeys()),
-      entry
-    );
-    new ExShortcutKeyAction(this).registerCustomShortcutSet();
+    if (enableShortcuts) {
+      // This does not need to be unregistered, it's registered as a custom UI property on this
+      EventFacade.getInstance().registerCustomShortcutSet(
+        VimShortcutKeyAction.getInstance(),
+        toShortcutSet(((VimKeyGroupBase) injector.getKeyGroup()).getRequiredShortcutKeys()),
+        entry
+      );
+      new ExShortcutKeyAction(this).registerCustomShortcutSet();
+    }

    updateUI();
  }
@@ -133,18 +127,10 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    }
  }

-  public @Nullable Editor getIjEditor() {
+  public @Nullable Editor getEditor() {
    return weakEditor != null ? weakEditor.get() : null;
  }

-  public @NotNull VimEditor getEditor() {
-    Editor editor = getIjEditor();
-    if (editor == null) {
-      throw new RuntimeException("Editor was disposed for active command line");
-    }
-    return new IjVimEditor(editor);
-  }
-
  public void setEditor(@Nullable Editor editor) {
    if (editor == null) {
      weakEditor = null;
@@ -153,14 +139,6 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    }
  }

-  /**
-   * @deprecated use {@link ExEntryPanel#activate(Editor, DataContext, String, String)}
-   */
-  @Deprecated(forRemoval = true)
-  public void activate(@NotNull Editor editor, DataContext context, @NotNull String label, String initText, int count) {
-    activate(editor, context, label, initText);
-  }
-
  /**
   * Turns on the ex entry field for the given editor
   *
@@ -271,9 +249,6 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {

    // We have this in the end, because `entry.deactivate()` communicates with active panel during deactivation
    active = false;
-    finishOn = null;
-    myInputInterceptor = null;
-    inputProcessing = null;
  }

  private void reset() {
@@ -298,7 +273,7 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    @Override
    protected void textChanged(@NotNull DocumentEvent e) {
      String text = entry.getText();
-      Font newFont = UiHelper.selectEditorFont(getIjEditor(), text);
+      Font newFont = UiHelper.selectEditorFont(getEditor(), text);
      if (newFont != entry.getFont()) {
        entry.setFont(newFont);
      }
@@ -344,14 +319,14 @@ 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()) {
+        if (labelText.equals("/") || labelText.equals("?") || searchCommand) {
          final boolean forwards = !labelText.equals("?");  // :s, :g, :v are treated as forwards
          int pattenEnd = injector.getSearchGroup().findEndOfPattern(searchText, separator, 0);
          final String pattern = searchText.substring(0, pattenEnd);
@@ -405,7 +380,7 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {

  @Override
  public void toggleReplaceMode() {
-    entry.toggleInsertReplace();
+    isReplaceMode = !isReplaceMode;
  }

  /**
@@ -417,14 +392,6 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    return active;
  }

-  /**
-   * @deprecated Use getVisibleText()
-   */
-  @Deprecated(forRemoval = true)
-  public @NotNull String getText() {
-    return entry.getText();
-  }
-
  @Override
  public @NotNull String getVisibleText() {
    return entry.getText();
@@ -442,10 +409,6 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
  @Override
  public void handleKey(@NotNull KeyStroke stroke) {
    entry.handleKey(stroke);
-    if (finishOn != null && stroke.getKeyChar() == finishOn && inputProcessing != null) {
-      inputProcessing.invoke(getActualText());
-      close(true, true);
-    }
  }

  // Called automatically when the LAF is changed and the component is visible, and manually by the LAF listener handler
@@ -483,8 +446,8 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
  }

  private void setFontForElements() {
-    label.setFont(UiHelper.selectEditorFont(getIjEditor(), label.getText()));
-    entry.setFont(UiHelper.selectEditorFont(getIjEditor(), getVisibleText()));
+    label.setFont(UiHelper.selectEditorFont(getEditor(), label.getText()));
+    entry.setFont(UiHelper.selectEditorFont(getEditor(), getVisibleText()));
  }

  private void positionPanel() {
@@ -531,17 +494,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 +513,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,50 +535,6 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    IdeFocusManager.findInstance().requestFocus(entry, true);
  }

-  public @Nullable VimInputInterceptor<?> getInputInterceptor() {
-    return myInputInterceptor;
-  }
-
-  @Override
-  public void insertText(int offset, @NotNull String string) {
-    VimCommandLine.super.insertText(offset, string);
-  }
-
-  public void setInputInterceptor(@Nullable VimInputInterceptor<?> vimInputInterceptor) {
-    myInputInterceptor = vimInputInterceptor;
-  }
-
-  @Override
-  public @Nullable Function1<String, Unit> getInputProcessing() {
-    return inputProcessing;
-  }
-
-  @Override
-  public @Nullable 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) {
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanelService.kt
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanelService.kt
@@ -11,33 +11,25 @@ import com.intellij.openapi.application.ApplicationManager
 import com.maddyhome.idea.vim.action.change.Extension
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimCommandLine
-import com.maddyhome.idea.vim.api.VimCommandLineCaret
-import com.maddyhome.idea.vim.api.VimCommandLineServiceBase
+import com.maddyhome.idea.vim.api.VimCommandLineService
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.VimModalInput
-import com.maddyhome.idea.vim.api.VimModalInputBase
-import com.maddyhome.idea.vim.api.VimModalInputService
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.TestInputModel
 import com.maddyhome.idea.vim.helper.inRepeatMode
 import com.maddyhome.idea.vim.helper.isCloseKeyStroke
-import com.maddyhome.idea.vim.key.interceptors.VimInputInterceptor
 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.ReturnableFromCmd
 import com.maddyhome.idea.vim.ui.ModalEntry
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke

-class ExEntryPanelService : VimCommandLineServiceBase(), VimModalInputService {
+class ExEntryPanelService : VimCommandLineService {
  override fun getActiveCommandLine(): VimCommandLine? {
-    val instance = ExEntryPanel.instance ?: return null
+    val instance = ExEntryPanel.instance ?: ExEntryPanel.instanceWithoutShortcuts ?: return null
    return if (instance.isActive) instance else null
  }

-  @Deprecated("Please use readInputAndProcess")
-  fun inputString(vimEditor: VimEditor, context: ExecutionContext, prompt: String, finishOn: Char?): String? {
+  override fun inputString(vimEditor: VimEditor, context: ExecutionContext, prompt: String, finishOn: Char?): String? {
    val editor = vimEditor.ij
    if (vimEditor.inRepeatMode) {
      val input = Extension.consumeString()
@@ -66,7 +58,7 @@ class ExEntryPanelService : VimCommandLineServiceBase(), VimModalInputService {
    } else {
      var text: String? = null
      // XXX: The Ex entry panel is used only for UI here, its logic might be inappropriate for input()
-      val commandLine = injector.commandLine.createSearchPrompt(vimEditor, context, prompt.ifEmpty { " " }, "")
+      val commandLine = injector.commandLine.create(vimEditor, context, prompt.ifEmpty { " " }, "")
      ModalEntry.activate(editor.vim) { key: KeyStroke ->
        return@activate when {
          key.isCloseKeyStroke() -> {
@@ -97,40 +89,7 @@ class ExEntryPanelService : VimCommandLineServiceBase(), VimModalInputService {
    }
  }

-  override fun readInputAndProcess(
-    editor: VimEditor,
-    context: ExecutionContext,
-    prompt: String,
-    finishOn: Char?,
-    processing: (String) -> Unit,
-  ) {
-    val currentMode = editor.mode
-    check(currentMode is ReturnableFromCmd) {
-      "Cannot enable cmd mode from current mode $currentMode"
-    }
-
-    // Make sure the Visual selection marks are up to date before we use them.
-    injector.markService.setVisualSelectionMarks(editor)
-
-    // Note that we should remove selection and reset caret offset before we switch back to Normal mode and then enter
-    // Command-line mode. However, some IdeaVim commands can handle multiple carets, including multiple carets with
-    // selection (which might or might not be a block selection). Unfortunately, because we're just entering
-    // Command-line mode, we don't know which command is going to be entered, so we can't remove selection here.
-    // Therefore, we switch to Normal and then Command-line even though we might still have a Visual selection...
-    // On the plus side, it means we still show selection while editing the command line, which Vim also does
-    // (Normal then Command-line is not strictly necessary, but done for completeness and autocmd)
-    // Caret selection is finally handled in Command.execute
-    editor.mode = Mode.NORMAL()
-    editor.mode = Mode.CMD_LINE(currentMode)
-
-    val panel = ExEntryPanel.getInstance()
-    panel as ExEntryPanel
-    panel.finishOn = finishOn
-    panel.inputProcessing = processing
-    panel.activate(editor.ij, context.ij, prompt, "")
-  }
-
-  override fun createPanel(editor: VimEditor, context: ExecutionContext, label: String, initText: String): VimCommandLine {
+  override fun create(editor: VimEditor, context: ExecutionContext, label: String, initText: String): VimCommandLine {
    val panel = ExEntryPanel.getInstance()
    panel.activate(editor.ij, context.ij, label, initText)
    return panel
@@ -145,31 +104,4 @@ class ExEntryPanelService : VimCommandLineServiceBase(), VimModalInputService {
  override fun fullReset() {
    ExEntryPanel.fullReset()
  }
-
-  override fun getCurrentModalInput(): VimModalInput? {
-    return ExEntryPanel.getInstanceWithoutShortcuts()?.takeIf { it.isActive && it.inputInterceptor != null }?.let { WrappedAsModalInputExEntryPanel(it) }
-  }
-
-  override fun create(editor: VimEditor, context: ExecutionContext, label: String, inputInterceptor: VimInputInterceptor<*>): VimModalInput {
-    val panel = ExEntryPanel.getInstanceWithoutShortcuts()
-    panel.inputInterceptor = inputInterceptor
-    panel.activate(editor.ij, context.ij, label, "")
-    return WrappedAsModalInputExEntryPanel(panel)
-  }
 }
-
-internal class WrappedAsModalInputExEntryPanel(internal val exEntryPanel: ExEntryPanel) : VimModalInputBase() {
-  override var inputInterceptor: VimInputInterceptor<*>
-    get() = exEntryPanel.inputInterceptor!!
-    set(value) { exEntryPanel.inputInterceptor = value }
-  override val caret: VimCommandLineCaret = exEntryPanel.caret
-  override val label: String = exEntryPanel.label
-
-  override fun deactivate(refocusOwningEditor: Boolean, resetCaret: Boolean) {
-    exEntryPanel.deactivate(refocusOwningEditor, resetCaret)
-  }
-
-  override fun focus() {
-    exEntryPanel.focus()
-  }
-}
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExKeyBindings.kt
+++ b/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),
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExShortcutKeyAction.kt
+++ b/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)
  }
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExTextField.java
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ex/ExTextField.java
@@ -19,6 +19,7 @@ import com.maddyhome.idea.vim.api.VimCommandLineCaret;
 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 +66,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);
      }
    });
@@ -207,7 +211,7 @@ public class ExTextField extends JTextField {
  }

  public @Nullable Editor getEditor() {
-    return ExEntryPanel.getInstance().getIjEditor();
+    return ExEntryPanel.getInstance().getEditor();
  }

  public DataContext getContext() {
@@ -235,15 +239,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 +278,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();
+    }
  }

  /**
@@ -277,17 +291,26 @@ public class ExTextField extends JTextField {
   */
  void cancel() {
    clearCurrentAction();
-    VimCommandLine commandLine = injector.getCommandLine().getActiveCommandLine();
-    if (commandLine != null) {
-      commandLine.close(true, true);
+    Editor editor = ExEntryPanel.instance.getEditor();
+    if (editor != null) {
+      VimPlugin.getProcess().cancelExEntry(new IjVimEditor(editor), true, true);
    }
  }

  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 +541,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());
--- a/src/main/java/com/maddyhome/idea/vim/ui/widgets/mode/ModeWidgetPopup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/ui/widgets/mode/ModeWidgetPopup.kt
@@ -352,8 +352,7 @@ class ModeWidgetPopup : AnAction() {

 enum class ModeWidgetTheme(private var value: String) {
  TERM("Term"),
-  COLORLESS("Colorless"),
-  DRACULA("Dracula");
+  COLORLESS("Colorless");

  override fun toString(): String {
    return value
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chylex	9101ca1afc	Set plugin version to chylex-37	2024-07-09 05:56:31 +02:00
chylex	7e493e0188	Revert per-caret registers	2024-07-09 05:56:31 +02:00
chylex	78b5540636	Revert "Factor disposable objects on editor opening" This reverts commit `1fa78935`	2024-07-09 05:48:41 +02:00
chylex	97ba6ae997	Fix(VIM-3364): Exception with mapped Generate action	2024-07-09 05:48:41 +02:00
chylex	9ac1a14604	Apply scrolloff after executing native IDEA actions	2024-07-09 05:48:35 +02:00
chylex	3c20feba8d	Stay on same line after reindenting	2024-07-09 05:48:29 +02:00
chylex	d23475818a	Update search register when using f/t	2024-07-09 05:48:29 +02:00
chylex	7f5c9b56ef	Automatically add unambiguous imports after running a macro	2024-07-09 05:48:29 +02:00
chylex	c3f5cb4866	Fix(VIM-3179): Respect virtual space below editor (imperfectly)	2024-07-09 05:48:29 +02:00
chylex	7a25fbfd31	Fix(VIM-3178): Workaround to support "Jump to Source" action mapping	2024-07-09 05:48:29 +02:00
chylex	444880b153	Add support for count for visual and line motion surround	2024-07-09 05:48:29 +02:00
chylex	0ae06e46da	Fix vim-surround not working with multiple cursors Fixes multiple cursors with vim-surround commands `cs, ds, S` (but not `ys`).	2024-07-09 05:48:29 +02:00
chylex	98e085e636	Fix(VIM-696) Restore visual mode after undo/redo, and disable incompatible actions	2024-07-09 05:48:28 +02:00
chylex	67c60ae8cc	Respect count with <Action> mappings	2024-07-09 05:48:28 +02:00
chylex	ffd2433da3	Change matchit plugin to use HTML patterns in unrecognized files	2024-07-09 05:48:28 +02:00
chylex	cfe219250c	Reset insert mode when switching active editor	2024-07-09 05:48:28 +02:00
chylex	68bdae1afc	Remove update checker	2024-07-09 05:48:28 +02:00
chylex	77859e03e7	Set custom plugin version	2024-07-09 05:48:28 +02:00
chylex	cfd05be288	Revert "Migrate to IntelliJ Platform Gradle Plugin 2.0" This reverts commit `4913b13a`	2024-07-09 05:48:28 +02:00