Fix(VIM-3615): Escape closes dialog while waiting for more keys

2025-08-18 10:31:44 +02:00 · 2024-08-25 10:06:16 +02:00
410 changed files with 5130 additions and 9937 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-* text=auto eol=lf
--- a/.github/workflows/closeYoutrackOnCommit.yml
+++ b/.github/workflows/closeYoutrackOnCommit.yml
@@ -7,9 +7,6 @@ on:
  workflow_dispatch:
  push:
    branches: [ master ]
-    
-permissions:
-  contents: write

 jobs:
  build:
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,11 +20,6 @@ on:
  schedule:
    - cron: '44 12 * * 4'

-permissions:
-  actions: read
-  contents: read
-  security-events: write
-
 jobs:
  analyze:
    name: Analyze
--- a/.github/workflows/syncDoc.yml
+++ b/.github/workflows/syncDoc.yml
@@ -10,9 +10,6 @@ on:
  push:
    branches: [ master ]

-permissions:
-  contents: write
-
 jobs:
  build:

@@ -37,17 +34,6 @@ jobs:
        id: update_authors
        run: cp -a origin/doc/. docs

-      # The Wiki for github should have no `.md` in references
-      # Otherwise, such links will lead to the raw text.
-      # However, the `.md` should exist to have a navigation in GitHub code.
-      - name: Replace `.md)` with `)`
-        run: |
-          # Define the directory you want to process
-          DIRECTORY="docs"
-
-          # Find all files in the directory and perform the replacement
-          find $DIRECTORY -type f -exec sed -i 's/\.md)/)/g' {} +
-
      - name: Commit changes
        uses: stefanzweifel/git-auto-commit-action@v4
        with:
--- a/.teamcity/_Self/Constants.kt
+++ b/.teamcity/_Self/Constants.kt
@@ -5,12 +5,13 @@ object Constants {
  const val EAP_CHANNEL = "eap"
  const val DEV_CHANNEL = "Dev"

-  const val NVIM_TESTS = "2024.2.1"
-  const val PROPERTY_TESTS = "2024.2.1"
-  const val LONG_RUNNING_TESTS = "2024.2.1"
-  const val QODANA_TESTS = "2024.2.1"
-  const val RELEASE = "2024.2.1"
+  const val GITHUB_TESTS = "2024.1.1"
+  const val NVIM_TESTS = "2024.1.1"
+  const val PROPERTY_TESTS = "2024.1.1"
+  const val LONG_RUNNING_TESTS = "2024.1.1"
+  const val QODANA_TESTS = "2024.1.1"
+  const val RELEASE = "2024.1.1"

-  const val RELEASE_DEV = "2024.2.1"
-  const val RELEASE_EAP = "2024.2.1"
+  const val RELEASE_DEV = "2024.1.1"
+  const val RELEASE_EAP = "2024.1.1"
 }
--- a/.teamcity/_Self/Project.kt
+++ b/.teamcity/_Self/Project.kt
@@ -8,6 +8,7 @@ import _Self.buildTypes.PropertyBased
 import _Self.buildTypes.Qodana
 import _Self.buildTypes.TestingBuildType
 import _Self.subprojects.GitHub
+import _Self.subprojects.OldTests
 import _Self.subprojects.Releases
 import _Self.vcsRoots.GitHubPullRequest
 import _Self.vcsRoots.ReleasesVcsRoot
@@ -17,7 +18,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 object Project : Project({
  description = "Vim engine for JetBrains IDEs"

-  subProjects(Releases, GitHub)
+  subProjects(Releases, OldTests, GitHub)

  // VCS roots
  vcsRoot(GitHubPullRequest)
@@ -25,7 +26,7 @@ object Project : Project({

  // Active tests
  buildType(TestingBuildType("Latest EAP", "<default>", version = "LATEST-EAP-SNAPSHOT"))
-  buildType(TestingBuildType("2024.2.1", "<default>"))
+  buildType(TestingBuildType("2024.1.1", "<default>"))
  buildType(TestingBuildType("Latest EAP With Xorg", "<default>", version = "LATEST-EAP-SNAPSHOT"))

  buildType(PropertyBased)
@@ -42,9 +43,6 @@ object Project : Project({
 abstract class IdeaVimBuildType(init: BuildType.() -> Unit) : BuildType({
  artifactRules = """
        +:build/reports => build/reports
-        +:tests/java-tests/build/reports => java-tests/build/reports
-        +:tests/long-running-tests/build/reports => long-running-tests/build/reports
-        +:tests/property-tests/build/reports => property-tests/build/reports
        +:/mnt/agent/temp/buildTmp/ => /mnt/agent/temp/buildTmp/
    """.trimIndent()

@@ -54,7 +52,7 @@ abstract class IdeaVimBuildType(init: BuildType.() -> Unit) : BuildType({
    // These requirements define Linux-Medium configuration.
    // Unfortunately, requirement by name (teamcity.agent.name) doesn't work
    //   IDK the reason for it, but on our agents this property is empty
-    equals("teamcity.agent.hardware.cpuCount", "16")
+    equals("teamcity.agent.hardware.cpuCount", "4")
    equals("teamcity.agent.os.family", "Linux")
  }

--- a/.teamcity/_Self/buildTypes/Compatibility.kt
+++ b/.teamcity/_Self/buildTypes/Compatibility.kt
@@ -40,9 +40,6 @@ object Compatibility : IdeaVimBuildType({
              # 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
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.julienphalip.ideavim.peekaboo' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.julienphalip.ideavim.switch' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.julienphalip.ideavim.functiontextobj' [latest-IU] -team-city
            """.trimIndent()
    }
  }
--- a/.teamcity/_Self/buildTypes/ReleaseEapFromBranch.kt
+++ b/.teamcity/_Self/buildTypes/ReleaseEapFromBranch.kt
@@ -41,7 +41,7 @@ object ReleaseEapFromBranch : IdeaVimBuildType({
  vcs {
    root(ReleasesVcsRoot)
    branchFilter = """
-      +:heads/releases/*
+      +:heads/(releases/*)
      """.trimIndent()

    checkoutMode = CheckoutMode.AUTO
--- a/.teamcity/_Self/buildTypes/TestingBuildType.kt
+++ b/.teamcity/_Self/buildTypes/TestingBuildType.kt
@@ -39,11 +39,9 @@ open class TestingBuildType(

  steps {
    gradle {
-      clearConditions()
      tasks = "clean test"
      buildFile = ""
      enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-17-amazon-corretto"
    }
  }

--- a/.teamcity/_Self/subprojects/GitHub.kt
+++ b/.teamcity/_Self/subprojects/GitHub.kt
@@ -1,5 +1,6 @@
 package _Self.subprojects

+import _Self.Constants
 import _Self.IdeaVimBuildType
 import _Self.vcsRoots.GitHubPullRequest
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
@@ -24,6 +25,7 @@ class GithubBuildType(command: String, desc: String) : IdeaVimBuildType({

  params {
    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", Constants.GITHUB_TESTS)
    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
  }

--- a/.teamcity/_Self/subprojects/OldTests.kt
+++ b/.teamcity/_Self/subprojects/OldTests.kt
@@ -0,0 +1,25 @@
+package _Self.subprojects
+
+import _Self.buildTypes.TestingBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+
+object OldTests : Project({
+  name = "Old IdeaVim tests"
+  description = "Tests for older versions of IJ"
+
+  buildType(TestingBuildType("IC-2018.1", "181-182", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2018.2", "181-182", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2018.3", "183", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2019.1", "191-193", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2019.2", "191-193", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2019.3", "191-193", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2020.1", "201", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2020.2", "202", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2020.3", "203-212", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2021.1", "203-212", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2021.2.2", "203-212", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2021.3.2", "213-221", javaVersion = "1.8", javaPlugin = false))
+  buildType(TestingBuildType("IC-2022.2.3", branch = "222", javaPlugin = false))
+  buildType(TestingBuildType("IC-2023.1", "231-232", javaPlugin = false))
+  buildType(TestingBuildType("IC-2023.2", "231-232", javaPlugin = false))
+})
--- a/.teamcity/patches/buildTypes/IdeaVimTests_Latest_EAP.kts
+++ b/.teamcity/patches/buildTypes/IdeaVimTests_Latest_EAP.kts
@@ -0,0 +1,39 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.GradleBuildStep
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'IdeaVimTests_Latest_EAP'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("IdeaVimTests_Latest_EAP")) {
+    check(artifactRules == """
+        +:build/reports => build/reports
+        +:/mnt/agent/temp/buildTmp/ => /mnt/agent/temp/buildTmp/
+    """.trimIndent()) {
+        "Unexpected option value: artifactRules = $artifactRules"
+    }
+    artifactRules = """
+        +:build/reports => build/reports
+        +:/mnt/agent/temp/buildTmp/ => /mnt/agent/temp/buildTmp/
+        +:tests/java-tests/build/reports => tests/java-tests/build/reports
+    """.trimIndent()
+
+    expectSteps {
+        gradle {
+            tasks = "clean test"
+            buildFile = ""
+            enableStacktrace = true
+        }
+    }
+    steps {
+        update<GradleBuildStep>(0) {
+            clearConditions()
+            jdkHome = "/usr/lib/jvm/java-17-amazon-corretto"
+        }
+    }
+}
--- a/.teamcity/patches/buildTypes/ReleaseEapFromBranch.kts
+++ b/.teamcity/patches/buildTypes/ReleaseEapFromBranch.kts
@@ -0,0 +1,19 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ReleaseEapFromBranch'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ReleaseEapFromBranch")) {
+    vcs {
+
+        check(branchFilter == "+:heads/(releases/*)") {
+            "Unexpected option value: branchFilter = $branchFilter"
+        }
+        branchFilter = "heads/releases/*"
+    }
+}
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -535,34 +535,6 @@ Contributors:
  [![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
-* [![icon][mail]](mailto:kirill.karnaukhov@jetbrains.com)
-  [![icon][github]](https://github.com/kkarnauk)
-  &nbsp;
-  Kirill Karnaukhov, 
-* [![icon][mail]](mailto:sander.hestvik@gmail.com)
-  [![icon][github]](https://github.com/SanderHestvik)
-  &nbsp;
-  SanderHestvik
-* [![icon][mail]](mailto:gregory.shrago@jetbrains.com)
-  [![icon][github]](https://github.com/gregsh)
-  &nbsp;
-  Greg Shrago
-* [![icon][mail]](mailto:jphalip@gmail.com)
-  [![icon][github]](https://github.com/jphalip)
-  &nbsp;
-  Julien Phalip
-* [![icon][mail]](mailto:j.trimailovas@gmail.com)
-  [![icon][github]](https://github.com/trimailov)
-  &nbsp;
-  Justas Trimailovas, 
-* [![icon][mail]](mailto:justast@wix.com)
-  [![icon][github]](https://github.com/justast-wix)
-  &nbsp;
-  Justas Trimailovas

 Previous contributors:

@@ -574,10 +546,6 @@ Previous contributors:
  [![icon][github]](https://github.com/kevin70)
  &nbsp;
  kk
-* [![icon][mail]](mailto:gregory.shrago@jetbrains.com)
-  [![icon][github]](https://github.com/gregsh)
-  &nbsp;
-  Greg Shrago

                        
 If you are a contributor and your name is not listed here, feel free to
--- a/annotation-processors/build.gradle.kts
+++ b/annotation-processors/build.gradle.kts
@@ -21,7 +21,7 @@ repositories {
 }

 dependencies {
-  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.1.0-1.0.29")
+  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.0.0-1.0.24")
  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/build.gradle.kts
+++ b/build.gradle.kts
@@ -50,14 +50,14 @@ buildscript {
    classpath("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")

    // This is needed for jgit to connect to ssh
-    classpath("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:7.1.0.202411261347-r")
+    classpath("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.10.0.202406032230-r")
    classpath("org.kohsuke:github-api:1.305")

-    classpath("io.ktor:ktor-client-core:3.0.2")
-    classpath("io.ktor:ktor-client-cio:3.0.2")
-    classpath("io.ktor:ktor-client-auth:3.0.2")
-    classpath("io.ktor:ktor-client-content-negotiation:3.0.2")
-    classpath("io.ktor:ktor-serialization-kotlinx-json:3.0.2")
+    classpath("io.ktor:ktor-client-core:2.3.12")
+    classpath("io.ktor:ktor-client-cio:2.3.10")
+    classpath("io.ktor:ktor-client-auth:2.3.12")
+    classpath("io.ktor:ktor-client-content-negotiation:2.3.10")
+    classpath("io.ktor:ktor-serialization-kotlinx-json:2.3.12")

    // This comes from the changelog plugin
 //        classpath("org.jetbrains:markdown:0.3.1")
@@ -69,7 +69,7 @@ plugins {
  kotlin("jvm") version "2.0.0"
  application
  id("java-test-fixtures")
-  id("org.jetbrains.intellij.platform") version "2.2.0"
+  id("org.jetbrains.intellij.platform") version "2.0.0-rc2"
  id("org.jetbrains.changelog") version "2.2.1"
  id("org.jetbrains.kotlinx.kover") version "0.6.1"
  id("com.dorongold.task-tree") version "4.0.0"
@@ -85,6 +85,7 @@ val ideaVersion: String by project
 val ideaType: String by project
 val instrumentPluginCode: String by project
 val remoteRobotVersion: String by project
+val splitModeVersion: String by project

 val publishChannels: String by project
 val publishToken: String by project
@@ -107,17 +108,13 @@ dependencies {
  compileOnly(project(":annotation-processors"))

  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-  compileOnly("org.jetbrains:annotations:26.0.1")
+  compileOnly("org.jetbrains:annotations:24.1.0")

  intellijPlatform {
-    // Snapshots don't use installers
-    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#target-versions-installers
-    val useInstaller = "EAP-SNAPSHOT" !in ideaVersion
-
    // 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, useInstaller)
+    create(ideaType, ideaVersion)

    pluginVerifier()
    zipSigner()
@@ -128,7 +125,6 @@ dependencies {

    // 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"))
@@ -150,17 +146,17 @@ dependencies {
  // https://mvnrepository.com/artifact/org.mockito.kotlin/mockito-kotlin
  testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")

-  testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.5")
-  testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.5")
-  testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.5")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:5.10.5")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.5")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-params:5.10.5")
+  testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.3")
+  testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.3")
+  testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.3")
+  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.5")
+  testImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
 //  testFixturesImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
 }

@@ -214,8 +210,6 @@ tasks {
  }

  compileTestKotlin {
-    enabled = false
-    
    kotlinOptions {
      jvmTarget = javaVersion
      apiVersion = "1.9"
@@ -235,7 +229,6 @@ tasks {

  // 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
-  // You can also set splitMode and splitModeTarget here to test split mode in a custom IDE
 //  val runIdeCustom by intellijPlatformTesting.runIde.registering {
 //    type = IntelliJPlatformType.Rider
 //    version = "2024.1.2"
@@ -268,6 +261,10 @@ tasks {
  val runIdeSplitMode by intellijPlatformTesting.runIde.registering {
    splitMode = true
    splitModeTarget = SplitModeAware.SplitModeTarget.FRONTEND
+
+    // 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)
  }

  // Add plugin open API sources to the plugin ZIP
--- a/doc/Home.md
+++ b/doc/Home.md
@@ -1,6 +1,6 @@
 Welcome to the IdeaVim wiki!

- 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)
+- 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)
--- a/doc/IdeaVim
+++ b/doc/IdeaVim
@@ -82,7 +82,7 @@ Original plugin: [NERDTree](https://github.com/preservim/nerdtree).
   
 ### Instructions
   
-[See here](NERDTree-support.md).
+[See here](NERDTree-support).

 </details>

@@ -321,10 +321,7 @@ If you want to optimize highlight duration, assign a time in milliseconds:
   
 If you want to change background color of highlight you can provide the rgba of the color you want e.g.  
      `let g:highlightedyank_highlight_color = "rgba(160, 160, 160, 155)"`
-
-If you want to change text color of highlight you can provide the rgba of the color you want e.g.  
-`let g:highlightedyank_highlight_foreground_color = "rgba(0, 0, 0, 255)"`
-
+   
 https://github.com/machakann/vim-highlightedyank/blob/master/doc/highlightedyank.txt

 </details>
@@ -438,50 +435,3 @@ Original plugin: [vim-which-key](https://github.com/liuchengxu/vim-which-key).
 https://github.com/TheBlob42/idea-which-key?tab=readme-ov-file#installation

 </details>
-<details>
-<summary><h2>Vim Peekaboo</h2></summary>
-
-By Julien Phalip  
-Original plugin: [vim-peekaboo](https://github.com/junegunn/vim-peekaboo).
-
-### Setup
-
-Add `set peekaboo` to your `~/.ideavimrc` file, then run `:source ~/.ideavimrc`
-or restart the IDE.
-
-### Instructions
-
-https://plugins.jetbrains.com/plugin/25776-vim-peekaboo
-</details>
-
-<details>
-<summary><h2>FunctionTextObj</h2></summary>
-
-By Julien Phalip  
-
-### Setup
-
-Add `set functiontextobj` to your `~/.ideavimrc` file, then run `:source ~/.ideavimrc`
-or restart the IDE.
-
-### Instructions
-
-https://plugins.jetbrains.com/plugin/25897-vim-functiontextobj
-</details>
-
-<details>
-<summary><h2>Switch</h2></summary>
-
-By Julien Phalip  
-Original plugin: [switch.vim](https://github.com/AndrewRadev/switch.vim).
-
-### Setup
-
-Add `set switch` to your `~/.ideavimrc` file, then run `:source ~/.ideavimrc`
-or restart the IDE.
-
-### Instructions
-
-https://plugins.jetbrains.com/plugin/25899-vim-switch
-
-</details>
--- 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
@@ -25,7 +25,7 @@ It's not intended to be read by the users as it brings no value to them.
 IdeaVim has multiple YouTrack statuses, main are:

 - Submitted: issue is created by user, but not processed by our team. This is the default status for new tickets.
- Open: issues is processed by our team, what means that the issues is reproduced and accepted
+- Open: issues is processed by out team, what means that the issues is reproduced and accepted
 - Waiting For Reply: Waiting for further information from the user. These issues are automatically closed if the
     user doesn't reply in 30 days.
 - Ready To Release: Bug is fixed, but not yet released
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,15 +16,21 @@
 # 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
 instrumentPluginCode=true
-version=chylex-42
+version=SNAPSHOT
 javaVersion=17
 remoteRobotVersion=0.11.23
 antlrVersion=4.10.1

+# [VERSION UPDATE] 2024.2 - remove when IdeaVim targets 2024.2
+# Running IdeaVim in split mode requires 242. Update this version once 242 has been released, and remove it completely
+# when IdeaVim targets 242, at which point runIdeSplitMode will run correctly with the target version.
+# See also runIdeSplitMode
+splitModeVersion=242-EAP-SNAPSHOT
+

 # Please don't forget to update kotlin version in buildscript section
 # Also update kotlinxSerializationVersion version
@@ -41,6 +47,7 @@ youtrackToken=

 # Gradle settings
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
+org.gradle.configuration-cache=true
 org.gradle.caching=true

 # Disable warning from gradle-intellij-plugin. Kotlin stdlib is included as compileOnly, so the warning is unnecessary
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/22
+++ b/22
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#

 ##############################################################################
 #
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -85,9 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -148,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -156,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -205,11 +201,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,6 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@@ -45,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

@@ -59,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

--- a/scripts/build.gradle.kts
+++ b/scripts/build.gradle.kts
@@ -20,17 +20,17 @@ repositories {
 }

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

-  implementation("io.ktor:ktor-client-core:3.0.2")
-  implementation("io.ktor:ktor-client-cio:3.0.2")
-  implementation("io.ktor:ktor-client-content-negotiation:3.0.2")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:3.0.2")
-  implementation("io.ktor:ktor-client-auth:3.0.2")
+  implementation("io.ktor:ktor-client-core:2.3.12")
+  implementation("io.ktor:ktor-client-cio:2.3.10")
+  implementation("io.ktor:ktor-client-content-negotiation:2.3.10")
+  implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.12")
+  implementation("io.ktor:ktor-client-auth:2.3.12")
  implementation("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")

  // This is needed for jgit to connect to ssh
-  implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:7.1.0.202411261347-r")
+  implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.10.0.202406032230-r")
  implementation("com.vdurmont:semver4j:3.1.0")
 }

--- a/scripts/src/main/kotlin/scripts/checkNewPluginDependencies.kt
+++ b/scripts/src/main/kotlin/scripts/checkNewPluginDependencies.kt
@@ -40,9 +40,6 @@ val knownPlugins = setOf(
  "com.protoseo.input-source-auto-converter",

 //   "cc.implicated.intellij.plugins.bunny", // I don't want to include this plugin in the list of IdeaVim plugins as I don't understand what this is for
-  "com.julienphalip.ideavim.peekaboo", // https://plugins.jetbrains.com/plugin/25776-vim-peekaboo
-  "com.julienphalip.ideavim.switch", // https://plugins.jetbrains.com/plugin/25899-vim-switch
-  "com.julienphalip.ideavim.functiontextobj", // https://plugins.jetbrains.com/plugin/25897-vim-functiontextobj
 )

 suspend fun main() {
--- a/src/main/java/com/maddyhome/idea/vim/PluginStartup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/PluginStartup.kt
@@ -8,10 +8,6 @@

 package com.maddyhome.idea.vim

-import com.intellij.ide.BrowserUtil
-import com.intellij.ide.plugins.IdeaPluginDescriptor
-import com.intellij.ide.plugins.PluginStateListener
-import com.intellij.ide.plugins.PluginStateManager
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
 import com.intellij.openapi.project.Project
@@ -33,9 +29,6 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {

  private var firstInitializationOccurred = false

-  // TODO
-  // We should migrate to some solution from https://plugins.jetbrains.com/docs/intellij/plugin-components.html#application-startup
-  // If you'd like to add a new code here, please consider using one of the things described there.
  override suspend fun execute(project: Project) {
    if (firstInitializationOccurred) return
    firstInitializationOccurred = true
@@ -47,18 +40,6 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {

    // This code should be executed once
    VimPlugin.getInstance().initialize()
-
-    // Uninstall survey. Should be registered once for all projects
-    PluginStateManager.addStateListener(object : PluginStateListener {
-      override fun install(p0: IdeaPluginDescriptor) {/*Nothing*/
-      }
-
-      override fun uninstall(descriptor: IdeaPluginDescriptor) {
-        if (descriptor.pluginId == VimPlugin.getPluginId()) {
-          BrowserUtil.open("https://surveys.jetbrains.com/s3/ideavim-uninstall-feedback")
-        }
-      }
-    })
  }
 }

--- a/src/main/java/com/maddyhome/idea/vim/VimPlugin.java
+++ b/src/main/java/com/maddyhome/idea/vim/VimPlugin.java
@@ -10,7 +10,6 @@ package com.maddyhome.idea.vim;
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
@@ -25,8 +24,10 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.util.SlowOperations;
-import com.maddyhome.idea.vim.api.*;
+import com.maddyhome.idea.vim.api.VimEditor;
+import com.maddyhome.idea.vim.api.VimInjectorKt;
+import com.maddyhome.idea.vim.api.VimKeyGroup;
+import com.maddyhome.idea.vim.api.VimOptionGroup;
 import com.maddyhome.idea.vim.config.VimState;
 import com.maddyhome.idea.vim.config.migration.ApplicationConfigurationMigrator;
 import com.maddyhome.idea.vim.extension.VimExtensionRegistrar;
@@ -35,6 +36,7 @@ import com.maddyhome.idea.vim.group.copy.PutGroup;
 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;
@@ -139,8 +141,8 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
    return (MacroGroup)VimInjectorKt.getInjector().getMacro();
  }

-  public static @NotNull VimDigraphGroup getDigraph() {
-    return VimInjectorKt.getInjector().getDigraphGroup();
+  public static @NotNull DigraphGroup getDigraph() {
+    return (DigraphGroup)VimInjectorKt.getInjector().getDigraphGroup();
  }

  public static @NotNull HistoryGroup getHistory() {
@@ -337,9 +339,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable

    // 4) ~/.ideavimrc execution
    // Evaluate in the context of the fallback window, to capture local option state, to copy to the first editor window
-    try (AccessToken ignore = SlowOperations.knownIssue("VIM-3661")) {
-      registerIdeavimrc(VimInjectorKt.getInjector().getFallbackWindow());
-    }
+    registerIdeavimrc(VimInjectorKt.getInjector().getFallbackWindow());

    // Turing on should be performed after all commands registration
    getSearch().turnOn();
--- 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
@@ -298,10 +298,26 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
        .addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_DOWN_MASK))
        .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0))
        .addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_DOWN_MASK))
-        .addAll(getKeyStrokes(KeyEvent.VK_UP, 0))
-        .addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0))
-        .addAll(getKeyStrokes(KeyEvent.VK_LEFT, 0))
-        .addAll(getKeyStrokes(KeyEvent.VK_RIGHT, 0))
+        .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK))
+        .addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK))
+        .addAll(
+          getKeyStrokes(
+            KeyEvent.VK_LEFT,
+            0,
+            InputEvent.CTRL_DOWN_MASK,
+            InputEvent.SHIFT_DOWN_MASK,
+            InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK,
+          ),
+        )
+        .addAll(
+          getKeyStrokes(
+            KeyEvent.VK_RIGHT,
+            0,
+            InputEvent.CTRL_DOWN_MASK,
+            InputEvent.SHIFT_DOWN_MASK,
+            InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK,
+          ),
+        )
        .addAll(
          getKeyStrokes(
            KeyEvent.VK_HOME,
--- 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, context, 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, context, 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/change/delete/DeleteJoinVisualLinesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesAction.kt
@@ -44,7 +44,6 @@ class DeleteJoinVisualLinesAction : VisualOperatorActionHandler.SingleExecution(
      val range = caretsAndSelections[caret] ?: return@forEach
      if (!injector.changeGroup.deleteJoinRange(
          editor,
-          context,
          caret,
          range.toVimTextRange(true).normalize(),
          false,
--- a/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/change/delete/DeleteJoinVisualLinesSpacesAction.kt
@@ -44,7 +44,6 @@ class DeleteJoinVisualLinesSpacesAction : VisualOperatorActionHandler.SingleExec
      val range = caretsAndSelections[caret] ?: return@forEach
      if (!injector.changeGroup.deleteJoinRange(
          editor,
-          context,
          caret,
          range.toVimTextRange(true).normalize(),
          true,
--- a/src/main/java/com/maddyhome/idea/vim/action/editor/VimEditorActions.kt
+++ b/src/main/java/com/maddyhome/idea/vim/action/editor/VimEditorActions.kt
@@ -20,8 +20,6 @@ import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.handler.IdeActionHandler
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
-import com.maddyhome.idea.vim.undo.VimKeyBasedUndoService
-import com.maddyhome.idea.vim.undo.VimTimestampBasedUndoService
 import java.util.*

@CommandOrMotion(keys = ["<Del>"], modes = [Mode.INSERT])
@@ -41,13 +39,8 @@ internal class VimEditorDown : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CA
    operatorArguments: OperatorArguments
  ): Boolean {
    val undo = injector.undo
-    when (undo) {
-      is VimKeyBasedUndoService -> undo.setMergeUndoKey()
-      is VimTimestampBasedUndoService -> {
-        val nanoTime = System.nanoTime()
-        editor.forEachCaret { undo.endInsertSequence(it, it.offset, nanoTime) }
-      }
-    }
+    val nanoTime = System.nanoTime()
+    editor.forEachCaret { undo.endInsertSequence(it, it.offset, nanoTime) }
    return super.execute(editor, context, cmd, operatorArguments)
  }
 }
@@ -70,13 +63,8 @@ internal class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARE
    operatorArguments: OperatorArguments
  ): Boolean {
    val undo = injector.undo
-    when (undo) {
-      is VimKeyBasedUndoService -> undo.setMergeUndoKey()
-      is VimTimestampBasedUndoService -> {
-        val nanoTime = System.nanoTime()
-        editor.forEachCaret { undo.endInsertSequence(it, it.offset, nanoTime) }
-      }
-    }
+    val nanoTime = System.nanoTime()
+    editor.forEachCaret { undo.endInsertSequence(it, it.offset, nanoTime) }
    return super.execute(editor, context, cmd, operatorArguments)
  }
 }
--- a/src/main/java/com/maddyhome/idea/vim/extension/VimExtension.java
+++ b/src/main/java/com/maddyhome/idea/vim/extension/VimExtension.java
@@ -27,30 +27,6 @@ public interface VimExtension {
    return MappingOwner.Plugin.Companion.get(getName());
  }

-  /**
-   * This method is always called AFTER the full execution of the `.ideavimrc` file.
-   * <p>
-   * During vim initialization process, it firstly loads the .vimrc file, then executes scripts from the plugins folder.
-   * This practically means that the .vimrc file is initialized first; then the plugins are loaded.
-   * See `:h initialization`
-   * <p>
-   * Why does this matter? Because this affects the order of commands are executed. For example,
-   * ```
-   * plug 'tommcdo/vim-exchange'
-   * let g:exchange_no_mappings=1
-   * ```
-   * Here the user will expect that the exchange plugin won't have default mappings. However, if we load vim-exchange
-   *    immediately, this variable won't be initialized at the moment of plugin initialization.
-   * <p>
-   * There is also a tricky case for mappings override:
-   * ```
-   * plug 'tommcdo/vim-exchange'
-   * map X <Plug>(ExchangeLine)
-   * ```
-   * For this case, a plugin with a good implementation detects that there is already a defined mapping for
-   *   `<Plug>(ExchangeLine)` and doesn't register the default cxx mapping. However, such detection requires the mapping
-   *   to be defined before the plugin initialization.
-   */
  void init();

  default void dispose() {
--- a/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionFacade.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionFacade.kt
@@ -188,19 +188,11 @@ object VimExtensionFacade {

  /** Get the current contents of the given register similar to 'getreg()'. */
  @JvmStatic
-  @Deprecated("Please use com.maddyhome.idea.vim.extension.VimExtensionFacade.getRegister(com.maddyhome.idea.vim.api.VimEditor, char)")
  fun getRegister(register: Char): List<KeyStroke>? {
    val reg = VimPlugin.getRegister().getRegister(register) ?: return null
    return reg.keys
  }

-  /** Get the current contents of the given register similar to 'getreg()'. */
-  @JvmStatic
-  fun getRegister(editor: VimEditor, register: Char): List<KeyStroke>? {
-    val reg = VimPlugin.getRegister().getRegister(editor, injector.executionContextManager.getEditorExecutionContext(editor), register) ?: return null
-    return reg.keys
-  }
-
  @JvmStatic
  fun getRegisterForCaret(register: Char, caret: VimCaret): List<KeyStroke>? {
    val reg = caret.registerStorage.getRegister(register) ?: return null
@@ -285,4 +277,4 @@ fun VimExtensionFacade.exportOperatorFunction(name: String, function: OperatorFu

 fun interface ScriptFunction {
  fun execute(editor: VimEditor, context: ExecutionContext, args: Map<String, VimDataType>): ExecutionResult
-}
+}
--- a/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionRegistrar.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/VimExtensionRegistrar.kt
@@ -88,10 +88,29 @@ internal object VimExtensionRegistrar : VimExtensionRegistrator {
  }

  /**
-   * See the docs for [VimExtension.init]
+   * During vim initialization process, it firstly loads the .vimrc file, then executes scripts from the plugins folder.
+   * This practically means that the .vimrc file is initialized first, then the plugins are loaded.
+   * See `:h initialization`
   *
   * In IdeaVim we don't have a separate plugins folder to load it after .ideavimrc load. However, we can collect
   *   the list of plugins mentioned in the .ideavimrc and load them after .ideavimrc execution is finished.
+   *
+   * Why this matters? Because this affects the order of commands are executed. For example:
+   * ```
+   * plug 'tommcdo/vim-exchange'
+   * let g:exchange_no_mappings=1
+   * ```
+   * Here the user will expect that the exchange plugin won't have default mappings. However, if we load vim-exchange
+   *    immediately, this variable won't be initialized at the moment of plugin initialization.
+   *
+   * There is also a tricky case for mappings override:
+   * ```
+   * plug 'tommcdo/vim-exchange'
+   * map X <Plug>(ExchangeLine)
+   * ```
+   * For this case, a plugin with a good implementation detects that there is already a defined mapping for
+   *   `<Plug>(ExchangeLine)` and doesn't register the default cxx mapping. However, such detection requires the mapping
+   *   to be defined before the plugin initialization.
   */
  @JvmStatic
  fun enableDelayedExtensions() {
--- 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 {

@@ -180,8 +184,10 @@ internal class CommentaryExtension : VimExtension {
    override val isRepeatable = true

    override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
+      val command = Command(operatorArguments.count1, CommentaryTextObjectMotionHandler, Command.Type.MOTION, EnumSet.noneOf(CommandFlags::class.java))
+
      val keyState = KeyHandler.getInstance().keyHandlerState
-      keyState.commandBuilder.addAction(CommentaryTextObjectMotionHandler)
+      keyState.commandBuilder.completeCommandPart(Argument(command))
    }
  }

--- a/src/main/java/com/maddyhome/idea/vim/extension/exchange/VimExchangeExtension.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/exchange/VimExchangeExtension.kt
@@ -222,10 +222,10 @@ internal class VimExchangeExtension : VimExtension {
        }
      }

-      val zRegText = getRegister(editor.vim, 'z')
-      val unnRegText = getRegister(editor.vim, '"')
-      val startRegText = getRegister(editor.vim, '*')
-      val plusRegText = getRegister(editor.vim, '+')
+      val zRegText = getRegister('z')
+      val unnRegText = getRegister('"')
+      val startRegText = getRegister('*')
+      val plusRegText = getRegister('+')
      runWriteAction {
        // TODO handle:
        // 	" Compare using =~ because "'==' != 0" returns 0
@@ -299,7 +299,7 @@ internal class VimExchangeExtension : VimExtension {

    private fun getExchange(editor: Editor, isVisual: Boolean, selectionType: SelectionType): Exchange {
      // TODO: improve KeyStroke list to sting conversion
-      fun getRegisterText(reg: Char): String = getRegister(editor.vim, reg)?.map { it.keyChar }?.joinToString("") ?: ""
+      fun getRegisterText(reg: Char): String = getRegister(reg)?.map { it.keyChar }?.joinToString("") ?: ""
      fun getMarks(isVisual: Boolean): Pair<Mark, Mark> {
        val (startMark, endMark) =
          if (isVisual) {
@@ -313,9 +313,9 @@ internal class VimExchangeExtension : VimExtension {
        return Pair(marks.getMark(vimEditor.primaryCaret(), startMark)!!, marks.getMark(vimEditor.primaryCaret(), endMark)!!)
      }

-      val unnRegText = getRegister(editor.vim, '"')
-      val starRegText = getRegister(editor.vim, '*')
-      val plusRegText = getRegister(editor.vim, '+')
+      val unnRegText = getRegister('"')
+      val starRegText = getRegister('*')
+      val plusRegText = getRegister('+')

      val (selectionStart, selectionEnd) = getMarks(isVisual)
      if (isVisual) {
--- a/src/main/java/com/maddyhome/idea/vim/extension/highlightedyank/VimHighlightedYank.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/highlightedyank/VimHighlightedYank.kt
@@ -21,7 +21,10 @@ import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.util.Disposer
 import com.intellij.util.Alarm
 import com.intellij.util.Alarm.ThreadToUse
+import com.jetbrains.rd.util.first
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.ImmutableVimCaret
+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.ModeChangeListener
@@ -45,10 +48,6 @@ private val HIGHLIGHT_DURATION_VARIABLE_NAME = "highlightedyank_highlight_durati

@NonNls
 private val HIGHLIGHT_COLOR_VARIABLE_NAME = "highlightedyank_highlight_color"
-
-@NonNls
-private val HIGHLIGHT_FOREGROUND_COLOR_VARIABLE_NAME = "highlightedyank_highlight_foreground_color"
-
 private var defaultHighlightTextColor: Color? = null

 private fun getDefaultHighlightTextColor(): Color {
@@ -79,9 +78,6 @@ internal class HighlightColorResetter : LafManagerListener {
 * if you want to change background color of highlight you can provide the rgba of the color you want e.g.
 * let g:highlightedyank_highlight_color = "rgba(160, 160, 160, 155)"
 *
- * if you want to change text color of highlight you can provide the rgba of the color you want e.g.
- * let g:highlightedyank_highlight_foreground_color = "rgba(0, 0, 0, 255)"
- *
 * When a new text is yanked or user starts editing, the old highlighting would be deleted.
 */
 internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeListener {
@@ -121,9 +117,9 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis
    initialised = false
  }

-  override fun yankPerformed(editor: VimEditor, range: TextRange) {
+  override fun yankPerformed(caretToRange: Map<ImmutableVimCaret, TextRange>) {
    ensureInitialised()
-    highlightHandler.highlightYankRange(editor.ij, range)
+    highlightHandler.highlightYankRange(caretToRange)
  }

  override fun modeChanged(editor: VimEditor, oldMode: Mode) {
@@ -144,22 +140,25 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis
    private var lastEditor: Editor? = null
    private val highlighters = mutableSetOf<RangeHighlighter>()

-    fun highlightYankRange(editor: Editor, range: TextRange) {
+    fun highlightYankRange(caretToRange: Map<ImmutableVimCaret, TextRange>) {
      // from vim-highlightedyank docs: When a new text is yanked or user starts editing, the old highlighting would be deleted
      clearYankHighlighters()

+      val editor = caretToRange.first().key.editor.ij
      lastEditor = editor

      val attributes = getHighlightTextAttributes(editor)
-      for (i in 0 until range.size()) {
-        val highlighter = editor.markupModel.addRangeHighlighter(
-          range.startOffsets[i],
-          range.endOffsets[i],
-          HighlighterLayer.SELECTION,
-          attributes,
-          HighlighterTargetArea.EXACT_RANGE,
-        )
-        highlighters.add(highlighter)
+      for (range in caretToRange.values) {
+        for (i in 0 until range.size()) {
+          val highlighter = editor.markupModel.addRangeHighlighter(
+            range.startOffsets[i],
+            range.endOffsets[i],
+            HighlighterLayer.SELECTION,
+            attributes,
+            HighlighterTargetArea.EXACT_RANGE,
+          )
+          highlighters.add(highlighter)
+        }
      }

      // from vim-highlightedyank docs: A negative number makes the highlight persistent.
@@ -188,15 +187,13 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis
      highlighters.clear()
    }

-    private fun getHighlightTextAttributes(editor: Editor): TextAttributes {
-      return TextAttributes(
-        extractUserHighlightForegroundColor(),
-        extractUsersHighlightColor(),
-        editor.colorsScheme.getColor(EditorColors.CARET_COLOR),
-        EffectType.SEARCH_MATCH,
-        Font.PLAIN,
-      )
-    }
+    private fun getHighlightTextAttributes(editor: Editor) = TextAttributes(
+      null,
+      extractUsersHighlightColor(),
+      editor.colorsScheme.getColor(EditorColors.CARET_COLOR),
+      EffectType.SEARCH_MATCH,
+      Font.PLAIN,
+    )

    private fun extractUsersHighlightDuration(): Int {
      return extractVariable(HIGHLIGHT_DURATION_VARIABLE_NAME, DEFAULT_HIGHLIGHT_DURATION) {
@@ -209,52 +206,15 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis
    }

    private fun extractUsersHighlightColor(): Color {
-      val value = VimPlugin.getVariableService().getGlobalVariableValue(HIGHLIGHT_COLOR_VARIABLE_NAME)
-      if (value != null) {
-        return try {
-          parseRgbaColor(value.asString())
-        } catch (e: Exception) {
-          @VimNlsSafe val message = MessageHelper.message(
-            "highlightedyank.invalid.value.of.0.1",
-            "g:$HIGHLIGHT_COLOR_VARIABLE_NAME",
-            e.message ?: "",
-          )
-          VimPlugin.showMessage(message)
-          getDefaultHighlightTextColor()
-        }
+      return extractVariable(HIGHLIGHT_COLOR_VARIABLE_NAME, getDefaultHighlightTextColor()) { value ->
+        val rgba = value.asString()
+          .substring(4)
+          .filter { it != '(' && it != ')' && !it.isWhitespace() }
+          .split(',')
+          .map { it.toInt() }
+
+        Color(rgba[0], rgba[1], rgba[2], rgba[3])
      }
-      return getDefaultHighlightTextColor()
-    }
-
-    private fun extractUserHighlightForegroundColor(): Color? {
-      val value = VimPlugin.getVariableService().getGlobalVariableValue(HIGHLIGHT_FOREGROUND_COLOR_VARIABLE_NAME)
-        ?: return null
-
-      return try {
-        parseRgbaColor(value.asString())
-      } catch (e: Exception) {
-        @VimNlsSafe val message = MessageHelper.message(
-          "highlightedyank.invalid.value.of.0.1",
-          "g:$HIGHLIGHT_FOREGROUND_COLOR_VARIABLE_NAME",
-          e.message ?: "",
-        )
-        VimPlugin.showMessage(message)
-        null
-      }
-    }
-
-    private fun parseRgbaColor(colorString: String): Color {
-      val rgba = colorString
-        .substring(4)
-        .filter { it != '(' && it != ')' && !it.isWhitespace() }
-        .split(',')
-        .map { it.toInt() }
-
-      if (rgba.size != 4 || rgba.any { it < 0 || it > 255 }) {
-        throw IllegalArgumentException("Invalid RGBA values. Each component must be between 0 and 255")
-      }
-
-      return Color(rgba[0], rgba[1], rgba[2], rgba[3])
    }

    private fun <T> extractVariable(variable: String, default: T, extractFun: (value: VimDataType) -> T): T {
--- 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))
        }
      }
    }
@@ -230,7 +234,7 @@ private object FileTypePatterns {
    } else if (fileTypeName == "CMakeLists.txt" || fileName == "CMakeLists") {
      this.cMakePatterns
    } else {
-      this.htmlPatterns
+      return null
    }
  }

@@ -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
@@ -42,10 +42,13 @@ import com.maddyhome.idea.vim.extension.VimExtension
 import com.maddyhome.idea.vim.group.KeyGroup
 import com.maddyhome.idea.vim.helper.MessageHelper
 import com.maddyhome.idea.vim.helper.runAfterGotFocus
-import com.maddyhome.idea.vim.key.KeyStrokeTrie
+import com.maddyhome.idea.vim.key.CommandNode
+import com.maddyhome.idea.vim.key.CommandPartNode
 import com.maddyhome.idea.vim.key.MappingOwner
+import com.maddyhome.idea.vim.key.Node
 import com.maddyhome.idea.vim.key.RequiredShortcut
-import com.maddyhome.idea.vim.key.add
+import com.maddyhome.idea.vim.key.RootNode
+import com.maddyhome.idea.vim.key.addLeafs
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString
@@ -195,8 +198,6 @@ internal class NerdTree : VimExtension {
    internal var waitForSearch = false
    internal var speedSearchListenerInstalled = false

-    private val keys = mutableListOf<KeyStroke>()
-
    override fun actionPerformed(e: AnActionEvent) {
      var keyStroke = getKeyStroke(e) ?: return
      val keyChar = keyStroke.keyChar
@@ -204,14 +205,20 @@ internal class NerdTree : VimExtension {
        keyStroke = KeyStroke.getKeyStroke(keyChar)
      }

-      keys.add(keyStroke)
-      actionsRoot.getData(keys)?.let { action ->
-        when (action) {
-          is NerdAction.ToIj -> Util.callAction(null, action.name, e.dataContext.vim)
-          is NerdAction.Code -> e.project?.let { action.action(it, e.dataContext, e) }
-        }
+      val nextNode = currentNode[keyStroke]

-        keys.clear()
+      when (nextNode) {
+        null -> currentNode = actionsRoot
+        is CommandNode<NerdAction> -> {
+          currentNode = actionsRoot
+
+          val action = nextNode.actionHolder
+          when (action) {
+            is NerdAction.ToIj -> Util.callAction(null, action.name, e.dataContext.vim)
+            is NerdAction.Code -> e.project?.let { action.action(it, e.dataContext, e) }
+          }
+        }
+        is CommandPartNode<NerdAction> -> currentNode = nextNode
      }
    }

@@ -533,29 +540,37 @@ private fun addCommand(alias: String, handler: CommandAliasHandler) {
  VimPlugin.getCommand().setAlias(alias, CommandAlias.Call(0, -1, alias, handler))
 }

-private fun registerCommand(variable: String, defaultMapping: String, action: NerdAction) {
+private fun registerCommand(variable: String, default: String, action: NerdAction) {
  val variableValue = VimPlugin.getVariableService().getGlobalVariableValue(variable)
-  val mapping = if (variableValue is VimString) {
+  val mappings = if (variableValue is VimString) {
    variableValue.value
  } else {
-    defaultMapping
+    default
  }
-  registerCommand(mapping, action)
+  actionsRoot.addLeafs(mappings, action)
 }

-private fun registerCommand(mapping: String, action: NerdAction) {
-  actionsRoot.add(mapping, action)
-  injector.parser.parseKeys(mapping).forEach {
-    distinctShortcuts.add(it)
-  }
+private fun registerCommand(default: String, action: NerdAction) {
+  actionsRoot.addLeafs(default, action)
 }

-private val actionsRoot: KeyStrokeTrie<NerdAction> = KeyStrokeTrie<NerdAction>("NERDTree")
-private val distinctShortcuts = mutableSetOf<KeyStroke>()
+
+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.keys.toMutableSet()
+    res += node.values.map { collectShortcuts(it) }.flatten()
+    res
+  } else {
+    emptySet()
+  }
+}

 private fun installDispatcher(project: Project) {
  val dispatcher = NerdTree.NerdDispatcher.getInstance(project)
-  val shortcuts = distinctShortcuts.map { RequiredShortcut(it, MappingOwner.Plugin.get(NerdTree.pluginName)) }
+  val shortcuts =
+    collectShortcuts(actionsRoot).map { RequiredShortcut(it, MappingOwner.Plugin.get(NerdTree.pluginName)) }
  dispatcher.registerCustomShortcutSet(
    KeyGroup.toShortcutSet(shortcuts),
    (ProjectView.getInstance(project) as ProjectViewImpl).component,
--- a/src/main/java/com/maddyhome/idea/vim/extension/paragraphmotion/ParagraphMotion.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/paragraphmotion/ParagraphMotion.kt
@@ -62,7 +62,7 @@ internal class ParagraphMotion : VimExtension {
    toKeys: List<KeyStroke>,
    recursive: Boolean,
  ) {
-    val filteredModes = modes.filterNotTo(HashSet()) { VimPlugin.getKey().getKeyMapping(it).getLayer(fromKeys) != null }
+    val filteredModes = modes.filterNotTo(HashSet()) { VimPlugin.getKey().hasmapfrom(it, fromKeys) }
    putKeyMappingIfMissing(filteredModes, fromKeys, pluginOwner, toKeys, recursive)
  }
 }
--- 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,12 +166,18 @@ 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/sneak/IdeaVimSneakExtension.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/sneak/IdeaVimSneakExtension.kt
@@ -34,7 +34,6 @@ import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMapping
 import com.maddyhome.idea.vim.extension.VimExtensionHandler
 import com.maddyhome.idea.vim.helper.StrictMode
 import com.maddyhome.idea.vim.newapi.ij
-import org.jetbrains.annotations.TestOnly
 import java.awt.Font
 import java.awt.event.KeyEvent
 import java.util.*
@@ -46,26 +45,15 @@ private const val DEFAULT_HIGHLIGHT_DURATION_SNEAK = 300
 // By [Mikhail Levchenko](https://github.com/Mishkun)
 // Original repository with the plugin: https://github.com/Mishkun/ideavim-sneak
 internal class IdeaVimSneakExtension : VimExtension {
-  @Suppress("CompanionObjectInExtension")
-  companion object {
-    private var highlightHandler: HighlightHandler? = null
-
-    @TestOnly
-    internal fun stopTimer() {
-      highlightHandler?.stopExistingTimer()
-    }
-  }
-
  override fun getName(): String = "sneak"

  override fun init() {
-    val _highlightHandler = HighlightHandler()
-    highlightHandler = _highlightHandler
-    mapToFunctionAndProvideKeys("s", SneakHandler(_highlightHandler, Direction.FORWARD), MappingMode.NXO)
+    val highlightHandler = HighlightHandler()
+    mapToFunctionAndProvideKeys("s", SneakHandler(highlightHandler, Direction.FORWARD), MappingMode.NXO)

    // vim-sneak uses `Z` for visual mode because `S` conflict with vim-sneak plugin VIM-3330
-    mapToFunctionAndProvideKeys("S", SneakHandler(_highlightHandler, Direction.BACKWARD), MappingMode.NO)
-    mapToFunctionAndProvideKeys("Z", SneakHandler(_highlightHandler, Direction.BACKWARD), MappingMode.X)
+    mapToFunctionAndProvideKeys("S", SneakHandler(highlightHandler, Direction.BACKWARD), MappingMode.NO)
+    mapToFunctionAndProvideKeys("Z", SneakHandler(highlightHandler, Direction.BACKWARD), MappingMode.X)

    // workaround to support ; and , commands
    mapToFunctionAndProvideKeys("f", SneakMemoryHandler("f"), MappingMode.NXO)
@@ -73,8 +61,8 @@ internal class IdeaVimSneakExtension : VimExtension {
    mapToFunctionAndProvideKeys("t", SneakMemoryHandler("t"), MappingMode.NXO)
    mapToFunctionAndProvideKeys("T", SneakMemoryHandler("T"), MappingMode.NXO)

-    mapToFunctionAndProvideKeys(";", SneakRepeatHandler(_highlightHandler, RepeatDirection.IDENTICAL), MappingMode.NXO)
-    mapToFunctionAndProvideKeys(",", SneakRepeatHandler(_highlightHandler, RepeatDirection.REVERSE), MappingMode.NXO)
+    mapToFunctionAndProvideKeys(";", SneakRepeatHandler(highlightHandler, RepeatDirection.IDENTICAL), MappingMode.NXO)
+    mapToFunctionAndProvideKeys(",", SneakRepeatHandler(highlightHandler, RepeatDirection.REVERSE), MappingMode.NXO)
  }

  private class SneakHandler(
@@ -221,7 +209,6 @@ internal class IdeaVimSneakExtension : VimExtension {
  private class HighlightHandler {
    private var editor: Editor? = null
    private val sneakHighlighters: MutableSet<RangeHighlighter> = mutableSetOf()
-    private var timer: Timer? = null

    fun highlightSneakRange(editor: Editor, range: TextRange) {
      clearAllSneakHighlighters()
@@ -267,19 +254,13 @@ internal class IdeaVimSneakExtension : VimExtension {
    }

    private fun setClearHighlightRangeTimer(highlighter: RangeHighlighter) {
-      stopExistingTimer()
-      timer = Timer(DEFAULT_HIGHLIGHT_DURATION_SNEAK) {
+      val timer = Timer(DEFAULT_HIGHLIGHT_DURATION_SNEAK) {
        if (editor?.isDisposed != true) {
          editor?.markupModel?.removeHighlighter(highlighter)
        }
      }
-      timer?.isRepeats = false
-      timer?.start()
-    }
-
-    fun stopExistingTimer() {
-      timer?.stop()
-      timer?.actionListeners?.forEach { it.actionPerformed(null) }
+      timer.isRepeats = false
+      timer.start()
    }

    private fun getHighlightTextAttributes() = TextAttributes(
@@ -326,7 +307,7 @@ private fun VimExtension.mapToFunctionAndProvideKeys(
    VimPlugin.getKey().hasmapto(it, injector.parser.parseKeys(commandFromOriginalPlugin(keys)))
  }
  val filteredFromModes = mappingModes.filterNotTo(HashSet()) {
-    injector.keyGroup.getKeyMapping(it).getLayer(fromKeys) != null
+    injector.keyGroup.hasmapfrom(it, fromKeys)
  }

  val doubleFiltered = mappingModes
--- a/src/main/java/com/maddyhome/idea/vim/extension/surround/RepeatedCharSequence.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/surround/RepeatedCharSequence.kt
@@ -1,30 +0,0 @@
-package com.maddyhome.idea.vim.extension.surround
-
-import com.intellij.util.text.CharSequenceSubSequence
-
-internal data class RepeatedCharSequence(val text: CharSequence, val count: Int) : CharSequence {
-  override val length = text.length * count
-
-  override fun get(index: Int): Char {
-    if (index < 0 || index >= length) throw IndexOutOfBoundsException()
-    return text[index % text.length]
-  }
-
-  override fun subSequence(startIndex: Int, endIndex: Int): CharSequence {
-    return CharSequenceSubSequence(this, startIndex, endIndex)
-  }
-
-  override fun toString(): String {
-    return text.repeat(count)
-  }
-  
-  companion object {
-    fun of(text: CharSequence, count: Int): CharSequence {
-      return when (count) {
-        0 -> ""
-        1 -> text
-        else -> RepeatedCharSequence(text, count)
-      }
-    }
-  }
-}
--- a/src/main/java/com/maddyhome/idea/vim/extension/surround/VimSurroundExtension.kt
+++ b/src/main/java/com/maddyhome/idea/vim/extension/surround/VimSurroundExtension.kt
@@ -14,7 +14,6 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimCaret
-import com.maddyhome.idea.vim.api.VimChangeGroup
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.endsWithNewLine
 import com.maddyhome.idea.vim.api.getLeadingCharacterOffset
@@ -37,21 +36,18 @@ 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
-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.options.helpers.ClipboardOptionHelper
 import com.maddyhome.idea.vim.put.PutData
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.SelectionType
-import com.maddyhome.idea.vim.state.mode.returnTo
 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.
@@ -84,7 +80,7 @@ internal class VimSurroundExtension : VimExtension {
      putKeyMappingIfMissing(MappingMode.XO, injector.parser.parseKeys("S"), owner, injector.parser.parseKeys("<Plug>VSurround"), true)
    }

-    VimExtensionFacade.exportOperatorFunction(OPERATOR_FUNC, Operator(supportsMultipleCursors = false, count = 1)) // TODO
+    VimExtensionFacade.exportOperatorFunction(OPERATOR_FUNC, Operator())
  }

  private class YSurroundHandler : ExtensionHandler {
@@ -112,7 +108,7 @@ internal class VimSurroundExtension : VimExtension {
        val lastNonWhiteSpaceOffset = getLastNonWhitespaceCharacterOffset(editor.text(), lineStartOffset, lineEndOffset)
        if (lastNonWhiteSpaceOffset != null) {
          val range = TextRange(lineStartOffset, lastNonWhiteSpaceOffset + 1)
-          performSurround(pair, range, it, count = operatorArguments.count1)
+          performSurround(pair, range, it)
        }
 //        it.moveToOffset(lineStartOffset)
      }
@@ -135,13 +131,15 @@ internal class VimSurroundExtension : VimExtension {

  private class VSurroundHandler : ExtensionHandler {
    override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
+      val selectionStart = editor.ij.caretModel.primaryCaret.selectionStart
      // NB: Operator ignores SelectionType anyway
-      if (!Operator(supportsMultipleCursors = true, count = operatorArguments.count1).apply(editor, context, editor.mode.selectionType)) {
+      if (!Operator().apply(editor, context, editor.mode.selectionType)) {
        return
      }
      runWriteAction {
        // Leave visual mode
        editor.exitVisualMode()
+        editor.ij.caretModel.moveToOffset(selectionStart)
      }
    }
  }
@@ -161,17 +159,13 @@ internal class VimSurroundExtension : VimExtension {
    }

    companion object {
-      fun change(editor: VimEditor, context: ExecutionContext, charFrom: Char, newSurround: SurroundPair?) {
-        editor.ij.runWithEveryCaretAndRestore { changeAtCaret(editor, context, charFrom, newSurround) }
-      }
-      
-      fun changeAtCaret(editor: VimEditor, context: ExecutionContext, charFrom: Char, newSurround: SurroundPair?) {
+      fun change(editor: VimEditor, context: ExecutionContext, charFrom: Char, newSurround: Pair<String, String>?) {
        // Save old register values for carets
        val surroundings = editor.sortedCarets()
          .map {
            val oldValue: List<KeyStroke>? = getRegisterForCaret(REGISTER, it)
            setRegisterForCaret(REGISTER, it, null)
-            SurroundingInfo(it, null, oldValue, false)
+            SurroundingInfo(it, null, oldValue)
          }

        // Delete surrounding's content
@@ -187,25 +181,21 @@ internal class VimSurroundExtension : VimExtension {
          }

          val registerValue = getRegisterForCaret(REGISTER, it.caret)
-          val innerValue = if (registerValue.isNullOrEmpty()) emptyList() else registerValue
+          val innerValue = if (registerValue.isNullOrEmpty()) null else registerValue
          it.innerText = innerValue
+        }

-          // Valid surroundings are only those that:
-          // - are validly wrapping with surround characters (i.e. parenthesis, brackets, tags, quotes, etc.);
-          // - or have non-empty inner text (e.g. when we are surrounding words: `csw"`)
-          if (currentSurrounding != null || innerValue.isNotEmpty()) {
-            it.isValidSurrounding = true
+        surroundings.forEach {
+          if (it.innerText == null && getRegisterForCaret(REGISTER, it.caret)?.isNotEmpty() == true) {
+            it.innerText = emptyList()
          }
        }

        surroundings
-          .filter { it.isValidSurrounding } // we do nothing with carets that are not inside the surrounding
+          .filter { it.innerText != null } // we do nothing with carets that are not inside the surrounding
          .map { surrounding ->
            val innerValue = injector.parser.toPrintableString(surrounding.innerText!!)
-            val text = newSurround?.let {
-              val trimmedValue = if (newSurround.shouldTrim) innerValue.trim() else innerValue
-              it.first + trimmedValue + it.second
-            } ?: innerValue
+            val text = newSurround?.let { it.first + innerValue + it.second } ?: innerValue
            val textData = PutData.TextData(text, SelectionType.CHARACTER_WISE, emptyList(), null)
            val putData = PutData(textData, null, 1, insertTextBeforeCaret = true, rawIndent = true, caretAfterInsertedText = false)

@@ -258,7 +248,7 @@ internal class VimSurroundExtension : VimExtension {
    }
  }

-  private data class SurroundingInfo(val caret: VimCaret, var innerText: List<KeyStroke>?, val oldRegisterContent: List<KeyStroke>?, var isValidSurrounding: Boolean) {
+  private data class SurroundingInfo(val caret: VimCaret, var innerText: List<KeyStroke>?, val oldRegisterContent: List<KeyStroke>?) {
    fun restoreRegister() {
      setRegisterForCaret(REGISTER, caret, oldRegisterContent)
    }
@@ -277,40 +267,19 @@ internal class VimSurroundExtension : VimExtension {
    }
  }

-  private class Operator(private val supportsMultipleCursors: Boolean, private val count: Int) : OperatorFunction {
-    override fun apply(vimEditor: VimEditor, context: ExecutionContext, selectionType: SelectionType?): Boolean {
-      val ijEditor = vimEditor.ij
+  private class Operator : OperatorFunction {
+    override fun apply(editor: VimEditor, context: ExecutionContext, selectionType: SelectionType?): Boolean {
+      val ijEditor = editor.ij
      val c = getChar(ijEditor)
      if (c.code == 0) return true

      val pair = getOrInputPair(c, ijEditor, context.ij) ?: return false
-
-      runWriteAction {
-        val change = VimPlugin.getChange()
-        if (supportsMultipleCursors) {
-          ijEditor.runWithEveryCaretAndRestore {
-            applyOnce(ijEditor, change, pair, count)
-          }
-        }
-        else {
-          applyOnce(ijEditor, change, pair, count)
-          // Jump back to start
-          executeNormalWithoutMapping(injector.parser.parseKeys("`["), ijEditor)
-        }
-      }
-      return true
-    }
-    
-    private fun applyOnce(editor: Editor, change: VimChangeGroup, pair: SurroundPair, count: Int) {
      // XXX: Will it work with line-wise or block-wise selections?
-      val primaryCaret = editor.caretModel.primaryCaret
-      val range = getSurroundRange(primaryCaret.vim)
-      if (range != null) {
-        val start = RepeatedCharSequence.of(pair.first, count)
-        val end = RepeatedCharSequence.of(pair.second, count)
-        change.insertText(IjVimEditor(editor), IjVimCaret(primaryCaret), range.startOffset, start)
-        change.insertText(IjVimEditor(editor), IjVimCaret(primaryCaret), range.endOffset + start.length, end)
-      }
+      val range = getSurroundRange(editor.currentCaret()) ?: return false
+      performSurround(pair, range, editor.currentCaret(), selectionType == SelectionType.LINE_WISE)
+      // Jump back to start
+      executeNormalWithoutMapping(injector.parser.parseKeys("`["), ijEditor)
+      return true
    }

    private fun getSurroundRange(caret: VimCaret): TextRange? {
@@ -333,35 +302,33 @@ private const val REGISTER = '"'

 private const val OPERATOR_FUNC = "SurroundOperatorFunc"

-private val tagNameAndAttributesCapturePattern = "(\\S+)([^>]*)>".toPattern()
-
-private data class SurroundPair(val first: String, val second: String, val shouldTrim: Boolean)
+    private val tagNameAndAttributesCapturePattern = "(\\S+)([^>]*)>".toPattern()

 private val SURROUND_PAIRS = mapOf(
-  'b' to SurroundPair("(", ")", false),
-  '(' to SurroundPair("( ", " )", false),
-  ')' to SurroundPair("(", ")", true),
-  'B' to SurroundPair("{", "}", false),
-  '{' to SurroundPair("{ ", " }", false),
-  '}' to SurroundPair("{", "}", true),
-  'r' to SurroundPair("[", "]", false),
-  '[' to SurroundPair("[ ", " ]", false),
-  ']' to SurroundPair("[", "]", true),
-  'a' to SurroundPair("<", ">", false),
-  '>' to SurroundPair("<", ">", false),
-  's' to SurroundPair(" ", "", false),
+  'b' to ("(" to ")"),
+  '(' to ("( " to " )"),
+  ')' to ("(" to ")"),
+  'B' to ("{" to "}"),
+  '{' to ("{ " to " }"),
+  '}' to ("{" to "}"),
+  'r' to ("[" to "]"),
+  '[' to ("[ " to " ]"),
+  ']' to ("[" to "]"),
+  'a' to ("<" to ">"),
+  '>' to ("<" to ">"),
+  's' to (" " to ""),
 )

-private fun getSurroundPair(c: Char): SurroundPair? = if (c in SURROUND_PAIRS) {
+private fun getSurroundPair(c: Char): Pair<String, String>? = if (c in SURROUND_PAIRS) {
  SURROUND_PAIRS[c]
 } else if (!c.isLetter()) {
  val s = c.toString()
-  SurroundPair(s, s, false)
+  s to s
 } else {
  null
 }

-private fun inputTagPair(editor: Editor, context: DataContext): SurroundPair? {
+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()
@@ -370,7 +337,7 @@ private fun inputTagPair(editor: Editor, context: DataContext): SurroundPair? {
  return if (matcher.find()) {
    val tagName = matcher.group(1)
    val tagAttributes = matcher.group(2)
-    SurroundPair("<$tagName$tagAttributes>", "</$tagName>", false)
+    "<$tagName$tagAttributes>" to "</$tagName>"
  } else {
    null
  }
@@ -380,20 +347,16 @@ private fun inputFunctionName(
  editor: Editor,
  context: DataContext,
  withInternalSpaces: Boolean,
-): SurroundPair? {
+): 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) {
-    SurroundPair("$functionNameInput( ", " )", false)
-  } else {
-    SurroundPair("$functionNameInput(", ")", false)
-  }
+  return if (withInternalSpaces) "$functionNameInput( " to " )" else "$functionNameInput(" to ")"
 }

-private fun getOrInputPair(c: Char, editor: Editor, context: DataContext): SurroundPair? = when (c) {
+private fun getOrInputPair(c: Char, editor: Editor, context: DataContext): Pair<String, String>? = when (c) {
  '<', 't' -> inputTagPair(editor, context)
  'f' -> inputFunctionName(editor, context, false)
  'F' -> inputFunctionName(editor, context, true)
@@ -412,15 +375,15 @@ private fun getChar(editor: Editor): Char {
  return res
 }

-private fun performSurround(pair: SurroundPair, range: TextRange, caret: VimCaret, count: Int, tagsOnNewLines: Boolean = false) {
+private fun performSurround(pair: Pair<String, String>, range: TextRange, caret: VimCaret, tagsOnNewLines: Boolean = false) {
  runWriteAction {
    val editor = caret.editor
    val change = VimPlugin.getChange()
-    val leftSurround = RepeatedCharSequence.of(pair.first + if (tagsOnNewLines) "\n" else "", count)
+    val leftSurround = pair.first + if (tagsOnNewLines) "\n" else ""

    val isEOF = range.endOffset == editor.text().length
    val hasNewLine = editor.endsWithNewLine()
-    val rightSurround = (if (tagsOnNewLines) {
+    val rightSurround = if (tagsOnNewLines) {
      if (isEOF && !hasNewLine) {
        "\n" + pair.second
      } else {
@@ -428,7 +391,7 @@ private fun performSurround(pair: SurroundPair, range: TextRange, caret: VimCare
      }
    } else {
      pair.second
-    }).let { RepeatedCharSequence.of(it, count) }
+    }

    change.insertText(editor, caret, range.startOffset, leftSurround)
    change.insertText(editor, caret, range.endOffset + leftSurround.length, rightSurround)
--- 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
@@ -36,12 +36,10 @@ import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.key.KeyHandlerKeeper.Companion.getInstance
 import com.maddyhome.idea.vim.listener.VimInsertListener
 import com.maddyhome.idea.vim.newapi.IjVimCaret
-import com.maddyhome.idea.vim.newapi.IjVimCopiedText
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.state.mode.Mode
-import com.maddyhome.idea.vim.undo.VimKeyBasedUndoService
-import com.maddyhome.idea.vim.undo.VimTimestampBasedUndoService
+import kotlin.math.min

 /**
 * Provides all the insert/replace related functionality
@@ -64,15 +62,9 @@ class ChangeGroup : VimChangeGroupBase() {
    val editor = (vimEditor as IjVimEditor).editor
    val ijContext = context.ij
    val doc = vimEditor.editor.document
-
    val undo = injector.undo
-    when (undo) {
-      is VimKeyBasedUndoService -> undo.setInsertNonMergeUndoKey()
-      is VimTimestampBasedUndoService -> {
-        val nanoTime = System.nanoTime()
-        vimEditor.forEachCaret { undo.startInsertSequence(it, it.offset, nanoTime) }
-      }
-    }
+    val nanoTime = System.nanoTime()
+    vimEditor.forEachCaret { undo.startInsertSequence(it, it.offset, nanoTime) }
    CommandProcessor.getInstance().executeCommand(
      editor.project, {
        ApplicationManager.getApplication()
@@ -138,17 +130,16 @@ class ChangeGroup : VimChangeGroupBase() {
    context: ExecutionContext,
    range: TextRange,
  ) {
-    val startPos = editor.offsetToBufferPosition(caret.offset)
    val startOffset = editor.getLineStartForOffset(range.startOffset)
    val endOffset = editor.getLineEndForOffset(range.endOffset)
    val ijEditor = (editor as IjVimEditor).editor

    // FIXME: Here we do selection, and it is not a good idea, because it updates primary selection in Linux
    // FIXME: I'll leave here a dirty fix that restores primary selection, but it would be better to rewrite this method
-    var copiedText: IjVimCopiedText? = null
+    var primaryTextAndTransferableData: Pair<String, List<Any>?>? = null
    try {
      if (injector.registerGroup.isPrimaryRegisterSupported()) {
-        copiedText = injector.clipboardManager.getPrimaryContent(editor, context) as IjVimCopiedText
+        primaryTextAndTransferableData = injector.clipboardManager.getPrimaryTextAndTransferableData()
      }
    } catch (e: Exception) {
      // FIXME: [isPrimaryRegisterSupported()] is not implemented perfectly, so there might be thrown an exception after trying to access the primary selection
@@ -163,7 +154,11 @@ class ChangeGroup : VimChangeGroupBase() {
      }
    }
    val afterAction = {
-      caret.moveToOffset(injector.motion.moveCaretToLineStartSkipLeading(editor, startPos.line))
+      val firstLine = editor.offsetToBufferPosition(
+        min(startOffset.toDouble(), endOffset.toDouble()).toInt()
+      ).line
+      val newOffset = injector.motion.moveCaretToLineStartSkipLeading(editor, firstLine)
+      caret.moveToOffset(newOffset)
      restoreCursor(editor, caret, (caret as IjVimCaret).caret.logicalPosition.line)
    }
    if (project != null) {
@@ -174,8 +169,12 @@ class ChangeGroup : VimChangeGroupBase() {
      afterAction.invoke()
    }
    try {
-      if (copiedText != null) {
-        injector.clipboardManager.setPrimaryContent(editor, context, copiedText)
+      if (primaryTextAndTransferableData != null) {
+        injector.clipboardManager.setPrimaryText(
+          primaryTextAndTransferableData.first,
+          primaryTextAndTransferableData.first,
+          primaryTextAndTransferableData.second ?: emptyList()
+        )
      }
    } catch (e: Exception) {
      // FIXME: [isPrimaryRegisterSupported()] is not implemented perfectly, so there might be thrown an exception after trying to access the primary selection
--- a/src/main/java/com/maddyhome/idea/vim/group/DigraphGroup.java
+++ b/src/main/java/com/maddyhome/idea/vim/group/DigraphGroup.java
@@ -0,0 +1,83 @@
+/*
+ * 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.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) {
+    int width = EditorHelper.getApproximateScreenWidth(((IjVimEditor) editor).getEditor());
+    if (width < 10) {
+      width = 80;
+    }
+    int colCount = width / 12;
+    int height = (int)Math.ceil((double) getDigraphs().size() / (double)colCount);
+
+    if (logger.isDebugEnabled()) {
+      logger.debug("width=" + width);
+      logger.debug("colCount=" + colCount);
+      logger.debug("height=" + height);
+    }
+
+    StringBuilder res = new StringBuilder();
+    int cnt = 0;
+    for (Character code : getKeys().keySet()) {
+      String key = getKeys().get(code);
+
+      res.append(key);
+      res.append(' ');
+      if (code < 32) {
+        res.append('^');
+        res.append((char)(code + '@'));
+      }
+      else if (code >= 128 && code <= 159) {
+        res.append('~');
+        res.append((char)(code - 128 + '@'));
+      }
+      else {
+        res.append(code);
+        res.append(' ');
+      }
+      res.append(' ');
+      if (code < 0x1000) {
+        res.append('0');
+      }
+      if (code < 0x100) {
+        res.append('0');
+      }
+      if (code < 0x10) {
+        res.append('0');
+      }
+      res.append(Integer.toHexString(code));
+      res.append("  ");
+
+      cnt++;
+      if (cnt == colCount) {
+        res.append('\n');
+        cnt = 0;
+      }
+    }
+
+    VimOutputPanel output = injector.getOutputPanel().getOrCreate(editor, injector.getExecutionContextManager().getEditorExecutionContext(editor));
+    output.addText(res.toString(), true );
+    output.show();
+  }
+
+  private static final Logger logger = Logger.getInstance(DigraphGroup.class.getName());
+}
--- a/src/main/java/com/maddyhome/idea/vim/group/FileGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/FileGroup.kt
@@ -42,6 +42,7 @@ import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.execute
 import com.maddyhome.idea.vim.newapi.globalIjOptions
+import com.maddyhome.idea.vim.state.VimStateMachine.Companion.getInstance
 import com.maddyhome.idea.vim.state.mode.Mode.VISUAL
 import java.io.File
 import java.util.*
--- a/src/main/java/com/maddyhome/idea/vim/group/IjOptions.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/IjOptions.kt
@@ -139,7 +139,7 @@ object IjOptions {
  // Temporary feature flags during development, not really intended for external use
  val closenotebooks: ToggleOption = addOption(ToggleOption("closenotebooks", GLOBAL, "closenotebooks", true, isHidden = true))
  val commandOrMotionAnnotation: ToggleOption = addOption(ToggleOption("commandormotionannotation", GLOBAL, "commandormotionannotation", true, isHidden = true))
-  val oldundo: ToggleOption = addOption(ToggleOption("oldundo", GLOBAL, "oldundo", true, isHidden = true))
+  val oldundo: ToggleOption = addOption(ToggleOption("oldundo", GLOBAL, "oldundo", false, isHidden = true))
  val unifyjumps: ToggleOption = addOption(ToggleOption("unifyjumps", GLOBAL, "unifyjumps", true, isHidden = true))
  val vimscriptFunctionAnnotation: ToggleOption = addOption(ToggleOption("vimscriptfunctionannotation", GLOBAL, "vimscriptfunctionannotation", true, isHidden = true))

--- a/src/main/java/com/maddyhome/idea/vim/group/KeyGroup.java
+++ b/src/main/java/com/maddyhome/idea/vim/group/KeyGroup.java
@@ -8,6 +8,7 @@

 package com.maddyhome.idea.vim.group;

+import com.google.common.collect.ImmutableList;
 import com.intellij.codeInsight.lookup.impl.LookupImpl;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx;
@@ -16,16 +17,18 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.keymap.ex.KeymapManagerEx;
-import com.intellij.util.containers.MultiMap;
 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.command.MappingMode;
+import com.maddyhome.idea.vim.ex.ExOutputModel;
 import com.maddyhome.idea.vim.key.*;
 import com.maddyhome.idea.vim.newapi.IjNativeAction;
 import com.maddyhome.idea.vim.newapi.IjVimEditor;
@@ -55,6 +58,8 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
  private static final @NonNls String OWNER_ATTRIBUTE = "owner";
  private static final String TEXT_ELEMENT = "text";

+  private static final Logger logger = Logger.getInstance(KeyGroup.class);
+
  public void registerRequiredShortcutKeys(@NotNull VimEditor editor) {
    EventFacade.getInstance()
      .registerCustomShortcutSet(VimShortcutKeyAction.getInstance(), toShortcutSet(getRequiredShortcutKeys()),
@@ -194,7 +199,8 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
      registerRequiredShortcut(keyStrokes, MappingOwner.IdeaVim.System.INSTANCE);

      for (MappingMode mappingMode : command.getModes()) {
-        getBuiltinCommandsTrie(mappingMode).add(keyStrokes, command);
+        Node<LazyVimCommand> node = getKeyRoot(mappingMode);
+        NodesKt.addLeafs(node, keyStrokes, command);
      }
    }
  }
@@ -219,79 +225,53 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
    return new CustomShortcutSet(shortcuts.toArray(new Shortcut[0]));
  }

-  private static @NotNull List<Pair<Set<MappingMode>, MappingInfo>> getKeyMappingRows(@NotNull Set<? extends MappingMode> modes,
-                                                                                      @NotNull List<? extends KeyStroke> prefix) {
-    // Some map commands set a mapping for more than one mode (e.g. `map` sets for Normal, Visual, Select and
-    // Op-pending). Vim treats this as a single mapping, and when listing all maps only lists it once, with the
-    // appropriate mode indicator(s) in the first column (NVO is a space char). If the lhs mapping is changed or cleared
-    // for one of the modes, the original mapping is still a single map for the remaining modes, and the indicator
-    // changes. E.g. `map foo bar` followed by `sunmap foo` would result in `nox foo bar` in the output to `map`.
-    // Vim doesn't do automatic grouping - `nmap foo bar` followed by `omap foo bar` and `vmap foo bar` would result in
-    // 3 lines in the output to `map` - one for `n`, one for `o` and one for `v`.
-    // We store mappings separately per mode (to simplify lookup, especially when matching prefixes), but want to have
-    // the same behaviour as Vim in map output. So we store the original modes with the mapping and check they're still
-    // valid as we collect output
-    final List<Pair<Set<MappingMode>, MappingInfo>> rows = new ArrayList<>();
-    final MultiMap<List<? extends KeyStroke>, Set<MappingMode>> multiModeMappings = MultiMap.create();
-    final List<KeyStroke> fromKeys = new ArrayList<>();
-
+  private static @NotNull List<Pair<EnumSet<MappingMode>, MappingInfo>> getKeyMappingRows(@NotNull Set<? extends MappingMode> modes) {
+    final Map<ImmutableList<KeyStroke>, EnumSet<MappingMode>> actualModes = new HashMap<>();
    for (MappingMode mode : modes) {
      final KeyMapping mapping = VimPlugin.getKey().getKeyMapping(mode);
-
-      final Iterator<KeyMappingEntry> iterator = mapping.getAll(prefix).iterator();
-      while (iterator.hasNext()) {
-        final KeyMappingEntry entry = iterator.next();
-        final MappingInfo mappingInfo = entry.getMappingInfo();
-
-        final Set<@NotNull MappingMode> originalModes = mappingInfo.getOriginalModes();
-        if (originalModes.size() == 1) {
-          rows.add(new Pair<>(originalModes, mappingInfo));
+      for (List<? extends KeyStroke> fromKeys : mapping) {
+        final ImmutableList<KeyStroke> key = ImmutableList.copyOf(fromKeys);
+        final EnumSet<MappingMode> value = actualModes.get(key);
+        final EnumSet<MappingMode> newValue;
+        if (value != null) {
+          newValue = value.clone();
+          newValue.add(mode);
        }
        else {
-          entry.collectPath(fromKeys);
-          if (!multiModeMappings.get(fromKeys).contains(originalModes)) {
-            multiModeMappings.putValue(new ArrayList<>(fromKeys), originalModes);
-            rows.add(new Pair<>(getModesForMapping(fromKeys, originalModes), mappingInfo));
-          }
+          newValue = EnumSet.of(mode);
+        }
+        actualModes.put(key, newValue);
+      }
+    }
+    final List<Pair<EnumSet<MappingMode>, MappingInfo>> rows = new ArrayList<>();
+    for (Map.Entry<ImmutableList<KeyStroke>, EnumSet<MappingMode>> entry : actualModes.entrySet()) {
+      final ArrayList<KeyStroke> fromKeys = new ArrayList<>(entry.getKey());
+      final EnumSet<MappingMode> mappingModes = entry.getValue();
+      if (!mappingModes.isEmpty()) {
+        final MappingMode mode = mappingModes.iterator().next();
+        final KeyMapping mapping = VimPlugin.getKey().getKeyMapping(mode);
+        final MappingInfo mappingInfo = mapping.get(fromKeys);
+        if (mappingInfo != null) {
+          rows.add(new Pair<>(mappingModes, mappingInfo));
        }
      }
    }
-    rows.sort(Comparator.comparing(Pair<Set<MappingMode>, MappingInfo>::getSecond));
+    rows.sort(Comparator.comparing(Pair<EnumSet<MappingMode>, MappingInfo>::getSecond));
    return rows;
  }

-  private static @NotNull Set<MappingMode> getModesForMapping(@NotNull List<? extends KeyStroke> keyStrokes,
-                                                              @NotNull Set<MappingMode> originalMappingModes) {
-    final Set<MappingMode> actualModes = EnumSet.noneOf(MappingMode.class);
-    for (MappingMode mode : originalMappingModes) {
-      final MappingInfo mappingInfo = VimPlugin.getKey().getKeyMapping(mode).get(keyStrokes);
-      if (mappingInfo != null && mappingInfo.getOriginalModes() == originalMappingModes) {
-        actualModes.add(mode);
-      }
-    }
-    return actualModes;
-  }
-
  private static @NotNull @NonNls String getModesStringCode(@NotNull Set<MappingMode> modes) {
-    if (modes.equals(MappingMode.IC)) return "!";
-    if (modes.equals(MappingMode.NVO)) return " ";
-    if (modes.equals(MappingMode.C)) return "c";
-    if (modes.equals(MappingMode.I)) return "i";
-    //if (modes.equals(MappingMode.L)) return "l";
-
-    // The following modes are concatenated
-    String mode = "";
-    if (modes.containsAll(MappingMode.N)) mode += "n";
-    if (modes.containsAll(MappingMode.O)) mode += "o";
-
-    if (modes.containsAll(MappingMode.V)) {
-      mode += "v";
+    if (modes.equals(MappingMode.NVO)) {
+      return "";
    }
-    else {
-      if (modes.containsAll(MappingMode.X)) mode += "x";
-      if (modes.containsAll(MappingMode.S)) mode += "s";
+    else if (modes.contains(MappingMode.INSERT)) {
+      return "i";
    }
-    return mode;
+    else if (modes.contains(MappingMode.NORMAL)) {
+      return "n";
+    }
+    // TODO: Add more codes
+    return "";
  }

  private @NotNull List<AnAction> getActions(@NotNull Component component, @NotNull KeyStroke keyStroke) {
@@ -355,20 +335,20 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
  }

  @Override
-  public boolean showKeyMappings(@NotNull Set<? extends MappingMode> modes, @NotNull List<? extends KeyStroke> prefix, @NotNull VimEditor editor) {
-    List<Pair<Set<MappingMode>, MappingInfo>> rows = getKeyMappingRows(modes, prefix);
-
+  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<Set<MappingMode>, MappingInfo> row : rows) {
+    for (Pair<EnumSet<MappingMode>, MappingInfo> row : rows) {
      MappingInfo mappingInfo = row.getSecond();
-      builder.append(StringsKt.padEnd(getModesStringCode(row.getFirst()), 3, ' '));
-      builder.append(StringsKt.padEnd(VimInjectorKt.getInjector().getParser().toKeyNotation(mappingInfo.getFromKeys()) + " ", 12, ' '));
-      builder.append(mappingInfo.isRecursive() ? " " : "*");  // Or `&` if script-local mappings being recursive
-      builder.append(" ");  // Should be `@` if it's a buffer-local mapping
+      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();
--- a/src/main/java/com/maddyhome/idea/vim/group/MacroAutoImport.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/MacroAutoImport.kt
@@ -1,68 +0,0 @@
-package com.maddyhome.idea.vim.group
-
-import com.intellij.codeInsight.daemon.ReferenceImporter
-import com.intellij.openapi.actionSystem.CommonDataKeys
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.ReadAction
-import com.intellij.openapi.command.WriteCommandAction
-import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.fileEditor.FileDocumentManager
-import com.intellij.openapi.progress.ProgressIndicator
-import com.intellij.openapi.progress.ProgressManager
-import com.intellij.openapi.progress.Task
-import com.intellij.psi.PsiDocumentManager
-import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiRecursiveElementWalkingVisitor
-import java.util.function.BooleanSupplier
-
-internal object MacroAutoImport {
-  fun run(editor: Editor, dataContext: DataContext) {
-    val project = CommonDataKeys.PROJECT.getData(dataContext) ?: return
-    val file = PsiDocumentManager.getInstance(project).getPsiFile(editor.document) ?: return
-
-    if (!FileDocumentManager.getInstance().requestWriting(editor.document, project)) {
-      return
-    }
-
-    val importers = ReferenceImporter.EP_NAME.extensionList
-    if (importers.isEmpty()) {
-      return
-    }
-
-    ProgressManager.getInstance().run(object : Task.Backgroundable(project, "Auto import", true) {
-      override fun run(indicator: ProgressIndicator) {
-        val fixes = ReadAction.nonBlocking<List<BooleanSupplier>> {
-          val fixes = mutableListOf<BooleanSupplier>()
-
-          file.accept(object : PsiRecursiveElementWalkingVisitor() {
-            override fun visitElement(element: PsiElement) {
-              for (reference in element.references) {
-                if (reference.resolve() != null) {
-                  continue
-                }
-                for (importer in importers) {
-                  importer.computeAutoImportAtOffset(editor, file, element.textRange.startOffset, true)
-                    ?.let(fixes::add)
-                }
-              }
-              super.visitElement(element)
-            }
-          })
-
-          return@nonBlocking fixes
-        }.executeSynchronously()
-
-        ApplicationManager.getApplication().invokeAndWait {
-          WriteCommandAction.writeCommandAction(project)
-            .withName("Auto Import")
-            .withGroupId("IdeaVimAutoImportAfterMacro")
-            .shouldRecordActionForActiveDocument(true)
-            .run<RuntimeException> {
-              fixes.forEach { it.asBoolean }
-            }
-        }
-      }
-    })
-  }
-}
--- a/src/main/java/com/maddyhome/idea/vim/group/MacroGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/MacroGroup.kt
@@ -22,7 +22,6 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.MessageHelper.message
 import com.maddyhome.idea.vim.macro.VimMacroBase
 import com.maddyhome.idea.vim.newapi.IjVimEditor
-import com.maddyhome.idea.vim.newapi.ij

 /**
 * Used to handle playback of macros
@@ -94,9 +93,6 @@ internal class MacroGroup : VimMacroBase() {
        } finally {
          keyStack.removeFirst()
        }
-        if (!isInternalMacro) {
-          MacroAutoImport.run(editor.ij, context.ij)
-        }
      }

      if (isInternalMacro) {
--- 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
@@ -193,16 +193,21 @@ internal class MotionGroup : VimMotionGroupBase() {
      argument: Argument,
      operatorArguments: OperatorArguments,
    ): TextRange? {
-      if (argument !is Argument.Motion) {
-        throw RuntimeException("Unexpected argument passed to getMotionRange2: $argument")
-      }
-
      var start: Int
      var end: Int
+      if (argument.type === Argument.Type.OFFSETS) {
+        val offsets = argument.offsets[caret.vim] ?: return null
+        val (first, second) = offsets.getNativeStartAndEnd()
+        start = first
+        end = second
+      } else {
+        val cmd = argument.motion
+        // Normalize the counts between the command and the motion argument
+        val cnt = cmd.count * operatorArguments.count1
+        val raw = if (operatorArguments.count0 == 0 && cmd.rawCount == 0) 0 else cnt
+        if (cmd.action is MotionActionHandler) {
+          val action = cmd.action as MotionActionHandler

-      val action = argument.motion
-      when (action) {
-        is MotionActionHandler -> {
          // This is where we are now
          start = caret.offset

@@ -211,8 +216,8 @@ internal class MotionGroup : VimMotionGroupBase() {
            editor.vim,
            caret.vim,
            IjEditorExecutionContext(context!!),
-            argument.argument,
-            operatorArguments
+            cmd.argument,
+            operatorArguments.withCount0(raw),
          )

          // Invalid motion
@@ -228,32 +233,22 @@ internal class MotionGroup : VimMotionGroupBase() {
              end++
            }
          }
-        }
-
-        is TextObjectActionHandler -> {
-          val range = action.getRange(
-            editor.vim,
-            caret.vim,
-            IjEditorExecutionContext(context!!),
-            operatorArguments.count1,
-            operatorArguments.count0
-          ) ?: return null
+        } else if (cmd.action is TextObjectActionHandler) {
+          val action = cmd.action as TextObjectActionHandler
+          val range =
+            action.getRange(editor.vim, caret.vim, IjEditorExecutionContext(context!!), cnt, raw) ?: return null
          start = range.startOffset
          end = range.endOffset
-          if (argument.isLinewiseMotion()) end--
+          if (cmd.isLinewiseMotion()) end--
+        } else {
+          throw RuntimeException(
+            "Commands doesn't take " + cmd.action.javaClass.simpleName + " as an operator",
+          )
        }
-
-        is ExternalActionHandler -> {
-          val range = action.getRange(caret.vim) ?: return null
-          start = range.startOffset
-          end = range.endOffset
-        }
-
-        else -> throw RuntimeException("Commands doesn't take " + action.javaClass.simpleName + " as an operator")
      }

      // This is a kludge for dw, dW, and d[w. Without this kludge, an extra newline is operated when it shouldn't be.
-      val id = argument.motion.id
+      val id = argument.motion.action.id
      if (id == VimChangeGroupBase.VIM_MOTION_WORD_RIGHT || id == VimChangeGroupBase.VIM_MOTION_BIG_WORD_RIGHT || id == VimChangeGroupBase.VIM_MOTION_CAMEL_RIGHT) {
        val text = editor.document.charsSequence.subSequence(start, end).toString()
        val lastNewLine = text.lastIndexOf('\n')
@@ -263,7 +258,6 @@ internal class MotionGroup : VimMotionGroupBase() {
          }
        }
      }
-
      return TextRange(start, end)
    }

--- a/src/main/java/com/maddyhome/idea/vim/group/OptionGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/OptionGroup.kt
@@ -12,7 +12,6 @@ import com.intellij.application.options.CodeStyle
 import com.intellij.codeStyle.AbstractConvertLineSeparatorsAction
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorKind
 import com.intellij.openapi.editor.EditorSettings.LineNumerationType
 import com.intellij.openapi.editor.ScrollPositionCalculator
@@ -20,6 +19,8 @@ import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.editor.ex.EditorSettingsExternalizable
 import com.intellij.openapi.editor.impl.softwrap.SoftWrapAppliancePlaces
 import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.fileEditor.FileEditorManagerEvent
+import com.intellij.openapi.fileEditor.TextEditor
 import com.intellij.openapi.fileEditor.impl.LoadTextUtil
 import com.intellij.openapi.fileEditor.impl.text.TextEditorImpl
 import com.intellij.openapi.project.Project
@@ -157,24 +158,25 @@ internal class OptionGroup : VimOptionGroupBase(), IjVimOptionGroup, InternalOpt
  }

  companion object {
-    fun editorReleased(editor: Editor) {
-      // Vim always has at least one window; it's not possible to close it. Editing a new file will open a new buffer in
-      // the current window, or it's possible to split the current buffer into a new window, or open a new buffer in a
-      // new window. This is important for us because when Vim opens a new window, the new window's local options are
-      // copied from the current window.
-      // In detail: splitting the current window gets a complete copy of local and per-window global option values.
-      // Editing a new file will split the current window and then edit the new buffer in-place.
-      // IntelliJ does not always have an open window. It would be weird to close the last editor tab, and then open
-      // the next tab with different options - the user would expect the editor to look like the last one did.
-      // Therefore, we have a dummy "fallback" window that captures the options of the last closed editor. When opening
-      // an editor and there are no currently open editors, we use the fallback window to initialise the new window.
-      // This callback tracks when editors are closed, and if the last editor in a project is being closed, updates the
-      // fallback window's options.
-      val project = editor.project ?: return
-      if (!injector.editorGroup.getEditorsRaw()
-          .any { it.ij != editor && it.ij.project === project && it.ij.editorKind == EditorKind.MAIN_EDITOR }
-      ) {
-        (VimPlugin.getOptionGroup() as OptionGroup).updateFallbackWindow(injector.fallbackWindow, editor.vim)
+    fun fileEditorManagerSelectionChangedCallback(event: FileEditorManagerEvent) {
+      // Vim only has one window, and it's not possible to close it. This means that editing a new file will always
+      // reuse an existing window (opening a new window will always open from an existing window). More importantly,
+      // this means that any newly edited file will always get up-to-date local-to-window options. A new window is based
+      // on the opening window (treated as split then edit, so copy local + per-window "global" window values, then
+      // apply the per-window "global" values) and an edit reapplies the per-window "global" values.
+      // If we close all windows, and open a new one, we can only use the per-window "global" values from the fallback
+      // window, but this is only initialised when we first read `~/.ideavimrc` during startup. Vim would use the values
+      // from the current window, so to simulate this, we should update the fallback window with the values from the
+      // window that was selected at the time that the last window was closed.
+      // Unfortunately, we can't reliably know if a closing editor is the selected editor. Instead, we rely on selection
+      // change events. If an editor is losing selection and there is no new selection, we can assume this means that
+      // the last editor has been closed, and use the closed editor to update the fallback window
+      //
+      // XXX: event.oldEditor will must probably return a disposed editor. So, it should be treated with care
+      if (event.newEditor == null) {
+        (event.oldEditor as? TextEditor)?.editor?.let {
+          (VimPlugin.getOptionGroup() as OptionGroup).updateFallbackWindow(injector.fallbackWindow, it.vim)
+        }
      }
    }
  }
--- a/src/main/java/com/maddyhome/idea/vim/group/RegisterGroup.java
+++ b/src/main/java/com/maddyhome/idea/vim/group/RegisterGroup.java
@@ -14,6 +14,7 @@ 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;
--- a/src/main/java/com/maddyhome/idea/vim/group/VimMarkServiceImpl.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/VimMarkServiceImpl.kt
@@ -7,6 +7,7 @@
 */
 package com.maddyhome.idea.vim.group

+import com.intellij.codeWithMe.ClientId
 import com.intellij.ide.bookmark.Bookmark
 import com.intellij.ide.bookmark.BookmarkGroup
 import com.intellij.ide.bookmark.BookmarksListener
--- a/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt
@@ -51,8 +51,6 @@ import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.state.mode.isBlock
 import com.maddyhome.idea.vim.state.mode.isChar
 import com.maddyhome.idea.vim.state.mode.isLine
-import com.maddyhome.idea.vim.undo.VimKeyBasedUndoService
-import com.maddyhome.idea.vim.undo.VimTimestampBasedUndoService
 import java.awt.datatransfer.DataFlavor

@Service
@@ -87,15 +85,9 @@ internal class PutGroup : VimPutBase() {
    val context = vimContext.context as DataContext
    val carets: MutableMap<Caret, RangeMarker> = mutableMapOf()
    if (injector.vimState.mode is Mode.INSERT) {
-      val nanoTime = System.nanoTime()
-
      val undo = injector.undo
-      when (undo) {
-        is VimKeyBasedUndoService -> undo.setInsertNonMergeUndoKey()
-        is VimTimestampBasedUndoService -> {
-          vimEditor.forEachCaret { undo.startInsertSequence(it, it.offset, nanoTime) }
-        }
-      }
+      val nanoTime = System.nanoTime()
+      vimEditor.forEachCaret { undo.startInsertSequence(it, it.offset, nanoTime) }
    }
    EditorHelper.getOrderedCaretsList(editor).forEach { caret ->
      val startOffset =
--- a/src/main/java/com/maddyhome/idea/vim/group/visual/IdeaSelectionControl.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/visual/IdeaSelectionControl.kt
@@ -8,7 +8,6 @@

 package com.maddyhome.idea.vim.group.visual

-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.trace
 import com.intellij.openapi.editor.Editor
@@ -16,8 +15,6 @@ import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.options
-import com.maddyhome.idea.vim.group.visual.IdeaSelectionControl.controlNonVimSelectionChange
-import com.maddyhome.idea.vim.group.visual.IdeaSelectionControl.predictMode
 import com.maddyhome.idea.vim.helper.exitSelectMode
 import com.maddyhome.idea.vim.helper.exitVisualMode
 import com.maddyhome.idea.vim.helper.hasVisualSelection
@@ -66,15 +63,12 @@ internal object IdeaSelectionControl {
      //  - There was no selection and now it is
      //  - There was a selection and now it doesn't exist
      //  - There was a selection and now it exists as well (transforming char selection to line selection, for example)
-      val hasSelection = ApplicationManager.getApplication().runReadAction<Boolean> {
-        editor.selectionModel.hasSelection(true)
-      }
-      if (initialMode?.hasVisualSelection == false && !hasSelection) {
+      if (initialMode?.hasVisualSelection == false && !editor.selectionModel.hasSelection(true)) {
        logger.trace { "Exiting without selection adjusting" }
        return@singleTask
      }

-      if (hasSelection) {
+      if (editor.selectionModel.hasSelection(true)) {
        if (editor.vim.inCommandLineMode && editor.vim.mode.returnTo().hasVisualSelection) {
          logger.trace { "Modifying selection while in Command-line mode, most likely incsearch" }
          return@singleTask
--- a/src/main/java/com/maddyhome/idea/vim/group/visual/VimVisualTimer.kt
+++ b/src/main/java/com/maddyhome/idea/vim/group/visual/VimVisualTimer.kt
@@ -9,6 +9,8 @@
 package com.maddyhome.idea.vim.group.visual

 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.group.visual.VimVisualTimer.mode
+import com.maddyhome.idea.vim.group.visual.VimVisualTimer.singleTask
 import com.maddyhome.idea.vim.newapi.globalIjOptions
 import com.maddyhome.idea.vim.state.mode.Mode
 import java.awt.event.ActionEvent
--- a/src/main/java/com/maddyhome/idea/vim/handler/VimEnterHandler.kt
+++ b/src/main/java/com/maddyhome/idea/vim/handler/VimEnterHandler.kt
@@ -183,7 +183,6 @@ internal abstract class OctopusHandler(private val nextHandler: EditorActionHand
 * - App code - set handler after
 * - Template - doesn't intersect with enter anymore
 * - rd.client.editor.enter - set handler before. Otherwise, rider will add new line on enter even in normal mode
- * - inline.completion.enter - set handler before. Otherwise, AI completion is not invoked on enter.
 *
 * This rule is disabled due to VIM-3124
 * - before terminalEnter - not necessary, but terminalEnter causes "file is read-only" tooltip for readonly files VIM-3122
--- a/src/main/java/com/maddyhome/idea/vim/helper/EditorHelper.java
+++ b/src/main/java/com/maddyhome/idea/vim/helper/EditorHelper.java
@@ -157,19 +157,6 @@ public class EditorHelper {
    return (int)(getVisibleArea(editor).width / getPlainSpaceWidthFloat(editor));
  }

-  /**
-   * Gets the number of characters that can be fit inside the output panel for an editor.
-   * <p>
-   * This will be greater than the approximate screen width as it also includes any gutter components in the editor.
-   * </p>
-   *
-   * @param editor The editor
-   * @return The approximate number of columns that can fit in the output panel
-   */
-  public static int getApproximateOutputPanelWidth(final @NotNull Editor editor) {
-    return (int)(editor.getComponent().getWidth() / getPlainSpaceWidthFloat(editor));
-  }
-
  /**
   * Gets the width of the space character in the editor's plain font as a float.
   * <p>
@@ -286,7 +273,7 @@ public class EditorHelper {

    // Scroll the given visual line to the caret location, but do not scroll down passed the end of file, or the current
    // virtual space at the bottom of the screen
-    final @NotNull VimEditor editor1 = new IjVimEditor(editor);
+    @NotNull final VimEditor editor1 = new IjVimEditor(editor);
    final int lastVisualLine = EngineEditorHelperKt.getVisualLineCount(editor1) - 1;
    final int yBottomLineOffset = max(getOffsetToScrollVisualLineToBottomOfScreen(editor, lastVisualLine), visibleArea.y);
    scrollVertically(editor, min(yVisualLine - caretScreenOffset - inlayOffset, yBottomLineOffset));
@@ -338,8 +325,8 @@ public class EditorHelper {
    final int lineHeight = editor.getLineHeight();

    final int offset = y - ((screenHeight - lineHeight) / lineHeight / 2 * lineHeight);
-    final @NotNull VimEditor editor1 = new IjVimEditor(editor);
-    final int lastVisualLine = EngineEditorHelperKt.getVisualLineCount(editor1) + editor.getSettings().getAdditionalLinesCount();
+    @NotNull final VimEditor editor1 = new IjVimEditor(editor);
+    final int lastVisualLine = EngineEditorHelperKt.getVisualLineCount(editor1) - 1;
    final int offsetForLastLineAtBottom = getOffsetToScrollVisualLineToBottomOfScreen(editor, lastVisualLine);

    // For `zz`, we want to use virtual space and move any line, including the last one, to the middle of the screen.
@@ -392,7 +379,7 @@ public class EditorHelper {
    return 0;
  }

-  private static int getHorizontalScrollbarHeight(final @NotNull Editor editor) {
+  private static int getHorizontalScrollbarHeight(@NotNull final Editor editor) {
    // Horizontal scrollbars on macOS are either transparent AND auto-hide, so we don't need to worry about obscured
    // text, or always visible, opaque and outside the content area, so we don't need to adjust for them
    // Transparent scrollbars on Windows and Linux are overlays on the editor content area, and always visible. That
@@ -475,7 +462,7 @@ public class EditorHelper {
   */
  public static Pair<Boolean, Integer> scrollFullPageDown(final @NotNull Editor editor, int pages) {
    final Rectangle visibleArea = getVisibleArea(editor);
-    final @NotNull VimEditor editor2 = new IjVimEditor(editor);
+    @NotNull final VimEditor editor2 = new IjVimEditor(editor);
    final int lastVisualLine = EngineEditorHelperKt.getVisualLineCount(editor2) - 1;

    int y = visibleArea.y + visibleArea.height;
@@ -493,7 +480,7 @@ public class EditorHelper {
          caretVisualLine = lastVisualLine;
        }
        else {
-          final @NotNull VimEditor editor1 = new IjVimEditor(editor);
+          @NotNull final VimEditor editor1 = new IjVimEditor(editor);
          caretVisualLine = EngineEditorHelperKt.getVisualLineCount(editor1) - 1;
          completed = false;
        }
@@ -528,7 +515,7 @@ public class EditorHelper {
  public static Pair<Boolean, Integer> scrollFullPageUp(final @NotNull Editor editor, int pages) {
    final Rectangle visibleArea = getVisibleArea(editor);
    final int lineHeight = editor.getLineHeight();
-    final @NotNull VimEditor editor1 = new IjVimEditor(editor);
+    @NotNull final VimEditor editor1 = new IjVimEditor(editor);
    final int lastVisualLine = EngineEditorHelperKt.getVisualLineCount(editor1) - 1;

    int y = visibleArea.y;
--- a/src/main/java/com/maddyhome/idea/vim/helper/EditorHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/EditorHelper.kt
@@ -12,7 +12,6 @@ package com.maddyhome.idea.vim.helper

 import com.intellij.codeWithMe.ClientId
 import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.CaretState
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
@@ -21,8 +20,6 @@ import com.maddyhome.idea.vim.api.StringListOptionValue
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.group.IjOptionConstants
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.inBlockSelection
 import java.awt.Component
 import javax.swing.JComponent
 import javax.swing.JTable
@@ -99,41 +96,3 @@ internal val Caret.vimLine: Int
 */
 internal val Editor.vimLine: Int
  get() = this.caretModel.currentCaret.vimLine
-
-internal inline fun Editor.runWithEveryCaretAndRestore(action: () -> Unit) {
-  val caretModel = this.caretModel
-  val carets = if (this.vim.inBlockSelection) null else caretModel.allCarets
-  if (carets == null || carets.size == 1) {
-    action()
-  }
-  else {
-    var initialDocumentSize = this.document.textLength
-    var documentSizeDifference = 0
-
-    val caretOffsets = carets.map { it.selectionStart to it.selectionEnd }
-    val restoredCarets = mutableListOf<CaretState>()
-
-    caretModel.removeSecondaryCarets()
-    
-    for ((selectionStart, selectionEnd) in caretOffsets) {
-      if (selectionStart == selectionEnd) {
-        caretModel.primaryCaret.moveToOffset(selectionStart + documentSizeDifference)
-      }
-      else {
-        caretModel.primaryCaret.setSelection(
-          selectionStart + documentSizeDifference,
-          selectionEnd + documentSizeDifference
-        )
-      }
-      
-      action()
-      restoredCarets.add(caretModel.caretsAndSelections.single())
-
-      val documentLength = this.document.textLength
-      documentSizeDifference += documentLength - initialDocumentSize
-      initialDocumentSize = documentLength
-    }
-
-    caretModel.caretsAndSelections = restoredCarets
-  } 
-}
--- a/src/main/java/com/maddyhome/idea/vim/helper/IjActionExecutor.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/IjActionExecutor.kt
@@ -20,7 +20,6 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys
 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
@@ -62,7 +61,6 @@ internal class IjActionExecutor : VimActionExecutor {
  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"

  /**
@@ -75,7 +73,7 @@ internal class IjActionExecutor : VimActionExecutor {
    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("Actions cannot be updated when write-action is running or pending")
+      thisLogger().warn(RuntimeException("Actions cannot be updated when write-action is running or pending", ))
    }

    val ijAction = (action as IjNativeAction).action
@@ -96,7 +94,6 @@ internal class IjActionExecutor : VimActionExecutor {
      ActionManager.getInstance(),
      0,
    )
-    Utils.initUpdateSession(event)
    // beforeActionPerformedUpdate should be called to update the action. It fixes some rider-specific problems.
    //   because rider use async update method. See VIM-1819.
    // This method executes inside of lastUpdateAndCheckDumb
--- a/src/main/java/com/maddyhome/idea/vim/helper/IjEditorHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/IjEditorHelper.kt
@@ -13,6 +13,7 @@ import com.intellij.openapi.editor.ReadOnlyFragmentModificationException
 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
@@ -41,10 +42,6 @@ internal class IjEditorHelper : EngineEditorHelperBase() {
    return EditorHelper.getApproximateScreenWidth(editor.ij)
  }

-  override fun getApproximateOutputPanelWidth(editor: VimEditor): Int {
-    return EditorHelper.getApproximateOutputPanelWidth(editor.ij)
-  }
-
  override fun handleWithReadonlyFragmentModificationHandler(editor: VimEditor, exception: Exception) {
    return EditorActionManager.getInstance()
      .getReadonlyFragmentModificationHandler(editor.ij.document)
--- 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/ScrollViewHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/ScrollViewHelper.kt
@@ -29,6 +29,7 @@ import com.maddyhome.idea.vim.helper.EditorHelper.scrollVisualLineToBottomOfScre
 import com.maddyhome.idea.vim.helper.EditorHelper.scrollVisualLineToMiddleOfScreen
 import com.maddyhome.idea.vim.helper.EditorHelper.scrollVisualLineToTopOfScreen
 import com.maddyhome.idea.vim.newapi.vim
+import com.maddyhome.idea.vim.state.VimStateMachine
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
@@ -59,7 +60,7 @@ internal object ScrollViewHelper {
    // that this needs to be replaced as a more or less dumb line for line rewrite.
    val topLine = getVisualLineAtTopOfScreen(editor)
    val bottomLine = getVisualLineAtBottomOfScreen(editor)
-    val lastLine = vimEditor.getVisualLineCount() + editor.settings.additionalLinesCount
+    val lastLine = vimEditor.getVisualLineCount() - 1

    // We need the non-normalised value here, so we can handle cases such as so=999 to keep the current line centred
    val scrollOffset = injector.options(vimEditor).scrolloff
--- a/src/main/java/com/maddyhome/idea/vim/helper/SearchHighlightsHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/SearchHighlightsHelper.kt
@@ -102,8 +102,7 @@ private fun updateSearchHighlights(
  // Update highlights in all visible editors. We update non-visible editors when they get focus.
  // Note that this now includes all editors - main, diff windows, even toolwindows like the Commit editor and consoles
  val editors = injector.editorGroup.getEditors().filter {
-    (injector.application.isUnitTest() || it.ij.component.isShowing)
-      && (currentEditor == null || it.projectId == currentEditor.projectId)
+    injector.application.isUnitTest() || it.ij.component.isShowing
  }

  editors.forEach {
--- a/src/main/java/com/maddyhome/idea/vim/helper/UndoRedoHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/UndoRedoHelper.kt
@@ -14,9 +14,7 @@ import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.undo.UndoManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.logger
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.TextEditor
-import com.intellij.openapi.fileEditor.TextEditorWithPreview
 import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.registry.Registry
@@ -30,15 +28,13 @@ import com.maddyhome.idea.vim.common.InsertSequence
 import com.maddyhome.idea.vim.newapi.IjVimCaret
 import com.maddyhome.idea.vim.newapi.globalIjOptions
 import com.maddyhome.idea.vim.newapi.ij
-import com.maddyhome.idea.vim.state.mode.SelectionType
-import com.maddyhome.idea.vim.state.mode.inVisualMode
-import com.maddyhome.idea.vim.undo.VimTimestampBasedUndoService
+import com.maddyhome.idea.vim.undo.UndoRedoBase

 /**
 * @author oleg
 */
@Service
-internal class UndoRedoHelper : VimTimestampBasedUndoService {
+internal class UndoRedoHelper : UndoRedoBase() {
  companion object {
    private val logger = logger<UndoRedoHelper>()
  }
@@ -46,13 +42,13 @@ internal class UndoRedoHelper : VimTimestampBasedUndoService {
  override fun undo(editor: VimEditor, context: ExecutionContext): Boolean {
    val ijContext = context.context as DataContext
    val project = PlatformDataKeys.PROJECT.getData(ijContext) ?: return false
-    val textEditor = getTextEditor(editor.ij)
+    val fileEditor = TextEditorProvider.getInstance().getTextEditor(editor.ij)
    val undoManager = UndoManager.getInstance(project)
-    if (undoManager.isUndoAvailable(textEditor)) {
+    if (undoManager.isUndoAvailable(fileEditor)) {
      val scrollingModel = editor.getScrollingModel()
      scrollingModel.accumulateViewportChanges()

-      performUndo(editor, undoManager, textEditor)
+      performUndo(editor, undoManager, fileEditor)

      scrollingModel.flushViewportChanges()

@@ -61,15 +57,6 @@ internal class UndoRedoHelper : VimTimestampBasedUndoService {
    return false
  }

-  private fun getTextEditor(editor: Editor): TextEditor {
-    // If the Editor is hosted in a TextEditor with a preview, then TextEditorProvider will return a TextEditor for the
-    // hosted instance, not for the main editor that also contains the preview. If we pass the inner TextEditor to the
-    // UndoManager, it doesn't correctly restore state. Specifically, the change is undone/redone, but the caret is not
-    // moved. See VIM-3671.
-    val currentTextEditor = TextEditorProvider.getInstance().getTextEditor(editor)
-    return TextEditorWithPreview.getParentSplitEditor(currentTextEditor) as? TextEditor ?: currentTextEditor
-  }
-
  private fun performUndo(
    editor: VimEditor,
    undoManager: UndoManager,
@@ -79,7 +66,15 @@ internal class UndoRedoHelper : VimTimestampBasedUndoService {
      // TODO refactor me after VIM-308 when restoring selection and caret movement will be ignored by undo
      editor.runWithChangeTracking {
        undoManager.undo(fileEditor)
-        restoreVisualMode(editor)
+
+        // We execute undo one more time if the previous one just restored selection
+        if (!hasChanges && hasSelection(editor) && undoManager.isUndoAvailable(fileEditor)) {
+          undoManager.undo(fileEditor)
+        }
+      }
+
+      CommandProcessor.getInstance().runUndoTransparentAction {
+        removeSelections(editor)
      }
    } else {
      notifyAboutNewUndo(editor.ij.project)
@@ -113,14 +108,14 @@ internal class UndoRedoHelper : VimTimestampBasedUndoService {
  private fun hasSelection(editor: VimEditor): Boolean {
    return editor.primaryCaret().ij.hasSelection()
  }
-
+  
  override fun redo(editor: VimEditor, context: ExecutionContext): Boolean {
    val ijContext = context.context as DataContext
    val project = PlatformDataKeys.PROJECT.getData(ijContext) ?: return false
-    val textEditor = getTextEditor(editor.ij)
+    val fileEditor = TextEditorProvider.getInstance().getTextEditor(editor.ij)
    val undoManager = UndoManager.getInstance(project)
-    if (undoManager.isRedoAvailable(textEditor)) {
-      performRedo(undoManager, textEditor, editor)
+    if (undoManager.isRedoAvailable(fileEditor)) {
+      performRedo(undoManager, fileEditor, editor)

      return true
    }
@@ -234,21 +229,4 @@ internal class UndoRedoHelper : VimTimestampBasedUndoService {
    val hasChanges: Boolean
      get() = changeListener.hasChanged || initialPath != editor.getPath()
  }
-
-  private fun restoreVisualMode(editor: VimEditor) {
-    if (!editor.inVisualMode && editor.getSelectionModel().hasSelection()) {
-      val detectedMode = VimPlugin.getVisualMotion().autodetectVisualSubmode(editor)
-
-      // Visual block selection is restored into multiple carets, so multi-carets that form a block are always
-      // identified as visual block mode, leading to false positives.
-      // Since I use visual block mode much less often than multi-carets, this is a judgment call to never restore
-      // visual block mode.
-      val wantedMode = if (detectedMode == SelectionType.BLOCK_WISE)
-        SelectionType.CHARACTER_WISE
-      else
-        detectedMode
-
-      VimPlugin.getVisualMotion().enterVisualMode(editor, wantedMode)
-    }
-  }
 }
--- a/src/main/java/com/maddyhome/idea/vim/helper/UserDataManager.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/UserDataManager.kt
@@ -18,14 +18,16 @@ import com.intellij.openapi.editor.VisualPosition
 import com.intellij.openapi.editor.markup.RangeHighlighter
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.UserDataHolder
+import com.maddyhome.idea.vim.api.CaretRegisterStorageBase
 import com.maddyhome.idea.vim.api.LocalMarkStorage
 import com.maddyhome.idea.vim.api.SelectionInfo
-import com.maddyhome.idea.vim.common.InsertSequence
-import com.maddyhome.idea.vim.common.VimEditorReplaceMask
 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.InsertSequence
+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
 import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.ui.ExOutputPanel
@@ -95,6 +97,7 @@ internal var Caret.vimInsertStart: RangeMarker by userDataOr {
 }

 // TODO: Data could be lost during visual block motion
+internal var Caret.registerStorage: CaretRegisterStorageBase? by userDataCaretToEditor()
 internal var Caret.markStorage: LocalMarkStorage? by userDataCaretToEditor()
 internal var Caret.lastSelectionInfo: SelectionInfo? by userDataCaretToEditor()

--- a/src/main/java/com/maddyhome/idea/vim/helper/VimStandalonePluginUpdateChecker.kt
+++ b/src/main/java/com/maddyhome/idea/vim/helper/VimStandalonePluginUpdateChecker.kt
@@ -0,0 +1,32 @@
+/*
+ * 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.helper
+
+import com.intellij.ide.plugins.StandalonePluginUpdateChecker
+import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.service
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.group.NotificationService
+import com.maddyhome.idea.vim.icons.VimIcons
+
+@Service(Service.Level.APP)
+internal class VimStandalonePluginUpdateChecker : StandalonePluginUpdateChecker(
+  VimPlugin.getPluginId(),
+  updateTimestampProperty = PROPERTY_NAME,
+  NotificationService.IDEAVIM_STICKY_GROUP,
+  VimIcons.IDEAVIM,
+) {
+
+  override fun skipUpdateCheck(): Boolean = VimPlugin.isNotEnabled() || "dev" in VimPlugin.getVersion()
+
+  companion object {
+    private const val PROPERTY_NAME = "ideavim.statistics.timestamp"
+    fun getInstance(): VimStandalonePluginUpdateChecker = service()
+  }
+}
--- a/src/main/java/com/maddyhome/idea/vim/key/NodesHelper.kt
+++ b/src/main/java/com/maddyhome/idea/vim/key/NodesHelper.kt
@@ -0,0 +1,15 @@
+/*
+ * 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.key
+
+import com.maddyhome.idea.vim.api.injector
+
+internal fun <T> Node<T>.addLeafs(keys: String, actionHolder: T) {
+  addLeafs(injector.parser.parseKeys(keys), actionHolder)
+}
--- a/src/main/java/com/maddyhome/idea/vim/listener/IJEditorFocusListener.kt
+++ b/src/main/java/com/maddyhome/idea/vim/listener/IJEditorFocusListener.kt
@@ -10,12 +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.Editor
+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.command.OperatorArguments
 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
@@ -28,8 +32,8 @@ 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
+    val oldEditor = KeyHandler.getInstance().editorInFocus
+    if (oldEditor != null && oldEditor.ij == editor.ij) return

    KeyHandler.getInstance().editorInFocus = editor

@@ -60,11 +64,13 @@ class IJEditorFocusListener : EditorListener {
      val context: ExecutionContext = injector.executionContextManager.getEditorExecutionContext(editor)
      VimPlugin.getChange().insertBeforeCursor(editor, context)
    }
-    if (!ijEditor.document.isWritable) {
+    if (isTerminal(ijEditor) && !ijEditor.inInsertMode) {
+      switchToInsertMode.run()
+    } else if (ijEditor.isInsertMode && ((oldEditor != null && isTerminal(oldEditor.ij)) || !ijEditor.document.isWritable)) {
      val context: ExecutionContext = injector.executionContextManager.getEditorExecutionContext(editor)
      val mode = injector.vimState.mode
      when (mode) {
-        is Mode.INSERT -> editor.exitInsertMode(context)
+        is Mode.INSERT -> editor.exitInsertMode(context, OperatorArguments(false, 0, mode))
        else -> {}
      }
    }
@@ -77,5 +83,12 @@ class IJEditorFocusListener : EditorListener {
    }
    KeyHandler.getInstance().reset(editor)
  }
-}

+  // By "terminal" we refer to some editor that should switch to INSERT mode on focus
+  private fun isTerminal(ijEditor: Editor): Boolean {
+    return !ijEditor.isViewer &&
+      !EditorHelper.isFileEditor(ijEditor) &&
+      ijEditor.document.isWritable &&
+      ijEditor.editorKind != EditorKind.DIFF
+  }
+}
--- 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
@@ -30,7 +28,6 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
 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
@@ -61,7 +58,6 @@ internal object IdeaSpecifics {
    private val surrounderAction =
      "com.intellij.codeInsight.generation.surroundWith.SurroundWithHandler\$InvokeSurrounderAction"
    private var editor: Editor? = null
-    private var caretOffset = -1
    private var completionPrevDocumentLength: Int? = null
    private var completionPrevDocumentOffset: Int? = null

@@ -71,7 +67,6 @@ internal object IdeaSpecifics {
      val hostEditor = event.dataContext.getData(CommonDataKeys.HOST_EDITOR)
      if (hostEditor != null) {
        editor = hostEditor
-        caretOffset = hostEditor.caretModel.offset
      }

      val isVimAction = (action as? AnActionWrapper)?.delegate is VimShortcutKeyAction
@@ -120,61 +115,42 @@ internal object IdeaSpecifics {
      if (VimPlugin.isNotEnabled()) return

      val editor = editor
-      if (editor != null) {
-        if (action is ChooseItemAction && injector.registerGroup.isRecording) {
-          val prevDocumentLength = completionPrevDocumentLength
-          val prevDocumentOffset = completionPrevDocumentOffset
+      if (editor != null && action is ChooseItemAction && injector.registerGroup.isRecording) {
+        val prevDocumentLength = completionPrevDocumentLength
+        val prevDocumentOffset = completionPrevDocumentOffset

-          if (prevDocumentLength != null && prevDocumentOffset != null) {
-            val register = VimPlugin.getRegister()
-            val addedTextLength = editor.document.textLength - prevDocumentLength
-            val caretShift = addedTextLength - (editor.caretModel.primaryCaret.offset - prevDocumentOffset)
-            val leftArrow = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0)
+        if (prevDocumentLength != null && prevDocumentOffset != null) {
+          val register = VimPlugin.getRegister()
+          val addedTextLength = editor.document.textLength - prevDocumentLength
+          val caretShift = addedTextLength - (editor.caretModel.primaryCaret.offset - prevDocumentOffset)
+          val leftArrow = KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0)

-            register.recordText(editor.document.getText(TextRange(prevDocumentOffset, prevDocumentOffset + addedTextLength)))
-            repeat(caretShift.coerceAtLeast(0)) {
-              register.recordKeyStroke(leftArrow)
-            }
-          }
-
-          this.completionPrevDocumentLength = null
-          this.completionPrevDocumentOffset = null
-        }
-        
-        //region Enter insert mode after surround with if
-        if (surrounderAction == action.javaClass.name && surrounderItems.any {
-            action.templatePresentation.text.endsWith(
-              it,
-            )
-          }
-        ) {
-          editor?.let {
-            it.vim.mode = Mode.NORMAL()
-            VimPlugin.getChange().insertBeforeCursor(it.vim, event.dataContext.vim)
-            KeyHandler.getInstance().reset(it.vim)
+          register.recordText(editor.document.getText(TextRange(prevDocumentOffset, prevDocumentOffset + addedTextLength)))
+          repeat(caretShift.coerceAtLeast(0)) {
+            register.recordKeyStroke(leftArrow)
          }
        }
-        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) {
-          val scrollModel = editor.scrollingModel as ScrollingModelImpl
-          if (scrollModel.isScrollingNow) {
-            val v = scrollModel.verticalScrollOffset
-            val h = scrollModel.horizontalScrollOffset
-            scrollModel.finishAnimation()
-            scrollModel.scroll(h, v)
-            scrollModel.finishAnimation()
-          }
-          injector.scroll.scrollCaretIntoView(editor.vim)
-        }
+        this.completionPrevDocumentLength = null
+        this.completionPrevDocumentOffset = null
      }

+      //region Enter insert mode after surround with if
+      if (surrounderAction == action.javaClass.name && surrounderItems.any {
+          action.templatePresentation.text.endsWith(
+            it,
+          )
+        }
+      ) {
+        editor?.let {
+          it.vim.mode = Mode.NORMAL()
+          VimPlugin.getChange().insertBeforeCursor(it.vim, event.dataContext.vim)
+          KeyHandler.getInstance().reset(it.vim)
+        }
+      }
+      //endregion
+
      this.editor = null
-      this.caretOffset = -1
    }
  }

--- a/src/main/java/com/maddyhome/idea/vim/listener/VimListenerManager.kt
+++ b/src/main/java/com/maddyhome/idea/vim/listener/VimListenerManager.kt
@@ -16,6 +16,7 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.trace
 import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.editor.EditorFactory
 import com.intellij.openapi.editor.EditorKind
 import com.intellij.openapi.editor.actionSystem.TypedAction
 import com.intellij.openapi.editor.event.CaretEvent
@@ -31,10 +32,9 @@ import com.intellij.openapi.editor.event.EditorMouseMotionListener
 import com.intellij.openapi.editor.event.SelectionEvent
 import com.intellij.openapi.editor.event.SelectionListener
 import com.intellij.openapi.editor.ex.DocumentEx
-import com.intellij.openapi.editor.ex.EditorEx
+import com.intellij.openapi.editor.ex.EditorEventMulticasterEx
 import com.intellij.openapi.editor.ex.FocusChangeListener
 import com.intellij.openapi.editor.impl.EditorComponentImpl
-import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent
 import com.intellij.openapi.fileEditor.FileEditorManagerListener
@@ -44,15 +44,12 @@ import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
 import com.intellij.openapi.fileEditor.ex.FileEditorWithProvider
 import com.intellij.openapi.fileEditor.impl.EditorComposite
 import com.intellij.openapi.fileEditor.impl.EditorWindow
-import com.intellij.openapi.observable.util.addKeyListener
-import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.util.Disposer
 import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.removeUserData
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.util.ExceptionUtil
-import com.intellij.util.SlowOperations
 import com.maddyhome.idea.vim.EventFacade
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimKeyListener
@@ -65,6 +62,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
@@ -81,6 +79,7 @@ import com.maddyhome.idea.vim.handler.keyCheckRequests
 import com.maddyhome.idea.vim.helper.CaretVisualAttributesListener
 import com.maddyhome.idea.vim.helper.GuicursorChangeListener
 import com.maddyhome.idea.vim.helper.StrictMode
+import com.maddyhome.idea.vim.helper.VimStandalonePluginUpdateChecker
 import com.maddyhome.idea.vim.helper.exitSelectMode
 import com.maddyhome.idea.vim.helper.exitVisualMode
 import com.maddyhome.idea.vim.helper.forceBarCursor
@@ -96,7 +95,6 @@ import com.maddyhome.idea.vim.newapi.IjVimSearchGroup
 import com.maddyhome.idea.vim.newapi.InsertTimeRecorder
 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.inSelectMode
 import com.maddyhome.idea.vim.state.mode.selectionType
 import com.maddyhome.idea.vim.ui.ShowCmdOptionChangeListener
@@ -105,11 +103,9 @@ import com.maddyhome.idea.vim.ui.widgets.macro.MacroWidgetListener
 import com.maddyhome.idea.vim.ui.widgets.macro.macroWidgetOptionListener
 import com.maddyhome.idea.vim.ui.widgets.mode.listeners.ModeWidgetListener
 import com.maddyhome.idea.vim.ui.widgets.mode.modeWidgetOptionListener
-import org.jetbrains.annotations.TestOnly
+import com.maddyhome.idea.vim.vimDisposable
 import java.awt.event.MouseAdapter
 import java.awt.event.MouseEvent
-import java.lang.ref.WeakReference
-import java.util.*
 import javax.swing.SwingUtilities

 /**
@@ -131,15 +127,23 @@ import javax.swing.SwingUtilities
 * Make sure the selected editor isn't the new editor, which can happen if there are no other editors open.
 */
 private fun getOpeningEditor(newEditor: Editor) = newEditor.project?.let { project ->
-  // We can't rely on FileEditorManager.selectedTextEditor because we're trying to retrieve the selected text editor
-  // while creating a text editor that is about to become the selected text editor.
-  // This worked fine for 2024.2, but internal changes for 2024.3 broke things. It appears that the currently selected
-  // text editor is reset to null while the soon-to-be-selected text editor is being created. We therefore track the
-  // last selected editor manually.
-  // Note that if we ever switch back to FileEditorManager.selectedTextEditor, be careful of recursion, because the
-  // actual editor might be created on-demand, which would notify our initialisation method, which would call us...
-  VimListenerManager.VimLastSelectedEditorTracker.getLastSelectedEditor(project)?.takeUnless { it == newEditor }
+  // Some TextEditor implementations create a dummy Editor instance on demand, e.g., while downloading a file to edit
+  // (see BaseRemoteFileEditor). This can cause recursion if the newly opened/created TextEditor is also the currently
+  // selected TextEditor, because we will be notified of the new dummy Editor before it has finished initialisation, and
+  // try to get its opening editor, causing a new dummy Editor to be created and notifications sent, and so on.
+  // This was reported for 232 and 233 (see VIM-3066), but I can't recreate in 241. The callstack looks different, now
+  // using coroutines, so it's possible the deadlock has been broken. However, it's sensible to leave the recursion
+  // guard in.
+  if (openingEditorRecursionGuard) return null
+  openingEditorRecursionGuard = true
+  try {
+    FileEditorManager.getInstance(project).selectedTextEditor?.takeUnless { it == newEditor }
+  }
+  finally {
+    openingEditorRecursionGuard = false
+  }
 }
+private var openingEditorRecursionGuard = false

 internal object VimListenerManager {

@@ -149,9 +153,7 @@ internal object VimListenerManager {

  fun turnOn() {
    GlobalListeners.enable()
-    SlowOperations.knownIssue("VIM-3648, VIM-3649").use {
-      EditorListeners.addAll()
-    }
+    EditorListeners.addAll()
    check(correctorRequester.tryEmit(Unit))
    check(keyCheckRequests.tryEmit(Unit))

@@ -212,6 +214,16 @@ internal object VimListenerManager {
      EventFacade.getInstance().addEditorFactoryListener(VimEditorFactoryListener, VimPlugin.getInstance().onOffDisposable)
      val busConnection = ApplicationManager.getApplication().messageBus.connect(VimPlugin.getInstance().onOffDisposable)
      busConnection.subscribe(FileOpenedSyncListener.TOPIC, VimEditorFactoryListener)
+
+      // Listen for focus change to update various features such as mode widget
+      val eventMulticaster = EditorFactory.getInstance().eventMulticaster
+      (eventMulticaster as? EditorEventMulticasterEx)?.addFocusChangeListener(
+        VimFocusListener,
+        VimPlugin.getInstance().onOffDisposable
+      )
+
+      // Listen for document changes to update document state such as marks
+      eventMulticaster.addDocumentListener(VimDocumentListener, VimPlugin.getInstance().onOffDisposable)
    }

    fun disable() {
@@ -273,52 +285,47 @@ internal object VimListenerManager {
      // TODO: If the user changes the 'ideavimsupport' option, existing editors won't be initialised
      if (vimDisabled(editor)) return

+      // As I understand, there is no need to pass a disposable that also disposes on editor close
+      //   because all editor resources will be garbage collected anyway on editor close
+      // Note that this uses the plugin's main disposable, rather than VimPlugin.onOffDisposable, because we don't need
+      // to - we explicitly call VimListenerManager.removeAll from VimPlugin.turnOffPlugin, and this disposes each
+      // editor's disposable individually.
+      val disposable = editor.project?.vimDisposable ?: return
+
      // Protect against double initialisation
      if (editor.getUserData(editorListenersDisposableKey) != null) {
        return
      }

-      // Make sure we explicitly dispose this per-editor disposable!
-      // Because the listeners are registered with a parent disposable, they add child disposables that have to call a
-      // method on the editor to remove the listener. This means the disposable contains a reference to the editor (even
-      // if the listener handler is a singleton that doesn't hold a reference).
-      // Unless the per-editor disposable is disposed, all of these disposables sit in the disposer tree until the
-      // parent disposable is disposed, which will mean we leak editor instances.
-      // The per-editor disposable is explicitly disposed when the editor is released, and disposed via its parent when
-      // the plugin's on/off functionality is toggled, and so also when the plugin is disabled/unloaded by the platform.
-      // It doesn't matter if we explicitly remove all listeners before disposing onOffDisposable, as that will remove
-      // the per-editor disposable from the disposer tree.
-      val perEditorDisposable = Disposer.newDisposable(VimPlugin.getInstance().onOffDisposable)
-      editor.putUserData(editorListenersDisposableKey, perEditorDisposable)
+      val listenersDisposable = Disposer.newDisposable(disposable)
+      editor.putUserData(editorListenersDisposableKey, listenersDisposable)

-      Disposer.register(perEditorDisposable) {
+      Disposer.register(listenersDisposable) {
        if (VimListenerTestObject.enabled) {
          VimListenerTestObject.disposedCounter += 1
        }
      }

-      // This listener and several below add a reference to the editor to the disposer tree
-      editor.contentComponent.addKeyListener(perEditorDisposable, VimKeyListener)
+      editor.contentComponent.addKeyListener(VimKeyListener)
+      Disposer.register(listenersDisposable) { editor.contentComponent.removeKeyListener(VimKeyListener) }

      // Initialise the local options. We MUST do this before anything has the chance to query options
      val vimEditor = editor.vim
      VimPlugin.getOptionGroup().initialiseLocalOptions(vimEditor, openingEditor, scenario)

      val eventFacade = EventFacade.getInstance()
-      eventFacade.addEditorMouseListener(editor, EditorMouseHandler, perEditorDisposable)
-      eventFacade.addEditorMouseMotionListener(editor, EditorMouseHandler, perEditorDisposable)
-      eventFacade.addEditorSelectionListener(editor, EditorSelectionHandler, perEditorDisposable)
-      eventFacade.addComponentMouseListener(editor.contentComponent, ComponentMouseListener, perEditorDisposable)
-      eventFacade.addCaretListener(editor, EditorCaretHandler, perEditorDisposable)
+      eventFacade.addEditorMouseListener(editor, EditorMouseHandler, listenersDisposable)
+      eventFacade.addEditorMouseMotionListener(editor, EditorMouseHandler, listenersDisposable)
+      eventFacade.addEditorSelectionListener(editor, EditorSelectionHandler, listenersDisposable)
+      eventFacade.addComponentMouseListener(editor.contentComponent, ComponentMouseListener, listenersDisposable)
+      eventFacade.addCaretListener(editor, EditorCaretHandler, listenersDisposable)

      VimPlugin.getEditor().editorCreated(editor)
-      VimPlugin.getChange().editorCreated(editor, perEditorDisposable)
-
-      (editor as EditorEx).addFocusListener(VimFocusListener, perEditorDisposable)
+      VimPlugin.getChange().editorCreated(editor, listenersDisposable)

      injector.listenersNotifier.notifyEditorCreated(vimEditor)

-      Disposer.register(perEditorDisposable) {
+      Disposer.register(listenersDisposable) {
        VimPlugin.getEditor().editorDeinit(editor)
      }
    }
@@ -356,7 +363,7 @@ internal object VimListenerManager {
   * open in non-local Code With Me guest editors, which we still want to process (e.g. to update marks when a guest
   * edits a file. Updating search highlights will be a no-op if there are no open local editors)
   */
-  class VimDocumentListener : DocumentListener {
+  private object VimDocumentListener : DocumentListener {
    override fun beforeDocumentChange(event: DocumentEvent) {
      VimMarkServiceImpl.MarkUpdater.beforeDocumentChange(event)
      IjVimSearchGroup.DocumentSearchListener.INSTANCE.beforeDocumentChange(event)
@@ -370,26 +377,6 @@ internal object VimListenerManager {
    }
  }

-  internal object VimLastSelectedEditorTracker {
-    // This stores a weak reference to an editor against a weak reference to a project, which means there is nothing
-    // keeping the project or editor from being garbage collected at any time. Stale keys are automatically expunged
-    // whenever the map is used.
-    private val selectedEditors = WeakHashMap<Project, WeakReference<Editor>>()
-
-    fun getLastSelectedEditor(project: Project): Editor? = selectedEditors[project]?.get()
-
-    internal fun setLastSelectedEditor(fileEditor: FileEditor?) {
-      (fileEditor as? TextEditor)?.editor?.let { editor ->
-        editor.project?.let { project -> selectedEditors[project] = WeakReference(editor) }
-      }
-    }
-
-    @TestOnly
-    internal fun resetLastSelectedEditor(project: Project) {
-      selectedEditors.remove(project)
-    }
-  }
-
  /**
   * Called when the selected file editor changes. In other words, when the user selects a new tab. Used to remember the
   * last selected file, update search highlights in the new tab, etc. This will be called with non-local Code With Me
@@ -399,23 +386,12 @@ internal object VimListenerManager {
    override fun selectionChanged(event: FileEditorManagerEvent) {
      // We can't rely on being passed a non-null editor, so check for Code With Me scenarios explicitly
      if (VimPlugin.isNotEnabled() || !ClientId.isCurrentlyUnderLocalId) return
-      
-      val newEditor = event.newEditor
-      if (newEditor is TextEditor) {
-        val editor = newEditor.editor
-        if (editor.isInsertMode) {
-          editor.vim.mode = Mode.NORMAL()
-          KeyHandler.getInstance().reset(editor.vim)
-        }
-        // Breaks relativenumber for some reason
-//        injector.scroll.scrollCaretIntoView(editor.vim)
-      }
-      
+
      MotionGroup.fileEditorManagerSelectionChangedCallback(event)
      FileGroup.fileEditorManagerSelectionChangedCallback(event)
      VimPlugin.getSearch().fileEditorManagerSelectionChangedCallback(event)
+      OptionGroup.fileEditorManagerSelectionChangedCallback(event)
      IjVimRedrawService.fileEditorManagerSelectionChangedCallback(event)
-      VimLastSelectedEditorTracker.setLastSelectedEditor(event.newEditor)
    }
  }

@@ -482,26 +458,15 @@ internal object VimListenerManager {

        event.editor.putUserData(openingEditorKey, OpeningEditor(openingEditor, owningEditorWindow, isPreview, canBeReused))
      }
+
+      VimStandalonePluginUpdateChecker.getInstance().pluginUsed()
    }

    override fun editorReleased(event: EditorFactoryEvent) {
      if (vimDisabled(event.editor)) return
      val vimEditor = event.editor.vim
-      EditorListeners.remove(event.editor)
      injector.listenersNotifier.notifyEditorReleased(vimEditor)
      injector.markService.editorReleased(vimEditor)
-
-      // This ticket will have a different stack trace, but it's the same problem. Originally, we tracked the last
-      // editor closing based on file selection (closing an editor would select the next editor - so a null selection
-      // was taken to mean that there were no more editors to select). This assumption broke in 242, so it's changed to
-      // check when the editor is released.
-      // However, the actions taken when the last editor closes can still be expensive/slow because we copy options, and
-      // some options are backed by PSI options. E.g. 'textwidth' is mapped to
-      // CodeStyle.getSettings(ijEditor).isWrapOnTyping(language)), and getting the document's PSI language is a slow
-      // operation. This underlying issue still needs to be addressed, even though the method has moved
-      SlowOperations.knownIssue("VIM-3658").use {
-        OptionGroup.editorReleased(event.editor)
-      }
    }

    override fun fileOpenedSync(
@@ -789,16 +754,11 @@ internal object VimListenerManager {
        //   https://youtrack.jetbrains.com/issue/IDEA-277716
        //   https://youtrack.jetbrains.com/issue/VIM-2368
        if (event.mouseEvent.clickCount == 1 && !SwingUtilities.isRightMouseButton(event.mouseEvent)) {
-          val hasSelection = ApplicationManager.getApplication().runReadAction<Boolean> {
-            editor.selectionModel.hasSelection(true)
-          }
-          if (!hasSelection) {
-            if (editor.inVisualMode) {
-              editor.vim.exitVisualMode()
-            } else if (editor.vim.inSelectMode) {
-              editor.exitSelectMode(false)
-              KeyHandler.getInstance().reset(editor.vim)
-            }
+          if (editor.inVisualMode) {
+            editor.vim.exitVisualMode()
+          } else if (editor.vim.inSelectMode) {
+            editor.exitSelectMode(false)
+            KeyHandler.getInstance().reset(editor.vim)
          }
        }
      } else if (event.area != EditorMouseEventArea.ANNOTATIONS_AREA &&
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjClipboardManager.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjClipboardManager.kt
@@ -22,13 +22,10 @@ import com.intellij.openapi.project.DumbService
 import com.intellij.openapi.project.IndexNotReadyException
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.util.ui.EmptyClipboardOwner
-import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimClipboardManager
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.getText
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.common.VimCopiedText
 import com.maddyhome.idea.vim.diagnostic.debug
 import com.maddyhome.idea.vim.diagnostic.vimLogger
 import java.awt.HeadlessException
@@ -40,52 +37,18 @@ import java.io.IOException

@Service
 internal class IjClipboardManager : VimClipboardManager {
-  @Deprecated("Please use com.maddyhome.idea.vim.api.VimClipboardManager#getPrimaryTextAndTransferableData")
  override fun getPrimaryTextAndTransferableData(): Pair<String, List<Any>?>? {
    val clipboard = Toolkit.getDefaultToolkit()?.systemSelection ?: return null
    val contents = clipboard.getContents(null) ?: return null
    return getTextAndTransferableData(contents)
  }

-  override fun getPrimaryContent(editor: VimEditor, context: ExecutionContext): IjVimCopiedText? {
-    val (text, transferableData) = getPrimaryTextAndTransferableData() ?: return null
-    return IjVimCopiedText(text, transferableData ?: emptyList())
-  }
-
-  @Deprecated("Please use com.maddyhome.idea.vim.api.VimClipboardManager#getClipboardTextAndTransferableData")
  override fun getClipboardTextAndTransferableData(): Pair<String, List<Any>?>? {
    val contents = getContents() ?: return null
    return getTextAndTransferableData(contents)
  }

-  override fun getClipboardContent(editor: VimEditor, context: ExecutionContext): VimCopiedText? {
-    val (text, transferableData) = getClipboardTextAndTransferableData() ?: return null
-    return IjVimCopiedText(text, transferableData ?: emptyList())
-  }
-
-  override fun setClipboardContent(editor: VimEditor, context: ExecutionContext, textData: VimCopiedText): Boolean {
-    require(textData is IjVimCopiedText)
-    return handleTextSetting(textData.text, textData.text, textData.transferableData) { content -> setContents(content) } != null
-  }
-
-  // TODO prefer methods with ranges, because they collect and preprocess for us
-//  override fun createClipboardEntry(
-//    editor: VimEditor,
-//    context: ExecutionContext,
-//    text: String,
-//    range: TextRange,
-//  ): ClipboardEntry {
-//    val transferableData = getTransferableData(editor, range, text)
-//    val preprocessedText = preprocessText(editor, range, text, transferableData)
-//    return IJClipboardEntry(preprocessedText, text, transferableData)
-//  }
-
-//  override fun setClipboardText(editor: VimEditor, context: ExecutionContext, entry: ClipboardEntry): Boolean {
-//    require(entry is IJClipboardEntry)
-//    return setClipboardText(entry.text, entry.rawText, entry.transferableData) != null
-//  }
-
-  private fun getTextAndTransferableData(trans: Transferable): Pair<String, List<TextBlockTransferableData>?>? {
+  private fun getTextAndTransferableData(trans: Transferable): Pair<String, List<Any>?>? {
    var res: String? = null
    var transferableData: List<TextBlockTransferableData> = ArrayList()
    try {
@@ -100,29 +63,10 @@ internal class IjClipboardManager : VimClipboardManager {
    return Pair(res, transferableData)
  }

-  @Deprecated("Please use com.maddyhome.idea.vim.api.VimClipboardManager#setClipboardText")
  override fun setClipboardText(text: String, rawText: String, transferableData: List<Any>): Transferable? {
    return handleTextSetting(text, rawText, transferableData) { content -> setContents(content) }
  }

-  override fun setPrimaryContent(
-    editor: VimEditor,
-    context: ExecutionContext,
-    textData: VimCopiedText,
-  ): Boolean {
-    require(textData is IjVimCopiedText)
-    return handleTextSetting(textData.text, textData.text, textData.transferableData) { content ->
-      val clipboard = Toolkit.getDefaultToolkit()?.systemSelection ?: return@handleTextSetting null
-      clipboard.setContents(content, EmptyClipboardOwner.INSTANCE)
-    } != null
-  }
-
-//  override fun setPrimaryText(editor: VimEditor, context: ExecutionContext, entry: ClipboardEntry): Boolean {
-//    require(entry is IJClipboardEntry)
-//    return setPrimaryText(entry.text, entry.rawText, entry.transferableData) != null
-//  }
-
-  @Deprecated("Please use com.maddyhome.idea.vim.api.VimClipboardManager#setPrimaryText")
  override fun setPrimaryText(text: String, rawText: String, transferableData: List<Any>): Transferable? {
    return handleTextSetting(text, rawText, transferableData) { content ->
      val clipboard = Toolkit.getDefaultToolkit()?.systemSelection ?: return@handleTextSetting null
@@ -130,16 +74,6 @@ internal class IjClipboardManager : VimClipboardManager {
    }
  }

-  override fun collectCopiedText(editor: VimEditor, context: ExecutionContext, range: TextRange, text: String): VimCopiedText {
-    val transferableData = getTransferableData(editor, range)
-    val preprocessedText = preprocessText(editor, range, text, transferableData)
-    return IjVimCopiedText(preprocessedText, transferableData)
-  }
-
-  override fun dumbCopiedText(text: String): VimCopiedText {
-    return IjVimCopiedText(text, emptyList())
-  }
-
  @Suppress("UNCHECKED_CAST")
  private fun handleTextSetting(text: String, rawText: String, transferableData: List<Any>, setContent: (TextBlockTransferable) -> Unit?): Transferable? {
    val mutableTransferableData = (transferableData as List<TextBlockTransferableData>).toMutableList()
@@ -158,7 +92,7 @@ internal class IjClipboardManager : VimClipboardManager {
    return null
  }

-  override fun getTransferableData(vimEditor: VimEditor, textRange: TextRange): List<TextBlockTransferableData> {
+  override fun getTransferableData(vimEditor: VimEditor, textRange: TextRange, text: String): List<Any> {
    val editor = (vimEditor as IjVimEditor).editor
    val transferableData: MutableList<TextBlockTransferableData> = ArrayList()
    val project = editor.project ?: return emptyList()
@@ -183,7 +117,7 @@ internal class IjClipboardManager : VimClipboardManager {
        }
      }
    }
-    transferableData.add(CaretStateTransferableData(intArrayOf(0), intArrayOf(textRange.endOffset - textRange.startOffset)))
+    transferableData.add(CaretStateTransferableData(intArrayOf(0), intArrayOf(text.length)))

    // These data provided by {@link com.intellij.openapi.editor.richcopy.TextWithMarkupProcessor} doesn't work with
    //   IdeaVim and I don't see a way to fix it
@@ -241,7 +175,3 @@ internal class IjClipboardManager : VimClipboardManager {
    val logger = vimLogger<IjClipboardManager>()
  }
 }
-
-data class IjVimCopiedText(override val text: String, val transferableData: List<Any>): VimCopiedText {
-  override fun updateText(newText: String): VimCopiedText = IjVimCopiedText(newText, transferableData)
-}
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjVimCaret.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjVimCaret.kt
@@ -12,6 +12,8 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.LogicalPosition
 import com.intellij.openapi.editor.VisualPosition
 import com.maddyhome.idea.vim.api.BufferPosition
+import com.maddyhome.idea.vim.api.CaretRegisterStorage
+import com.maddyhome.idea.vim.api.CaretRegisterStorageBase
 import com.maddyhome.idea.vim.api.ImmutableVimCaret
 import com.maddyhome.idea.vim.api.LocalMarkStorage
 import com.maddyhome.idea.vim.api.SelectionInfo
@@ -19,7 +21,6 @@ import com.maddyhome.idea.vim.api.VimCaret
 import com.maddyhome.idea.vim.api.VimCaretBase
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimVisualPosition
-import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.InsertSequence
 import com.maddyhome.idea.vim.common.LiveRange
 import com.maddyhome.idea.vim.group.visual.VisualChange
@@ -28,6 +29,7 @@ import com.maddyhome.idea.vim.helper.insertHistory
 import com.maddyhome.idea.vim.helper.lastSelectionInfo
 import com.maddyhome.idea.vim.helper.markStorage
 import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
+import com.maddyhome.idea.vim.helper.registerStorage
 import com.maddyhome.idea.vim.helper.resetVimLastColumn
 import com.maddyhome.idea.vim.helper.vimInsertStart
 import com.maddyhome.idea.vim.helper.vimLastColumn
@@ -35,14 +37,22 @@ import com.maddyhome.idea.vim.helper.vimLastVisualOperatorRange
 import com.maddyhome.idea.vim.helper.vimLine
 import com.maddyhome.idea.vim.helper.vimSelectionStart
 import com.maddyhome.idea.vim.helper.vimSelectionStartClear
-import com.maddyhome.idea.vim.register.VimRegisterGroup
 import com.maddyhome.idea.vim.state.mode.SelectionType

 internal class IjVimCaret(val caret: Caret) : VimCaretBase() {

-  override val registerStorage: VimRegisterGroup
-    get() = injector.registerGroup
- 
+  override val registerStorage: CaretRegisterStorage
+    get() {
+      var storage = this.caret.registerStorage
+      if (storage == null) {
+        initInjector() // To initialize injector used in CaretRegisterStorageBase
+        storage = CaretRegisterStorageBase(this)
+        this.caret.registerStorage = storage
+      } else if (storage.caret != this) {
+        storage.caret = this
+      }
+      return storage
+    }
  override val markStorage: LocalMarkStorage
    get() {
      var storage = this.caret.markStorage
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjVimEditor.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjVimEditor.kt
@@ -38,7 +38,9 @@ import com.maddyhome.idea.vim.api.VimSelectionModel
 import com.maddyhome.idea.vim.api.VimVisualPosition
 import com.maddyhome.idea.vim.api.VirtualFile
 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.common.IndentConfig
+import com.maddyhome.idea.vim.common.IndentConfig.Companion.create
 import com.maddyhome.idea.vim.common.LiveRange
 import com.maddyhome.idea.vim.common.ModeChangeListener
 import com.maddyhome.idea.vim.common.TextRange
@@ -60,8 +62,6 @@ 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
-import com.maddyhome.idea.vim.undo.VimKeyBasedUndoService
-import com.maddyhome.idea.vim.undo.VimTimestampBasedUndoService
 import org.jetbrains.annotations.ApiStatus
 import java.lang.System.identityHashCode

@@ -99,7 +99,7 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
      editor.vimChangeActionSwitchMode = value
    }
  override val indentConfig: VimIndentConfig
-    get() = IndentConfig.create(editor)
+    get() = create(editor)

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

@@ -142,13 +142,7 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(

  override fun insertText(caret: VimCaret, atPosition: Int, text: CharSequence) {
    if (injector.vimState.mode is Mode.INSERT) {
-      val undo = injector.undo
-      when (undo) {
-        is VimKeyBasedUndoService -> undo.setInsertNonMergeUndoKey()
-        is VimTimestampBasedUndoService -> {
-          undo.startInsertSequence(caret, atPosition, System.nanoTime())
-        }
-      }
+      injector.undo.startInsertSequence(caret, atPosition, System.nanoTime())
    }
    editor.document.insertString(atPosition, text)
  }
@@ -179,38 +173,21 @@ internal class IjVimEditor(editor: Editor) : MutableLinearEditor, VimEditorBase(
    return editor.caretModel.allCarets.map { IjVimCaret(it) }
  }

-  override var isFirstCaret = true
-  override var isReversingCarets = false
-  
  @Suppress("ideavimRunForEachCaret")
  override fun forEachCaret(action: (VimCaret) -> Unit) {
    if (editor.vim.inBlockSelection) {
      action(IjVimCaret(editor.caretModel.primaryCaret))
    } else {
-      try {
-        editor.caretModel.runForEachCaret({
-          if (it.isValid) {
-            action(IjVimCaret(it))
-            isFirstCaret = false
-          }
-        }, false)
-      } finally {
-        isFirstCaret = true
-      }
+      editor.caretModel.runForEachCaret({
+        if (it.isValid) {
+          action(IjVimCaret(it))
+        }
+      }, false)
    }
  }

  override fun forEachNativeCaret(action: (VimCaret) -> Unit, reverse: Boolean) {
-    isReversingCarets = reverse
-    try {
-      editor.caretModel.runForEachCaret({
-        action(IjVimCaret(it))
-        isFirstCaret = false
-      }, reverse)
-    } finally {
-      isFirstCaret = true
-      isReversingCarets = false
-    }
+    editor.caretModel.runForEachCaret({ action(IjVimCaret(it)) }, reverse)
  }

  override fun isInForEachCaretScope(): Boolean {
@@ -412,8 +389,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) {
@@ -557,9 +534,9 @@ internal class InsertTimeRecorder: ModeChangeListener {
  override fun modeChanged(editor: VimEditor, oldMode: Mode) {
    editor as IjVimEditor
    if (oldMode == Mode.INSERT) {
-      val undo = injector.undo as? VimTimestampBasedUndoService ?: return
+      val undo = injector.undo
      val nanoTime = System.nanoTime()
      editor.forEachCaret { undo.endInsertSequence(it, it.offset, nanoTime) }
    }
  }
-}
+}
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjVimInjector.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjVimInjector.kt
@@ -22,6 +22,7 @@ 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
--- a/src/main/java/com/maddyhome/idea/vim/newapi/IjVimSearchGroup.kt
+++ b/src/main/java/com/maddyhome/idea/vim/newapi/IjVimSearchGroup.kt
@@ -18,8 +18,11 @@ import com.intellij.openapi.editor.event.DocumentEvent
 import com.intellij.openapi.editor.event.DocumentListener
 import com.intellij.openapi.editor.markup.RangeHighlighter
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent
+import com.intellij.openapi.util.Ref
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.Options
+import com.maddyhome.idea.vim.api.VimCaret
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimSearchGroupBase
 import com.maddyhome.idea.vim.api.globalOptions
@@ -27,16 +30,21 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.Direction
 import com.maddyhome.idea.vim.common.Direction.Companion.fromInt
 import com.maddyhome.idea.vim.diagnostic.vimLogger
+import com.maddyhome.idea.vim.helper.MessageHelper
+import com.maddyhome.idea.vim.helper.TestInputModel.Companion.getInstance
 import com.maddyhome.idea.vim.helper.addSubstitutionConfirmationHighlight
 import com.maddyhome.idea.vim.helper.highlightSearchResults
+import com.maddyhome.idea.vim.helper.isCloseKeyStroke
 import com.maddyhome.idea.vim.helper.shouldIgnoreCase
 import com.maddyhome.idea.vim.helper.updateSearchHighlights
 import com.maddyhome.idea.vim.helper.vimLastHighlighters
 import com.maddyhome.idea.vim.options.GlobalOptionChangeListener
+import com.maddyhome.idea.vim.ui.ModalEntry
 import com.maddyhome.idea.vim.vimscript.model.functions.handlers.SubmatchFunctionHandler
 import org.jdom.Element
 import org.jetbrains.annotations.Contract
 import org.jetbrains.annotations.TestOnly
+import javax.swing.KeyStroke

@State(
  name = "VimSearchSettings",
@@ -44,7 +52,7 @@ import org.jetbrains.annotations.TestOnly
 )
 open class IjVimSearchGroup : VimSearchGroupBase(), PersistentStateComponent<Element> {
  companion object {
-    private val logger by lazy { vimLogger<IjVimSearchGroup>() }
+    private val logger = vimLogger<IjVimSearchGroup>()
  }

  init {
@@ -104,25 +112,27 @@ open class IjVimSearchGroup : VimSearchGroupBase(), PersistentStateComponent<Ele
    return IjSearchHighlight(ijEditor, highlighter)
  }

+  override fun setLatestMatch(match: String) {
+    SubmatchFunctionHandler.getInstance().latestMatch = match
+  }
+
+  override fun replaceString(
+    editor: VimEditor,
+    startOffset: Int,
+    endOffset: Int,
+    newString: String,
+  ) {
+    ApplicationManager.getApplication().runWriteAction {
+      (editor as IjVimEditor).editor.document.replaceString(startOffset, endOffset, newString)
+    }
+  }
+
  @TestOnly
  override fun resetState() {
    super.resetState()
    showSearchHighlight = injector.globalOptions().hlsearch
  }

-  override fun isSomeTextHighlighted(): Boolean {
-    val vimEditors = injector.editorGroup.getEditors().filter {
-      (injector.application.isUnitTest() || it.ij.component.isShowing)
-    }
-    for (vimEditor in vimEditors) {
-      val editor = vimEditor.ij
-      if (editor.vimLastHighlighters != null) {
-        return true
-      }
-    }
-    return false
-  }
-
  override fun setShouldShowSearchHighlights() {
    showSearchHighlight = injector.globalOptions().hlsearch
  }
--- a/src/main/java/com/maddyhome/idea/vim/troubleshooting/Troubleshooter.kt
+++ b/src/main/java/com/maddyhome/idea/vim/troubleshooting/Troubleshooter.kt
@@ -32,9 +32,9 @@ internal class Troubleshooter {
  fun findIncorrectMappings(): List<Problem> {
    val problems = ArrayList<Problem>()
    MappingMode.entries.forEach { mode ->
-      injector.keyGroup.getKeyMapping(mode).getAllByOwner(MappingOwner.IdeaVim.InitScript).forEach { entry ->
-        (entry.mappingInfo as? ToKeysMappingInfo)?.let { mappingInfo ->
-          if (":action" in mappingInfo.toKeys.joinToString { it.keyChar.toString() }) {
+      injector.keyGroup.getKeyMapping(mode).getByOwner(MappingOwner.IdeaVim.InitScript).forEach { (_, to) ->
+        if (to is ToKeysMappingInfo) {
+          if (":action" in to.toKeys.joinToString { it.keyChar.toString() }) {
            problems += Problem("Mappings contain `:action` call")
          }
        }
--- 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)
--- 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,6 +7,7 @@
 */
 package com.maddyhome.idea.vim.ui.ex

+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
--- a/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.java
+++ b/src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.java
@@ -23,10 +23,7 @@ import com.maddyhome.idea.vim.EventFacade;
 import com.maddyhome.idea.vim.KeyHandler;
 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.api.*;
 import com.maddyhome.idea.vim.ex.ranges.LineRange;
 import com.maddyhome.idea.vim.helper.SearchHighlightsHelper;
 import com.maddyhome.idea.vim.helper.UiHelper;
@@ -344,14 +341,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);
@@ -531,8 +528,9 @@ 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();
  }

@@ -550,8 +548,9 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    entry.clearCurrentAction();
  }

+  @Nullable
  @Override
-  public @Nullable Integer getPromptCharacterOffset() {
+  public Integer getPromptCharacterOffset() {
    int offset = entry.currentActionPromptCharacterOffset;
    return offset == -1 ? null : offset;
  }
@@ -571,7 +570,8 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    IdeFocusManager.findInstance().requestFocus(entry, true);
  }

-  public @Nullable VimInputInterceptor<?> getInputInterceptor() {
+  @Nullable
+  public VimInputInterceptor<?> getInputInterceptor() {
    return myInputInterceptor;
  }

@@ -584,13 +584,15 @@ public class ExEntryPanel extends JPanel implements VimCommandLine {
    myInputInterceptor = vimInputInterceptor;
  }

+  @Nullable
  @Override
-  public @Nullable Function1<String, Unit> getInputProcessing() {
+  public Function1<String, Unit> getInputProcessing() {
    return inputProcessing;
  }

+  @Nullable
  @Override
-  public @Nullable Character getFinishOn() {
+  public Character getFinishOn() {
    return finishOn;
  }

--- a/src/main/java/com/maddyhome/idea/vim/ui/widgets/mode/listeners/ModeWidgetListener.kt
+++ b/src/main/java/com/maddyhome/idea/vim/ui/widgets/mode/listeners/ModeWidgetListener.kt
@@ -11,7 +11,6 @@ package com.maddyhome.idea.vim.ui.widgets.mode.listeners
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.RecursionManager
 import com.intellij.openapi.wm.WindowManager
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.common.EditorListener
@@ -74,14 +73,7 @@ internal class ModeWidgetListener: ModeChangeListener, EditorListener, VimWidget

  private fun getFocusedEditorForProject(editorProject: Project?): Editor? {
    if (editorProject == null) return null
-    return recursionGuard.doPreventingRecursion(recursionKey, false) {
-      val fileEditorManager = FileEditorManager.getInstance(editorProject)
-      fileEditorManager.selectedTextEditor
-    }
-  }
-
-  companion object {
-    private val recursionGuard = RecursionManager.createGuard<Any>("IdeaVim.modeWidgetListener")
-    private val recursionKey = Any()
+    val fileEditorManager = FileEditorManager.getInstance(editorProject)
+    return fileEditorManager.selectedTextEditor
  }
 }
--- a/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/ActionListCommand.kt
+++ b/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/ActionListCommand.kt
@@ -15,8 +15,10 @@ import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.ex.ranges.Range
 import com.maddyhome.idea.vim.helper.MessageHelper
+import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 import java.util.*

@@ -24,9 +26,7 @@ import java.util.*
 * @author smartbomb
 */
@ExCommand(command = "actionl[ist]")
-internal data class ActionListCommand(val range: Range, val modifier: CommandModifier, val argument: String) :
-  Command.SingleExecution(range, modifier) {
-
+internal data class ActionListCommand(val range: Range, val argument: String) : Command.SingleExecution(range) {
  override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)

  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
--- a/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/BufferCommand.kt
+++ b/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/BufferCommand.kt
@@ -27,14 +27,13 @@ import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 * @author John Weigel
 */
@ExCommand(command = "b[uffer]")
-internal data class BufferCommand(val range: Range, val modifier: CommandModifier, val argument: String) :
-  Command.SingleExecution(range, modifier) {
-
+internal data class BufferCommand(val range: Range, val argument: String) : Command.SingleExecution(range) {
  override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)

  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
-    val overrideModified = modifier == CommandModifier.BANG
-    val buffer = argument.trim()
+    val arg = argument.trim()
+    val overrideModified = arg.startsWith('!')
+    val buffer = if (overrideModified) arg.replace(Regex("^!\\s*"), "") else arg
    var result = true

    if (buffer.isNotEmpty()) {
--- a/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/BufferListCommand.kt
+++ b/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/BufferListCommand.kt
@@ -32,9 +32,7 @@ import org.jetbrains.annotations.NonNls
 * @author John Weigel
 */
@ExCommand(command = "ls,files,buffers")
-internal data class BufferListCommand(val range: Range, val modifier: CommandModifier, val argument: String) :
-  Command.SingleExecution(range, modifier) {
-
+internal data class BufferListCommand(val range: Range, val argument: String) : Command.SingleExecution(range) {
  override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)

  companion object {
--- a/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/CmdFilterCommand.kt
+++ b/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/CmdFilterCommand.kt
@@ -18,6 +18,7 @@ import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ExException
+import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.ex.ranges.Range
 import com.maddyhome.idea.vim.ex.ranges.toTextRange
 import com.maddyhome.idea.vim.helper.EditorHelper
@@ -29,9 +30,7 @@ import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 * see "h :!"
 */
@ExCommand(command = "!")
-internal data class CmdFilterCommand(val range: Range, val modifier: CommandModifier, val argument: String)
-  : Command.SingleExecution(range, modifier) {
-
+internal data class CmdFilterCommand(val range: Range, val argument: String) : Command.SingleExecution(range) {
  override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.SELF_SYNCHRONIZED)

  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
@@ -100,7 +99,7 @@ internal data class CmdFilterCommand(val range: Range, val modifier: CommandModi
        lastCommand = command
        ExecutionResult.Success
      }
-    } catch (_: ProcessCanceledException) {
+    } catch (e: ProcessCanceledException) {
      throw ExException("Command terminated")
    } catch (e: Exception) {
      throw ExException(e.message)
--- a/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/HelpCommand.kt
+++ b/src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/HelpCommand.kt
@@ -24,11 +24,8 @@ import java.net.URLEncoder
 * see "h :help"
 */
@ExCommand(command = "h[elp]")
-internal data class HelpCommand(val range: Range, val modifier: CommandModifier, val argument: String) :
-  Command.SingleExecution(range, modifier, argument) {
-
+internal data class HelpCommand(val range: Range, val argument: String) : Command.SingleExecution(range, argument) {
  override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
-
  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
    BrowserUtil.browse(helpTopicUrl(argument))
    return ExecutionResult.Success
@@ -40,7 +37,7 @@ internal data class HelpCommand(val range: Range, val modifier: CommandModifier,

    return try {
      String.format("%s?docs=help&search=%s", HELP_QUERY_URL, URLEncoder.encode(topic, "UTF-8"))
-    } catch (_: UnsupportedEncodingException) {
+    } catch (e: UnsupportedEncodingException) {
      HELP_ROOT_URL
    }
  }
--- a/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/functions/handlers/ColLineFunctionHandler.kt
+++ b/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/functions/handlers/ColLineFunctionHandler.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
@@ -15,6 +15,9 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.lineLength
 import com.maddyhome.idea.vim.api.options
 import com.maddyhome.idea.vim.api.visualLineToBufferLine
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.vimLine
+import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.state.mode.inVisualMode
 import com.maddyhome.idea.vim.vimscript.model.VimLContext
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimDataType
@@ -99,12 +102,12 @@ private fun variableToPosition(editor: VimEditor, variable: VimDataType, dollarF
  if (name.isEmpty()) return null

  // Current caret line
-  if (name[0] == '.') return editor.currentCaret().vimLine.asVimInt() to currentCol(editor)
+  if (name[0] == '.') return editor.ij.vimLine.asVimInt() to currentCol(editor)

  // Visual start
  if (name == "v") {
    if (!editor.inVisualMode) {
-      return editor.currentCaret().vimLine.asVimInt() to currentCol(editor)
+      return editor.ij.vimLine.asVimInt() to currentCol(editor)
    }

    val vimStart = editor.currentCaret().vimSelectionStart
@@ -127,7 +130,7 @@ private fun variableToPosition(editor: VimEditor, variable: VimDataType, dollarF
  // First visual line
  if (name.length >= 2 && name[0] == 'w' && name[1] == '0') {
    if (!dollarForLine) return null
-    val actualVisualTop = injector.engineEditorHelper.getVisualLineAtTopOfScreen(editor)
+    val actualVisualTop = EditorHelper.getVisualLineAtTopOfScreen(editor.ij)
    val actualLogicalTop = editor.visualLineToBufferLine(actualVisualTop)
    return (actualLogicalTop + 1).asVimInt() to currentCol(editor)
  }
@@ -135,7 +138,7 @@ private fun variableToPosition(editor: VimEditor, variable: VimDataType, dollarF
  // Last visual line
  if (name.length >= 2 && name[0] == 'w' && name[1] == '$') {
    if (!dollarForLine) return null
-    val actualVisualBottom = injector.engineEditorHelper.getVisualLineAtBottomOfScreen(editor)
+    val actualVisualBottom = EditorHelper.getVisualLineAtBottomOfScreen(editor.ij)
    val actualLogicalBottom = editor.visualLineToBufferLine(actualVisualBottom)
    return (actualLogicalBottom + 1).asVimInt() to currentCol(editor)
  }
--- a/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/functions/handlers/SubmatchFunctionHandler.kt
+++ b/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/functions/handlers/SubmatchFunctionHandler.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
@@ -20,7 +20,7 @@ import com.maddyhome.idea.vim.vimscript.model.expressions.Expression
 import com.maddyhome.idea.vim.vimscript.model.functions.FunctionHandler

@VimscriptFunction(name = "submatch")
-class SubmatchFunctionHandler : FunctionHandler() {
+internal class SubmatchFunctionHandler : FunctionHandler() {
  override val minimumNumberOfArguments = 1
  override val maximumNumberOfArguments = 2

--- a/Show More
+++ b/Show More