Set plugin version to chylex-40

This reverts commit 9bbeab80

.github/workflows/checkNewPlugins.yml

@@ -20,10 +20,10 @@ jobs:
       - name: Fetch origin repo
         uses: actions/checkout@v3
 
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/closeYoutrackOnCommit.yml

@@ -7,9 +7,6 @@ on:
   workflow_dispatch:
   push:
     branches: [ master ]
-    
-permissions:
-  contents: write
 
 jobs:
   build:
@@ -23,10 +20,10 @@ jobs:
           fetch-depth: 300
       - name: Get tags
         run: git fetch --tags origin
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.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
@@ -39,18 +34,12 @@ jobs:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Setup Java
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin' # See 'Supported distributions' for available options
-        java-version: '21'
-
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -75,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2

.github/workflows/integrationsTest.yml

@@ -18,10 +18,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 300
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/kover.yml

@@ -18,10 +18,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 300
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/mergePr.yml

@@ -20,10 +20,10 @@ jobs:
           fetch-depth: 50
           # See end of file updateChangeslog.yml for explanation of this secret
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/runUiOctopusTests.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 21
+          java-version: 17
       - name: Setup FFmpeg
         run: brew install ffmpeg
 #      - name: Setup Gradle
@@ -37,7 +37,7 @@ jobs:
         run: mv tests/ui-ij-tests/video build/reports
       - name: Move sandbox logs
         if: always()
-        run: mv build/idea-sandbox/IC-*/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/IC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
       - name: Save report
         if: always()
         uses: actions/upload-artifact@v4

.github/workflows/runUiPyTests.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 21
+          java-version: 17
       - uses: actions/setup-python@v5
         with:
           python-version: '3.10'
@@ -40,7 +40,7 @@ jobs:
         run: mv tests/ui-py-tests/video build/reports
       - name: Move sandbox logs
         if: always()
-        run: mv build/idea-sandbox/PC-*/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/PC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
       - name: Save report
         if: always()
         uses: actions/upload-artifact@v4

.github/workflows/runUiRdTests.yml

@@ -1,51 +0,0 @@
-name: Run UI Rider Tests
-on:
-  workflow_dispatch:
-  schedule:
-      - cron: '0 12 * * *'
-jobs:
-  build-for-ui-test-mac-os:
-    if: github.repository == 'JetBrains/ideavim'
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 21
-      - name: Setup FFmpeg
-        run: brew install ffmpeg
-#      - name: Setup Gradle
-#        uses: gradle/gradle-build-action@v2.4.2
-      - name: Build Plugin
-        run: gradle :buildPlugin
-      - name: Run Idea
-        run: |
-          mkdir -p build/reports
-          gradle --no-configuration-cache :runIdeForUiTests -PideaType=RD > build/reports/idea.log &
-      - name: Wait for Idea started
-        uses: jtalk/url-health-check-action@v3
-        with:
-          url: http://127.0.0.1:8082
-          max-attempts: 100
-          retry-delay: 10s
-      - name: Tests
-        run: gradle :tests:ui-rd-tests:testUi
-        env:
-          RIDER_LICENSE: ${{ secrets.RIDER_LICENSE }}
-      - name: Move video
-        if: always()
-        run: mv tests/ui-rd-tests/video build/reports
-      - name: Move sandbox logs
-        if: always()
-        run: mv build/idea-sandbox/RD-*/log_runIdeForUiTests idea-sandbox-log
-      - name: Save report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-test-fails-report-mac
-          path: |
-            build/reports
-            tests/ui-rd-tests/build/reports
-            idea-sandbox-log

.github/workflows/runUiTests.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 21
+          java-version: 17
       - name: Setup FFmpeg
         run: brew install ffmpeg
 #      - name: Setup Gradle
@@ -37,7 +37,7 @@ jobs:
         run: mv tests/ui-ij-tests/video build/reports
       - name: Move sandbox logs
         if: always()
-        run: mv build/idea-sandbox/IC-*/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/IC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
       - name: Save report
         if: always()
         uses: actions/upload-artifact@v4

.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:

.github/workflows/updateAuthors.yml

@@ -25,10 +25,10 @@ jobs:
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
       - name: Get tags
         run: git fetch --tags origin
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/updateChangelog.yml

@@ -22,10 +22,10 @@ jobs:
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
       - name: Get tags
         run: git fetch --tags origin
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/updateFormatting.yml

@@ -20,10 +20,10 @@ jobs:
           fetch-depth: 50
           # See end of file updateChangeslog.yml for explanation of this secret
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
-      - name: Set up JDK 21
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: '21'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.gitignore

@@ -13,7 +13,6 @@
 !/.idea/vcs.xml
 !/.idea/misc.xml
 !/.idea/.name
-!/.idea/gradle.xml
 
 **/build/
 **/out/

.idea/gradle.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/annotation-processors" />
-            <option value="$PROJECT_DIR$/scripts" />
-            <option value="$PROJECT_DIR$/tests" />
-            <option value="$PROJECT_DIR$/tests/java-tests" />
-            <option value="$PROJECT_DIR$/tests/long-running-tests" />
-            <option value="$PROJECT_DIR$/tests/property-tests" />
-            <option value="$PROJECT_DIR$/tests/ui-fixtures" />
-            <option value="$PROJECT_DIR$/tests/ui-ij-tests" />
-            <option value="$PROJECT_DIR$/tests/ui-py-tests" />
-            <option value="$PROJECT_DIR$/tests/ui-rd-tests" />
-            <option value="$PROJECT_DIR$/vim-engine" />
-          </set>
-        </option>
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

.idea/misc.xml

@@ -18,5 +18,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" />
 </project>

.teamcity/_Self/Constants.kt

@@ -5,11 +5,13 @@ object Constants {
   const val EAP_CHANNEL = "eap"
   const val DEV_CHANNEL = "Dev"
 
-  const val NVIM_TESTS = "2025.1"
-  const val PROPERTY_TESTS = "2025.1"
-  const val LONG_RUNNING_TESTS = "2025.1"
-  const val RELEASE = "2025.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 = "2025.1"
-  const val RELEASE_EAP = "2025.1"
+  const val RELEASE_DEV = "2024.1.1"
+  const val RELEASE_EAP = "2024.1.1"
 }

.teamcity/_Self/Project.kt

@@ -5,8 +5,10 @@ import _Self.buildTypes.LongRunning
 import _Self.buildTypes.Nvim
 import _Self.buildTypes.PluginVerifier
 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
@@ -16,15 +18,15 @@ 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)
   vcsRoot(ReleasesVcsRoot)
 
   // Active tests
-  buildType(TestingBuildType("Latest EAP", version = "LATEST-EAP-SNAPSHOT"))
-  buildType(TestingBuildType("2025.1"))
+  buildType(TestingBuildType("Latest EAP", "<default>", version = "LATEST-EAP-SNAPSHOT"))
+  buildType(TestingBuildType("2024.1.1", "<default>"))
   buildType(TestingBuildType("Latest EAP With Xorg", "<default>", version = "LATEST-EAP-SNAPSHOT"))
 
   buildType(PropertyBased)
@@ -33,15 +35,14 @@ object Project : Project({
   buildType(Nvim)
   buildType(PluginVerifier)
   buildType(Compatibility)
+
+  buildType(Qodana)
 })
 
 // Common build type for all configurations
 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()
 
@@ -51,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")
   }
 

.teamcity/_Self/buildTypes/Compatibility.kt

@@ -20,7 +20,7 @@ object Compatibility : IdeaVimBuildType({
       name = "Load Verifier"
       scriptContent = """
         mkdir verifier1
-        curl -f -L -o verifier1/verifier-cli-dev-all-2.jar "https://packages.jetbrains.team/files/p/ideavim/plugin-verifier/verifier-cli-dev-all-2.jar"
+        curl -f -L -o verifier1/verifier-cli-dev-all-1.jar "https://packages.jetbrains.team/files/p/ideavim/plugin-verifier/verifier-cli-dev-all-1.jar"
       """.trimIndent()
     }
     script {
@@ -33,18 +33,13 @@ object Compatibility : IdeaVimBuildType({
               # Upload verifier-cli-dev-all.jar artifact to the repo in IdeaVim space repo
               
               java --version
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}org.jetbrains.IdeaVim-EasyMotion' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}IdeaVimExtension' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}org.jetbrains.IdeaVim-EasyMotion' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}IdeaVimExtension' [latest-IU] -team-city
               # Outdated java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}github.zgqq.intellij-enhance' [latest-IU] -team-city
-              # java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.julienphalip.ideavim.peekaboo' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.julienphalip.ideavim.switch' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.julienphalip.ideavim.functiontextobj' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.miksuki.HighlightCursor' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-2.jar check-plugin '${'$'}com.ugarosa.idea.edgemotion' [latest-IU] -team-city
+              # java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
             """.trimIndent()
     }
   }

.teamcity/_Self/buildTypes/CreateNewReleaseBranchFromMaster.kt

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2003-2024 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package _Self.buildTypes
+
+import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+
+object CreateNewReleaseBranchFromMaster : IdeaVimBuildType({
+  name = "EXP: Create new release branch from master"
+
+  vcs {
+    root(DslContext.settingsRoot)
+    branchFilter = "+:<default>"
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    script {
+      name = "Calculate next potential release version"
+      scriptContent = """
+        #!/bin/bash
+
+        # Fetch all remote branches
+        git fetch --all
+
+        # Get a list of all branches matching the pattern releases/x.y.z
+        branches=${'$'}(git branch -r | grep -oE 'releases/[0-9]+\.[0-9]+\.x')
+
+        # If no matching branches are found, print a message and exit
+        if [[ -z "${'$'}branches" ]]; then
+            echo "No release branches found"
+            exit 1
+        fi
+
+        # Find the largest release version
+        largest_release=${'$'}(echo "${'$'}branches" | sort -V | tail -n 1)
+
+        # Print the largest release
+        echo "Largest release branch: ${'$'}largest_release"
+        echo "##teamcity[setParameter name='env.POTENTIAL_VERSION' value='${'$'}largest_release']"
+      """.trimIndent()
+    }
+
+    script {
+      name = "Show potential release version"
+      scriptContent = """
+                #!/bin/bash
+                echo "Calculated or user-provided parameter value is: %env.POTENTIAL_VERSION%"
+            """.trimIndent()
+    }
+  }
+
+  params {
+    param("env.POTENTIAL_VERSION", "")
+  }
+
+  features {
+    sshAgent {
+      teamcitySshKey = "IdeaVim ssh keys"
+    }
+  }
+})

.teamcity/_Self/buildTypes/LongRunning.kt

@@ -28,7 +28,6 @@ object LongRunning : IdeaVimBuildType({
       tasks = "clean :tests:long-running-tests:testLongRunning"
       buildFile = ""
       enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.teamcity/_Self/buildTypes/Nvim.kt

@@ -18,7 +18,7 @@ object Nvim : IdeaVimBuildType({
     param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
     param("env.ORG_GRADLE_PROJECT_ideaVersion", NVIM_TESTS)
     param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
-    param("env.ideavim.nvim.path", "./nvim-linux-x86_64/bin/nvim")
+    param("env.ideavim.nvim.path", "./nvim-linux64/bin/nvim")
   }
 
   vcs {
@@ -32,9 +32,9 @@ object Nvim : IdeaVimBuildType({
     script {
       name = "Set up NeoVim"
       scriptContent = """
-              wget https://github.com/neovim/neovim/releases/download/nightly/nvim-linux-x86_64.tar.gz
-              tar xzf nvim-linux-x86_64.tar.gz
-              cd nvim-linux-x86_64/bin
+              wget https://github.com/neovim/neovim/releases/download/v0.7.2/nvim-linux64.tar.gz
+              tar xzf nvim-linux64.tar.gz
+              cd nvim-linux64/bin
               chmod +x nvim
               """.trimIndent()
     }
@@ -42,7 +42,6 @@ object Nvim : IdeaVimBuildType({
       tasks = "clean test -Dnvim"
       buildFile = ""
       enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.teamcity/_Self/buildTypes/PluginVerifier.kt

@@ -25,7 +25,6 @@ object PluginVerifier : IdeaVimBuildType({
       tasks = "clean verifyPlugin"
       buildFile = ""
       enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.teamcity/_Self/buildTypes/PrintReleaseBranch.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2003-2024 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package _Self.buildTypes
+
+import _Self.IdeaVimBuildType
+import _Self.vcsRoots.ReleasesVcsRoot
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+
+object PrintReleaseBranch : IdeaVimBuildType({
+  name = "EXP: Print release branch"
+
+  vcs {
+    root(ReleasesVcsRoot)
+    branchFilter = "+:heads/releases/*"
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+
+    script {
+      name = "Print current branch"
+      scriptContent = """
+                echo "Current branch is: %teamcity.build.branch%"
+            """.trimIndent()
+    }
+  }
+
+  features {
+    sshAgent {
+      teamcitySshKey = "IdeaVim ssh keys"
+    }
+  }
+})

.teamcity/_Self/buildTypes/PropertyBased.kt

@@ -24,11 +24,9 @@ object PropertyBased : IdeaVimBuildType({
 
   steps {
     gradle {
-      clearConditions()
       tasks = "clean :tests:property-tests:testPropertyBased"
       buildFile = ""
       enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.teamcity/_Self/buildTypes/PublishVimEngine.kt

@@ -36,7 +36,6 @@ object PublishVimEngine : IdeaVimBuildType({
       tasks = ":vim-engine:publish"
       buildFile = ""
       enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.teamcity/_Self/buildTypes/Qodana.kt

@@ -0,0 +1,80 @@
+package _Self.buildTypes
+
+import _Self.Constants.QODANA_TESTS
+import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.Qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object Qodana : IdeaVimBuildType({
+  name = "Qodana checks"
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", QODANA_TESTS)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+    branchFilter = "+:<default>"
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      name = "Generate grammar"
+      tasks = "generateGrammarSource"
+    }
+    qodana {
+      name = "Qodana"
+      param("clonefinder-languages", "")
+      param("collect-anonymous-statistics", "")
+      param("licenseaudit-enable", "")
+      param("clonefinder-languages-container", "")
+      param("linterVersion", "")
+      param("clonefinder-queried-project", "")
+      param("clonefinder-enable", "")
+      param("clonefinder-reference-projects", "")
+      linter = jvm {
+        version = Qodana.JVMVersion.LATEST
+      }
+      reportAsTests = true
+      additionalQodanaArguments = "--baseline qodana.sarif.json"
+      cloudToken = "credentialsJSON:6b79412e-9198-4862-9223-c5019488f903"
+    }
+  }
+
+  triggers {
+    vcs {
+      enabled = false
+      branchFilter = "+:<default>"
+    }
+    schedule {
+      schedulingPolicy = daily {
+        hour = 12
+        minute = 0
+        timezone = "SERVER"
+      }
+      param("dayOfWeek", "Sunday")
+    }
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      threshold = 0
+      units = BuildFailureOnMetric.MetricUnit.DEFAULT_UNIT
+      comparison = BuildFailureOnMetric.MetricComparison.MORE
+      compareTo = value()
+      metric = BuildFailureOnMetric.MetricType.TEST_FAILED_COUNT
+      param("metricKey", "QodanaProblemsNew")
+      enabled = false
+    }
+  }
+})

.teamcity/_Self/buildTypes/ReleaseDev.kt

@@ -47,16 +47,13 @@ object ReleaseDev : IdeaVimBuildType({
     gradle {
       name = "Calculate new dev version"
       tasks = "scripts:calculateNewDevVersion"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     gradle {
       name = "Set TeamCity build number"
       tasks = "scripts:setTeamCityBuildNumber"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     gradle {
       tasks = "publishPlugin"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.teamcity/_Self/buildTypes/ReleaseEap.kt

@@ -57,22 +57,18 @@ object ReleaseEap : IdeaVimBuildType({
     gradle {
       name = "Calculate new eap version"
       tasks = "scripts:calculateNewEapVersion"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     gradle {
       name = "Set TeamCity build number"
       tasks = "scripts:setTeamCityBuildNumber"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     gradle {
       name = "Add release tag"
       tasks = "scripts:addReleaseTag"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     gradle {
       name = "Publish plugin"
       tasks = "publishPlugin"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     script {
       name = "Push changes to the repo"
@@ -90,7 +86,6 @@ object ReleaseEap : IdeaVimBuildType({
     gradle {
       name = "YouTrack post release actions"
       tasks = "scripts:eapReleaseActions"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.teamcity/_Self/buildTypes/ReleaseEapFromBranch.kt

@@ -0,0 +1,106 @@
+package _Self.buildTypes
+
+import _Self.Constants.EAP_CHANNEL
+import _Self.Constants.RELEASE_EAP
+import _Self.IdeaVimBuildType
+import _Self.vcsRoots.ReleasesVcsRoot
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+
+object ReleaseEapFromBranch : IdeaVimBuildType({
+  name = "EXP: Publish EAP Build from branch"
+  description = "Build and publish EAP of IdeaVim plugin"
+
+  artifactRules = "build/distributions/*"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE_EAP)
+    password(
+      "env.ORG_GRADLE_PROJECT_publishToken",
+      "credentialsJSON:61a36031-4da1-4226-a876-b8148bf32bde",
+      label = "Password"
+    )
+    param("env.ORG_GRADLE_PROJECT_publishChannels", EAP_CHANNEL)
+    password(
+      "env.ORG_GRADLE_PROJECT_slackUrl",
+      "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
+      label = "Slack Token"
+    )
+    password(
+      "env.YOUTRACK_TOKEN",
+      "credentialsJSON:2479995b-7b60-4fbb-b095-f0bafae7f622",
+      display = ParameterDisplay.HIDDEN
+    )
+  }
+
+  vcs {
+    root(ReleasesVcsRoot)
+    branchFilter = """
+      +:heads/(releases/*)
+      """.trimIndent()
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    script {
+      name = "Pull git tags"
+      scriptContent = "git fetch --tags origin"
+    }
+    script {
+      name = "Pull git history"
+      scriptContent = "git fetch --unshallow"
+    }
+    gradle {
+      name = "Calculate new eap version from branch"
+      tasks = "scripts:calculateNewEapVersionFromBranch"
+    }
+    gradle {
+      name = "Set TeamCity build number"
+      tasks = "scripts:setTeamCityBuildNumber"
+    }
+    gradle {
+      name = "Add release tag"
+      tasks = "scripts:addReleaseTag"
+    }
+    gradle {
+      name = "Publish plugin"
+      tasks = "publishPlugin"
+    }
+    script {
+      name = "Push changes to the repo"
+      scriptContent = """
+      branch=$(git branch --show-current)
+      echo current branch is ${'$'}branch
+      git push origin %build.number%
+      """.trimIndent()
+    }
+    gradle {
+      name = "YouTrack post release actions"
+      tasks = "scripts:eapReleaseActions"
+    }
+  }
+
+  features {
+    sshAgent {
+      teamcitySshKey = "IdeaVim ssh keys"
+    }
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
+      threshold = 5
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.DIFF
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})

.teamcity/_Self/buildTypes/ReleasePlugin.kt

@@ -28,10 +28,7 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
   name = "Publish $releaseType release"
   description = "Build and publish IdeaVim plugin"
 
-  artifactRules = """
-        build/distributions/*
-        build/reports/*
-    """.trimIndent()
+  artifactRules = "build/distributions/*"
 
   params {
     param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE)
@@ -93,12 +90,10 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
     gradle {
       name = "Calculate new version"
       tasks = "scripts:calculateNewVersion"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     gradle {
       name = "Set TeamCity build number"
       tasks = "scripts:setTeamCityBuildNumber"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
 //    gradle {
 //      name = "Update change log"
@@ -111,7 +106,6 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
     gradle {
       name = "Add release tag"
       tasks = "scripts:addReleaseTag"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
     script {
       name = "Run tests"
@@ -120,7 +114,6 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
     gradle {
       name = "Publish release"
       tasks = "publishPlugin"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
 //    script {
 //      name = "Checkout master branch"
@@ -152,7 +145,6 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       name = "Run Integrations"
       tasks = "releaseActions"
       gradleParams = "--no-configuration-cache"
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
 //    gradle {
 //      name = "Slack Notification"

.teamcity/_Self/buildTypes/TestingBuildType.kt

@@ -12,7 +12,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
 
 open class TestingBuildType(
   private val testName: String,
-  private val branch: String = "<default>",
+  private val branch: String,
   private val version: String = testName,
   private val javaVersion: String? = null,
   private val javaPlugin: Boolean = true,
@@ -39,11 +39,9 @@ open class TestingBuildType(
 
   steps {
     gradle {
-      clearConditions()
       tasks = "clean test"
       buildFile = ""
       enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.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")
   }
 
@@ -42,7 +44,6 @@ class GithubBuildType(command: String, desc: String) : IdeaVimBuildType({
       tasks = command
       buildFile = ""
       enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }
 

.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))
+})

.teamcity/_Self/subprojects/Releases.kt

@@ -1,8 +1,11 @@
 package _Self.subprojects
 
+import _Self.buildTypes.CreateNewReleaseBranchFromMaster
+import _Self.buildTypes.PrintReleaseBranch
 import _Self.buildTypes.PublishVimEngine
 import _Self.buildTypes.ReleaseDev
 import _Self.buildTypes.ReleaseEap
+import _Self.buildTypes.ReleaseEapFromBranch
 import _Self.buildTypes.ReleaseMajor
 import _Self.buildTypes.ReleaseMinor
 import _Self.buildTypes.ReleasePatch
@@ -38,4 +41,8 @@ object Releases : Project({
   buildType(ReleaseEap)
   buildType(ReleaseDev)
   buildType(PublishVimEngine)
+
+  buildType(CreateNewReleaseBranchFromMaster)
+  buildType(PrintReleaseBranch)
+  buildType(ReleaseEapFromBranch)
 })

.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"
+        }
+    }
+}

.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/*"
+    }
+}

.teamcity/settings.kts

@@ -30,5 +30,5 @@ node (Plugins -> teamcity-configs -> teamcity-configs:generate),
 the 'Debug' option is available in the context menu for the task.
 */
 
-version = "2024.12"
+version = "2024.03"
 project(_Self.Project)

AUTHORS.md

@@ -26,13 +26,6 @@ Previous maintainers:
    
   Andrey Vlasovskikh
 
-Previous support members:
-
-* [![icon][mail]](mailto:lejia.chen@jetbrains.com)
-  [![icon][github-off]](#)
-   
-  Lejia Chen
-
 Contributors:
 
 * [![icon][mail]](mailto:yole@jetbrains.com)
@@ -505,7 +498,7 @@ Contributors:
 * [![icon][mail]](mailto:81118900+lippfi@users.noreply.github.com)
   [![icon][github]](https://github.com/lippfi)
    
-  lippfi
+  lippfi, 
 * [![icon][mail]](mailto:fillipser143@gmail.com)
   [![icon][github]](https://github.com/Parker7123)
    
@@ -521,7 +514,7 @@ Contributors:
 * [![icon][mail]](mailto:77796630+throwaway69420-69420@users.noreply.github.com)
   [![icon][github]](https://github.com/kun-codes)
    
-  Bishwa Saha
+  Bishwa Saha, 
 * [![icon][mail]](mailto:alexfu@fastmail.com)
   [![icon][github]](https://github.com/alexfu)
    
@@ -542,74 +535,6 @@ Contributors:
   [![icon][github]](https://github.com/igorbabko)
    
   Igor Babko
-* [![icon][mail]](mailto:533601+felixwiemuth@users.noreply.github.com)
-  [![icon][github]](https://github.com/felixwiemuth)
-   
-  Felix Wiemuth
-* [![icon][mail]](mailto:kirill.karnaukhov@jetbrains.com)
-  [![icon][github]](https://github.com/kkarnauk)
-   
-  Kirill Karnaukhov
-* [![icon][mail]](mailto:sander.hestvik@gmail.com)
-  [![icon][github]](https://github.com/SanderHestvik)
-   
-  SanderHestvik
-* [![icon][mail]](mailto:gregory.shrago@jetbrains.com)
-  [![icon][github]](https://github.com/gregsh)
-   
-  Greg Shrago
-* [![icon][mail]](mailto:jphalip@gmail.com)
-  [![icon][github]](https://github.com/jphalip)
-   
-  Julien Phalip
-* [![icon][mail]](mailto:j.trimailovas@gmail.com)
-  [![icon][github]](https://github.com/trimailov)
-   
-  Justas Trimailovas
-* [![icon][mail]](mailto:justast@wix.com)
-  [![icon][github]](https://github.com/justast-wix)
-   
-  Justas Trimailovas
-* [![icon][mail]](mailto:wangxinhe06@gmail.com)
-  [![icon][github]](https://github.com/wxh06)
-   
-  Xinhe Wang
-* [![icon][mail]](mailto:vladimir.parfinenko@jetbrains.com)
-  [![icon][github]](https://github.com/cypok)
-   
-  Vladimir Parfinenko
-* [![icon][mail]](mailto:sdoerner@google.com)
-  [![icon][github]](https://github.com/sdoerner)
-   
-  Sebastian Dörner
-* [![icon][mail]](mailto:ocordova@pulsarml.com)
-  [![icon][github]](https://github.com/oca159)
-   
-  Osvaldo
-* [![icon][mail]](mailto:nath@squareup.com)
-  [![icon][github]](https://github.com/nath)
-   
-  Nath Tumlin
-* [![icon][mail]](mailto:ilya.usov@jetbrains.com)
-  [![icon][github]](https://github.com/Iliya-usov)
-   
-  Ilya Usov
-* [![icon][mail]](mailto:peterHoburg@users.noreply.github.com)
-  [![icon][github]](https://github.com/peterHoburg)
-   
-  Peter Hoburg
-* [![icon][mail]](mailto:erotourtes@gmail.com)
-  [![icon][github]](https://github.com/erotourtes)
-   
-  Max Siryk
-* [![icon][mail]](mailto:ivan.yarkov@jetbrains.com)
-  [![icon][github]](https://github.com/MToolMakerJB)
-   
-  Ivan Yarkov
-* [![icon][mail]](mailto:mia.vucinic@jetbrains.com)
-  [![icon][github]](https://github.com/vumi19)
-   
-  Mia Vucinic
 
 Previous contributors:
 

CONTRIBUTING.md

@@ -1,50 +1,26 @@
 [![TeamCity Build][teamcity-build-status-svg]][teamcity-build-status]
 
-IdeaVim is an open source project created by 130+ contributors. Would you like to make it even better? That’s wonderful!
+IdeaVim is an open source project created by 80+ contributors. Would you like to make it even better? That’s wonderful!
 
 This page is created to help you start contributing. And who knows, maybe in a few days this project will be brighter than ever!
 
-# Awards for Quality Contributions
-
-In February 2025, we’re starting a program to award one-year All Products Pack subscriptions to the implementers of quality contributions to the IdeaVim project. The program will continue for all of 2025 and may be prolonged.
-
-Subscriptions can be awarded for merged pull requests that meet the following requirements:
-
-
-- The change should be non-trivial, though there might be exceptions — for example, where a trivial fix requires a complicated investigation.
-- The change should fully implement a feature or fix the root cause of a bug. Workarounds or hacks are not accepted.
-- If applicable, the change should be properly covered with unit tests.
-- The work should be performed by the contributor, though the IdeaVim team is happy to review it and give feedback.
-- The change should fix an issue or implement a feature filed by another user. If you want to file an issue and provide a solution to it, your request for a license should be explicitly discussed with the IdeaVim team in the ticket comments.
-
-
-We'd like to make sure this award program is helpful and fair. Since we just started it and still fine-tuning the details, the final say on giving licenses remains with the IdeaVim team and the requirements might evolve over time.
-
-
-Also, a few notes:
-
-
-- If you have any doubts about whether your change or fix is eligible for the award, get in touch with us in the comments on YouTrack or in any other way.
-- Please mention this program in the pull request text. This is not an absolute requirement, but it will help ensure we know you would like to be considered for an award, but this is not required.
-- During 2025, a single person may only receive a single subscription. Even if you make multiple contributions, you will not be eligible for multiple awards.
-- Any delays caused by the IdeaVim team will not affect eligibility for an award if the other requirements are met.
-- Draft pull requests will not be reviewed unless explicitly requested.
-- Tickets with the [ideavim-bounty](https://youtrack.jetbrains.com/issues?q=tag:%20%7BIdeaVim-bounty%7D) tag are good candidates for this award.
-
+:warning: The plugin is currently under a huge refactoring aiming to split into vim-engine and IdeaVim in order to
+support the new [Fleet IDE](https://www.jetbrains.com/fleet/). Please see [Fleet refactoring](#Fleet-refactoring).
 
 ## Before you begin
 
-- The project is primarily written in Kotlin with a few Java files. When contributing to the project, use Kotlin unless
-you’re working in areas where Java is explicitly used.
+- The project is written in Kotlin and Java. Choose whichever language you feel more comfortable with,
+or maybe one that you’d like to get to know better (why not start [learning Kotlin](https://kotlinlang.org/docs/tutorials/) right now?).
 
 - If you come across some IntelliJ Platform code, these links may prove helpful:
 
-    * [IntelliJ Platform SDK](https://plugins.jetbrains.com/docs/intellij/welcome.html)
-    * [IntelliJ architectural overview](https://plugins.jetbrains.com/docs/intellij/fundamentals.html)
-    * [IntelliJ Platform community space](https://platform.jetbrains.com/)
+    * [IntelliJ architectural overview](https://www.jetbrains.org/intellij/sdk/docs/platform/fundamentals.html)
+    * [IntelliJ plugin development resources](https://www.jetbrains.org/intellij/sdk/docs/welcome.html)
 
 - Having any difficulties?
-Ask any questions in [GitHub discussions](https://github.com/JetBrains/ideavim/discussions) or [IntelliJ Platform community space](https://platform.jetbrains.com/).
+Join the brand new
+[![Join the chat at https://gitter.im/JetBrains/ideavim](https://badges.gitter.im/JetBrains/ideavim.svg)](https://gitter.im/JetBrains/ideavim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+for IdeaVim developers and contributors! 
 
 OK, ready to do some coding?
 
@@ -106,7 +82,7 @@ If you are looking for:
 
 - Common features:
     - State machine. How every particular keystroke is parsed in IdeaVim: `KeyHandler.handleKey()`.
-    - Options (`incsearch`, `iskeyword`, `relativenumber`): `VimOptionGroup`.
+    - Options (`incsearch`, `iskeyword`, `relativenumber`): `OptionServiceImpl`.
     - Plugin startup: `PluginStartup`.
     - Notifications: `NotificationService`.
     - Status bar icon: `StatusBar.kt`.
@@ -134,7 +110,7 @@ Cras id tellus in ex imperdiet egestas.
 carets, dollar motion, etc.
    
 ##### Neovim
-IdeaVim has an integration with neovim in tests. Tests that are performed with `doTest` also executed in
+IdeaVim has an experimental integration with neovim in tests. Tests that are performed with `doTest` also executed in
 neovim instance, and the state of IdeaVim is asserted to be the same as the state of neovim.
 - Only tests that use `doTest` are checked with neovim.
 - Tests with `@VimBehaviorDiffers` or `@TestWithoutNeovim` annotations don't use neovim.
@@ -160,15 +136,14 @@ We also support proper command mappings (functions are mapped to `<Plug>...`), t
 - Magic is supported as well. See `Magic`.
 
 
-## Fleet
-
-The IdeaVim plugin is divided into two main modules: IdeaVim and vim-engine.
-IdeaVim serves as a plugin for JetBrains IDEs, while vim-engine is an IntelliJ Platform-independent Vim engine.
-This engine is utilized in both the Vim plugin for Fleet and IdeaVim.
+## Fleet refactoring
+At the moment, IdeaVim is under an active refactoring aiming to split IdeaVim into two modules: vim-engine and IdeaVim.
 
 If you develop a plugin that depends on IdeaVim: We have an instrument to check that our changes don't affect
-the plugins in the marketplace.
+the plugins in the marketplace. Also, we commit to support currently used API at least till the end of 2022.
 If you still encounter any issues with the newer versions of IdeaVim, please [contact maintainers](https://github.com/JetBrains/ideavim#contact-maintainers).
+We kindly ask you not to use anything from the new API (like `VimEditor`, `injector`) because at the moment we don't
+guarantee the compatibility of this API in the future versions.
 
 
 -----
@@ -191,7 +166,6 @@ This is just terrible. [You know what to do](https://github.com/JetBrains/ideavi
 
 * [Continuous integration builds](https://ideavim.teamcity.com/)
 * [Bug tracker](https://youtrack.jetbrains.com/issues/VIM)
-* [IntelliJ Platform community space](https://platform.jetbrains.com/)
 * [Chat on gitter](https://gitter.im/JetBrains/ideavim)
 * [IdeaVim Channel](https://jb.gg/bi6zp7) on [JetBrains Server](https://discord.gg/jetbrains)
 * [Plugin homepage](https://plugins.jetbrains.com/plugin/164-ideavim)

README.md

@@ -29,7 +29,7 @@ IdeaVim is a Vim engine for JetBrains IDEs.
 
 #### Compatibility
 
-IntelliJ IDEA, PyCharm, CLion, PhpStorm, WebStorm, RubyMine, DataGrip, GoLand, Rider, Cursive,
+IntelliJ IDEA, PyCharm, CLion, PhpStorm, WebStorm, RubyMine, AppCode, DataGrip, GoLand, Rider, Cursive,
 Android Studio and other IntelliJ platform based IDEs.
 
 Setup
@@ -85,33 +85,27 @@ Here are some examples of supported vim features and commands:
 * Motion / deletion / change / window / etc. commands
 * Key mappings
 * Marks / Macros / Digraphs / Registers
-* Some [set commands](https://github.com/JetBrains/ideavim/wiki/set-commands)
+* Some [set commands](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands)
 * Full Vim regexps for search and search/replace
 * Vim web help
 * `~/.ideavimrc` configuration file
 
 [IdeaVim plugins](https://github.com/JetBrains/ideavim/wiki/IdeaVim-Plugins):
 
-* argtextobj
-* commentary
-* easymotion
-* exchange
-* FunctionTextObj
-* highlightedyank
-* indent-object
-* matchit.vim
-* Mini.ai
-* multiple-cursors
+* vim-easymotion
 * NERDTree
-* paragraph-motion
-* Peekaboo
-* quick-scope
+* vim-surround
+* vim-multiple-cursors
+* vim-commentary
+* argtextobj.vim
+* vim-textobj-entire
 * ReplaceWithRegister
-* sneak
-* surround
-* Switch
-* textobj-entire
-* Which-Key
+* vim-exchange
+* vim-highlightedyank
+* vim-paragraph-motion
+* vim-indent-object
+* match.it  
+etc
 
 See also:
 
@@ -315,9 +309,7 @@ endif
 
 The power of contributing drives IdeaVim :muscle:. Even small contributions matter!
 
-See the contribution guide in [CONTRIBUTING.md](CONTRIBUTING.md) to start bringing your value to the project.
-
-😎 In 2025, we launched a rewards program. See the guide for details.
+See [CONTRIBUTING.md](CONTRIBUTING.md) to start bringing your value to the project.
 
 Authors
 -------
@@ -332,11 +324,11 @@ IdeaVim tips and tricks
     - `set ideajoin` to enable join via the IDE. See the [examples](https://jb.gg/f9zji9).
     - Make sure `ideaput` is enabled for `clipboard` to enable native IJ insertion in Vim.
     - Sync IJ bookmarks and IdeaVim global marks: `set ideamarks` (works for marks with capital letters only)
-    - Check out more [ex commands](https://github.com/JetBrains/ideavim/wiki/set-commands).
+    - Check out more [ex commands](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands).
 
 - Use your vim settings with IdeaVim. Put `source ~/.vimrc` in `~/.ideavimrc`.
-- Control the status bar icon via the [`ideastatusicon` option](https://github.com/JetBrains/ideavim/wiki/set-commands).
-- Not familiar with the default behaviour during a refactoring? See the [`idearefactormode` option](https://github.com/JetBrains/ideavim/wiki/set-commands).
+- Control the status bar icon via the [`ideastatusicon` option](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands).
+- Not familiar with the default behaviour during a refactoring? See the [`idearefactormode` option](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands).
 
 Some facts about Vim
 -------
@@ -378,12 +370,6 @@ is the full list of synonyms.
 
 - Vi (not Vim) is a POSIX standard, and [has a spec](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/vi.html)! Vim is mostly POSIX compliant when Vi compatibility is selected with the `'compatible'` option, but there are still some differences that can be changed with `'copoptions'`. The spec is interesting because it documents the behaviour of different commands in a stricter style than the user documentation, describing the current line and column after the command, for example. [More details can be found by reading `:help posix`](https://vimhelp.org/vi_diff.txt.html#posix).
 
-- The Vim documentation contains many easter eggs. We encounter them occasionally, but GitHub user mikesmithgh has compiled a substantial collection [here](https://github.com/mikesmithgh/vimpromptu).
-  - In addition to `:call err_teapot()`, which returns `E418: I'm a teapot`, there is also `:call err_teapot(1)`, which returns `E503: Coffee is currently not available`. Naturally, this is also supported in IdeaVim.
-
-- Insert mode has all `Ctrl` keys mapped, except `Ctrl-B`. In the documentation, it is marked as **"CTRL-B in Insert
-  mode gone"**. Call `:h i_CTRL-B-gone` in Vim to read why `Ctrl-B` was removed.
-
 License
 -------
 

annotation-processors/build.gradle.kts

@@ -8,7 +8,7 @@
 
 plugins {
   kotlin("jvm")
-  kotlin("plugin.serialization") version "2.0.21"
+  kotlin("plugin.serialization") version "2.0.0"
 }
 
 val kotlinxSerializationVersion: String by project
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.1")
+  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")

build.gradle.kts

@@ -31,7 +31,6 @@ import kotlinx.serialization.json.putJsonObject
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.RepositoryBuilder
 import org.intellij.markdown.ast.getTextInNode
-import org.intellij.markdown.ast.impl.ListCompositeNode
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.tasks.aware.SplitModeAware
@@ -46,19 +45,19 @@ buildscript {
   }
 
   dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
     classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
     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.2.0.202503040940-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.1.3")
-    classpath("io.ktor:ktor-client-cio:3.1.3")
-    classpath("io.ktor:ktor-client-auth:3.1.3")
-    classpath("io.ktor:ktor-client-content-negotiation:3.1.3")
-    classpath("io.ktor:ktor-serialization-kotlinx-json:3.1.3")
+    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")
@@ -67,19 +66,14 @@ buildscript {
 
 plugins {
   java
-  kotlin("jvm") version "2.0.21"
+  kotlin("jvm") version "2.0.0"
   application
   id("java-test-fixtures")
-
-  // NOTE: Unignore "test block comment falls back to line comment when not available" test
-  //   After changing this version. It supposed to work on the next version of the gradle plugin
-  //   Or go report to the devs that this test still fails.
-  id("org.jetbrains.intellij.platform") version "2.5.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.1"
-  id("com.google.devtools.ksp") version "2.0.21-1.0.25"
+  id("com.dorongold.task-tree") version "4.0.0"
+  id("com.google.devtools.ksp") version "2.0.0-1.0.23"
 }
 
 val moduleSources by configurations.registering
@@ -91,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
@@ -113,33 +108,24 @@ dependencies {
   compileOnly(project(":annotation-processors"))
 
   compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-  compileOnly("org.jetbrains:annotations:26.0.2")
+  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
-    var useInstaller = "EAP-SNAPSHOT" !in ideaVersion
-    if (ideaType == "RD") {
-      // Using Rider as a target IntelliJ Platform with `useInstaller = true` is currently not supported, please set `useInstaller = false` instead. See: https://github.com/JetBrains/intellij-platform-gradle-plugin/issues/1852
-      useInstaller = false
-    }
-
     // 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()
+    instrumentationTools()
 
     testFramework(TestFrameworkType.Platform)
     testFramework(TestFrameworkType.JUnit5)
 
     // AceJump is an optional dependency. We use their SessionManager class to check if it's active
     plugin("AceJump", "3.8.19")
-    plugin("com.intellij.classic.ui", "251.23774.318")
-
-    bundledPlugins("org.jetbrains.plugins.terminal", "com.intellij.modules.json")
+    plugin("com.intellij.classic.ui", "242.20224.159")
   }
 
   moduleSources(project(":vim-engine", "sourcesJarArtifacts"))
@@ -161,17 +147,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.12.2")
-  testImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2")
-  testImplementation("org.junit.jupiter:junit-jupiter-params:5.12.2")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:5.12.2")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-engine:5.12.2")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-params:5.12.2")
+  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.12.2")
+  testImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
 //  testFixturesImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
 }
 
@@ -181,19 +167,6 @@ configurations {
   }
 }
 
-val currentJavaVersion = javaToolchains.launcherFor {}.get().metadata.languageVersion.toString()
-if (currentJavaVersion != javaVersion) {
-  // NOTE: I made this exception because the default Gradle error message is horrible, noone can understand it.
-  throw RuntimeException(
-    """
-    Incorrect java version used for building.
-    IdeaVim uses java version $javaVersion, but the current java version is $currentJavaVersion.
-    If IntelliJ IDEA is used, change the setting in "Settings | Build, Execution, Deployment | Build Tools | Gradle"
-    If build is run from the terminal, set JAVA_HOME environment variable to the correct java version.
-  """.trimIndent()
-  )
-}
-
 tasks {
   test {
     useJUnitPlatform()
@@ -207,11 +180,6 @@ tasks {
     }
 
     systemProperty("ideavim.nvim.test", System.getProperty("nvim") ?: false)
-
-    // This removes all localization plugins from the test version of IJ.
-    // There is a bug that IJ for tests may be loaded with a different locale and some keys may be missing there,
-    //   what breaks the tests. This usually happens in EAP versions of IJ.
-    classpath -= classpath.filter { it.name.startsWith("localization-") && it.name.endsWith(".jar") }
   }
 
   compileJava {
@@ -229,7 +197,7 @@ tasks {
       jvmTarget = javaVersion
       // See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
       // For the list of bundled versions
-      apiVersion = "2.0"
+      apiVersion = "1.9"
       freeCompilerArgs = listOf(
         "-Xjvm-default=all-compatibility",
 
@@ -247,7 +215,7 @@ tasks {
     
     kotlinOptions {
       jvmTarget = javaVersion
-      apiVersion = "2.0"
+      apiVersion = "1.9"
 
       // Needed to compile the AceJump which uses kotlin beta
       //  Without these two option compilation fails
@@ -260,12 +228,10 @@ tasks {
   // a custom task (see below)
   runIde {
     systemProperty("octopus.handler", System.getProperty("octopus.handler") ?: true)
-    systemProperty("idea.trust.all.projects", "true")
   }
 
   // Uncomment to run the plugin in a custom IDE, rather than the IDE specified as a compile target in dependencies
   // Note that the version must be greater than the plugin's target version, for obvious reasons
-  // 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"
@@ -298,6 +264,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
@@ -345,7 +315,9 @@ intellijPlatform {
     name = "IdeaVim"
     changeNotes.set(
       """
-        We’ve launched a program to reward quality contributions with a one-year All Products Pack subscription. Learn more at: <a href="https://github.com/JetBrains/ideavim/blob/master/CONTRIBUTING.md">CONTRIBUTING.md</a> .
+        Undo in IdeaVim now works like in Vim<br/>
+        Caret movement is no longer a separate undo step, and full insert is undoable in one step.<br/>
+        <a href="https://youtrack.jetbrains.com/issue/VIM-547/Undo-splits-Insert-mode-edits-into-separate-undo-chunks">Share Feedback</a>
         <br/>
         <br/>
         <a href="https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20Fix%20versions:%20${version.get()}">Changelog</a>
@@ -833,9 +805,7 @@ fun updateAuthors(uncheckedEmails: Set<String>) {
     org.intellij.markdown.parser.MarkdownParser(org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor())
   val tree = parser.buildMarkdownTreeFromString(authors)
 
-  val contributorsSection = tree.children
-    .filter { it is ListCompositeNode }
-    .single { it.getTextInNode(authors).contains("yole") }
+  val contributorsSection = tree.children[24]
   val existingEmails = mutableSetOf<String>()
   for (child in contributorsSection.children) {
     if (child.children.size > 1) {
@@ -858,7 +828,7 @@ fun updateAuthors(uncheckedEmails: Set<String>) {
 }
 
 fun List<Author>.toMdString(): String {
-  return this.joinToString(separator = "") {
+  return this.joinToString {
     """
           |
           |* [![icon][mail]](mailto:${it.mail})

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)

doc/IdeaVim Plugins.md

@@ -16,95 +16,10 @@ in `~/.ideavimrc`. E.g. `set nosurround`.
 Available plugins:
 
 <details>
-<summary><h2>argtextobj: Provides a text-object 'a' argument</h2></summary>
-
-Original plugin: [argtextobj.vim](https://www.vim.org/scripts/script.php?script_id=2699).
-
-### Summary:
-This plugin provides a text-object 'a' (argument). 
-You can d(elete), c(hange), v(select)... an argument or inner argument in familiar ways.
-
-That is, such as 'daa'(delete-an-argument) 'cia'(change-inner-argument) 'via'(select-inner-argument).
-What this script does is more than just typing
-
-F,dt,
-
-because it recognizes inclusion relationship of parentheses.
-
-### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'vim-scripts/argtextobj.vim'`
-    <details>
-      <summary>Alternative syntax</summary>
-      <code>Plugin 'vim-scripts/argtextobj.vim'</code>
-      <br/>
-      <code>Plug 'https://github.com/vim-scripts/argtextobj.vim'</code>
-      <br/>
-      <code>Plug 'argtextobj.vim'</code>
-      <br/>
-      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=2699'</code>
-      <br/>
-      <code>set argtextobj</code>
-      </details>
-
-### Instructions
-
-By default, only the arguments inside parenthesis are considered. To extend the functionality
-to other types of brackets, set `g:argtextobj_pairs` variable to a comma-separated
-list of colon-separated pairs (same as VIM's `matchpairs` option), like
-`let g:argtextobj_pairs="(:),{:},<:>"`. The order of pairs matters when
-handling symbols that can also be operators: `func(x << 5, 20) >> 17`. To handle
-this syntax parenthesis, must come before angle brackets in the list.
-
-https://www.vim.org/scripts/script.php?script_id=2699
-
-</details>
-
-<details>
-<summary><h2>commentary: Adds mapping for quickly commenting stuff out</h2></summary>
-
-By [Daniel Leong](https://github.com/dhleong)  
-Original plugin: [commentary.vim](https://github.com/tpope/vim-commentary).
-
-### Summary:
-Comment stuff out. 
-Use gcc to comment out a line (takes a count), gc to comment out the target of a motion 
-(for example, gcap to comment out a paragraph), gc in visual mode to comment out the selection, 
-and gc in operator pending mode to target a comment. 
-You can also use it as a command, either with a range like :7,17Commentary, 
-or as part of a :global invocation like with :g/TODO/Commentary. 
-That's it.
-
-### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'tpope/vim-commentary'`
-    <details>
-      <summary>Alternative syntax</summary>
-      <code>Plugin 'tpope/vim-commentary'</code>
-      <br/>
-      <code>Plug 'https://github.com/tpope/vim-commentary'</code>
-      <br/>
-      <code>Plug 'vim-commentary'</code>
-      <br/>
-      <code>Plug 'tcomment_vim'</code>
-      <br/>
-      <code>set commentary</code>
-      </details>
-
-### Instructions
-
-https://github.com/tpope/vim-commentary/blob/master/doc/commentary.txt
-
-</details>
-
-<details>
-<summary><h2>easymotion: Simplifies some motions</h2></summary>
+<summary><h2>easymotion</h2></summary>
    
 Original plugin: [vim-easymotion](https://github.com/easymotion/vim-easymotion).
-
-### Summary:
-EasyMotion provides a much simpler way to use some motions in vim. 
-It takes the \<number> out of \<number>w or \<number>f{char} by highlighting all possible choices 
-and allowing you to press one key to jump directly to the target.
-
+   
 ### Setup:
 - Install [IdeaVim-EasyMotion](https://plugins.jetbrains.com/plugin/13360-ideavim-easymotion/)
       and [AceJump](https://plugins.jetbrains.com/plugin/7086-acejump/) plugins.
@@ -126,176 +41,80 @@ All commands with the mappings are supported. See the [full list of supported co
 
 </details>
 
+
 <details>
-<summary><h2>exchange: Easy text exchange operator</h2></summary>
+<summary><h2>sneak</h2></summary>
 
-By [fan-tom](https://github.com/fan-tom)  
-Original plugin: [vim-exchange](https://github.com/tommcdo/vim-exchange).
-
-### Summary:
-Easy text exchange operator for Vim.
+<img src="images/sneakIcon.svg" width="80" height="80" alt="icon"/>  
 
+By [Mikhail Levchenko](https://github.com/Mishkun)  
+Original repository with the plugin: https://github.com/Mishkun/ideavim-sneak  
+Original plugin: [vim-sneak](https://github.com/justinmk/vim-sneak).
+   
 ### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'tommcdo/vim-exchange'`
+- Add the following command to `~/.ideavimrc`: `Plug 'justinmk/vim-sneak'`
+   
+### Instructions
+
+* Type `s` and two chars to start sneaking in forward direction
+* Type `S` and two chars to start sneaking in backward direction
+* Type `;` or `,` to proceed with sneaking just as if you were using `f` or `t` commands
+
+</details>
+
+<details>
+<summary><h2>NERDTree</h2></summary>
+   
+Original plugin: [NERDTree](https://github.com/preservim/nerdtree).
+   
+### Setup:
+- Add the following command to `~/.ideavimrc`: `Plug 'preservim/nerdtree'`
     <details>
       <summary>Alternative syntax</summary>
-      <code>Plugin 'tommcdo/vim-exchange'</code>
+      <code>Plugin 'preservim/nerdtree'</code>
       <br/>
-      <code>Plug 'https://github.com/tommcdo/vim-exchange'</code>
+      <code>Plug 'https://github.com/preservim/nerdtree'</code>
       <br/>
-      <code>Plug 'vim-exchange'</code>
+      <code>Plug 'nerdtree'</code>
       <br/>
-      <code>set exchange</code>
+      <code>set NERDTree</code>
       </details>
-
+   
 ### Instructions
-
-https://github.com/tommcdo/vim-exchange/blob/master/doc/exchange.txt
+   
+[See here](NERDTree-support).
 
 </details>
 
 <details>
-<summary><h2>FunctionTextObj: Adds text objects for manipulating functions/methods</h2></summary>
-
-By Julien Phalip
-
-### Summary:
-An extension for IdeaVim that adds text objects for manipulating functions/methods in your code. 
-Similar to how iw operates on words or i" operates on quoted strings, 
-this plugin provides if and af to operate on functions
-
-### 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>highlightedyank: Highlights the yanked region</h2></summary>
-
-By [KostkaBrukowa](https://github.com/KostkaBrukowa)  
-Original plugin: [vim-highlightedyank](https://github.com/machakann/vim-highlightedyank).
-
-### Summary:
-Make the yanked region apparent!
-
+<summary><h2>surround</h2></summary>
+   
+Original plugin: [vim-surround](https://github.com/tpope/vim-surround).
+   
 ### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'machakann/vim-highlightedyank'`
+- Add the following command to `~/.ideavimrc`: `Plug 'tpope/vim-surround'`
     <details>
       <summary>Alternative syntax</summary>
-      <code>Plugin 'machakann/vim-highlightedyank'</code>
+      <code>Plugin 'tpope/vim-surround'</code>
       <br/>
-      <code>Plug 'https://github.com/machakann/vim-highlightedyank'</code>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=1697'</code>
       <br/>
-      <code>Plug 'vim-highlightedyank'</code>
+      <code>Plug 'vim-surround'</code>
       <br/>
-      <code>set highlightedyank</code>
+      <code>set surround</code>
       </details>
-
+   
 ### Instructions
-
-If you want to optimize highlight duration, assign a time in milliseconds:  
-`let g:highlightedyank_highlight_duration = "1000"`  
-A negative number makes the highlight persistent.
-
-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
+   
+https://github.com/tpope/vim-surround/blob/master/doc/surround.txt
 
 </details>
 
 <details>
-<summary><h2>indent-object: Adds text objects for manipulating sentences/paragraphs/etc...</h2></summary>
-
-By [Shrikant Sharat Kandula](https://github.com/sharat87)  
-Original plugin: [vim-indent-object](https://github.com/michaeljsmith/vim-indent-object).
-
-### Summary:
-Vim text objects provide a convenient way to select and operate on various types of objects. 
-These objects include regions surrounded by various types of brackets and various parts of language 
-(ie sentences, paragraphs, etc).
-
-### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'michaeljsmith/vim-indent-object'`
-    <details>
-      <summary>Alternative syntax</summary>
-      <code>Plugin 'michaeljsmith/vim-indent-object'</code>
-      <br/>
-      <code>Plug 'https://github.com/michaeljsmith/vim-indent-object'</code>
-      <br/>
-      <code>Plug 'vim-indent-object'</code>
-      <br/>
-      <code>set textobj-indent</code>
-      </details>
-
-### Instructions
-
-https://github.com/michaeljsmith/vim-indent-object/blob/master/doc/indent-object.txt
-
-</details>
-
-<details>
-<summary><h2>matchit.vim: Extends the % key functionality</h2></summary>
-
-By [Martin Yzeiri](https://github.com/myzeiri)
-Original plugin: [matchit.vim](https://github.com/chrisbra/matchit).
-
-### Summary:
-In Vim, as in plain vi, the percent key, |%|, jumps the cursor from a brace, bracket, or paren to its match. 
-This can be configured with the 'matchpairs' option. 
-The matchit plugin extends this in several ways...
-
-### Setup:
-- Add the following command to `~/.ideavimrc`: `packadd matchit`
-    <details>
-      <summary>Alternative syntax</summary>
-      <code>Plug 'vim-matchit'</code>
-      <br/>
-      <code>Plug 'chrisbra/matchit'</code>
-      <br/>
-      <code>set matchit</code>
-      </details>
-
-### Instructions
-
-https://github.com/adelarsq/vim-matchit/blob/master/doc/matchit.txt
-
-</details>
-
-<details>
-<summary><h2>Mini.ai: Extend and create a/i textobjects (IMPORTANT: The plugin is not related with artificial intelligence)</h2></summary>
-
-### Summary:
-Extend and create a/i textobjects
-
-### Features:
-Provides additional text object motions for handling quotes and brackets. The following motions are included:
-
-- aq: Around any quotes.
-- iq: Inside any quotes.
-- ab: Around any parentheses, curly braces, and square brackets.
-- ib: Inside any parentheses, curly braces, and square brackets.
-
-Original plugin: [mini.ai](https://github.com/echasnovski/mini.ai).
-
-### Setup:
-- Add the following command to `~/.ideavimrc`: `set mini-ai`
-
-</details>
-
-<details>
-<summary><h2>multiple-cursors: Extends multicursor support</h2></summary>
-
+<summary><h2>multiple-cursors</h2></summary>
+   
 Original plugin: [vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors).
-
+   
 ### Setup:
 - Add the following command to `~/.ideavimrc`: `Plug 'terryma/vim-multiple-cursors'`
     <details>
@@ -308,7 +127,7 @@ Original plugin: [vim-multiple-cursors](https://github.com/terryma/vim-multiple-
       <br/>
       <code>set multiple-cursors</code>
       </details>
-
+   
 ### Instructions
 
 At the moment, the default key binds for this plugin do not get mapped correctly in IdeaVim (see [VIM-2178](https://youtrack.jetbrains.com/issue/VIM-2178)). To enable the default key binds, add the following to your `.ideavimrc` file...
@@ -334,118 +153,38 @@ xmap <leader>g<C-n> <Plug>AllOccurrences
 </details>
 
 <details>
-<summary><h2>NERDTree: Adds NERDTree navigation to the project panel</h2></summary>
-   
-Original plugin: [NERDTree](https://github.com/preservim/nerdtree).
+<summary><h2>commentary</h2></summary>
 
-### Summary:
-Adds NERDTree navigation to the project panel. 
+By [Daniel Leong](https://github.com/dhleong)  
+Original plugin: [commentary.vim](https://github.com/tpope/vim-commentary).
    
 ### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'preservim/nerdtree'`
+- Add the following command to `~/.ideavimrc`: `Plug 'tpope/vim-commentary'`
     <details>
       <summary>Alternative syntax</summary>
-      <code>Plugin 'preservim/nerdtree'</code>
+      <code>Plugin 'tpope/vim-commentary'</code>
       <br/>
-      <code>Plug 'https://github.com/preservim/nerdtree'</code>
+      <code>Plug 'https://github.com/tpope/vim-commentary'</code>
       <br/>
-      <code>Plug 'nerdtree'</code>
+      <code>Plug 'vim-commentary'</code>
       <br/>
-      <code>set NERDTree</code>
+      <code>Plug 'tcomment_vim'</code>
+      <br/>
+      <code>set commentary</code>
       </details>
    
 ### Instructions
    
-[See here](NERDTree-support.md).
+https://github.com/tpope/vim-commentary/blob/master/doc/commentary.txt
 
 </details>
 
 <details>
-<summary><h2>paragraph-motion: Extends the { and } motions to ignore whitespace on otherwise empty lines</h2></summary>
-
-Original plugin: [vim-paragraph-motion](https://github.com/dbakker/vim-paragraph-motion).
-
-### Summary:
-Normally the { and } motions only match completely empty lines. 
-With this plugin lines that only contain whitespace are also matched.
-
-### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'dbakker/vim-paragraph-motion'`
-    <details>
-      <summary>Alternative syntax</summary>
-      <code>Plugin 'dbakker/vim-paragraph-motion'</code>
-      <br/>
-      <code>Plug 'https://github.com/dbakker/vim-paragraph-motion'</code>
-      <br/>
-      <code>Plug 'vim-paragraph-motion'</code>
-      <br/>
-      <code>Plug 'https://github.com/vim-scripts/Improved-paragraph-motion'</code>
-      <br/>
-      <code>Plug 'vim-scripts/Improved-paragraph-motion'</code>
-      <br/>
-      <code>Plug 'Improved-paragraph-motion'</code>
-      <br/>
-      <code>set vim-paragraph-motion</code>
-      </details>
-
-### Instructions
-
-https://github.com/dbakker/vim-paragraph-motion#vim-paragraph-motion
-
-</details>
-
-<details>
-<summary><h2>Peekaboo: Extends " @ CTRL-r to show a popup of the register contents</h2></summary>
-
-By Julien Phalip  
-Original plugin: [vim-peekaboo](https://github.com/junegunn/vim-peekaboo).
-
-### Summary:
-Peekaboo extends " and @ in normal mode and <CTRL-R> in insert mode so you can see the contents of the registers.
-
-### 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>quick-scope: Always-on highlight for a unique character in every word on a line to help use f, F, etc.</h2></summary>
-
-Original plugin: [quick-scope](https://github.com/unblevable/quick-scope).
-
-### Summary:
-An always-on highlight for a unique character in every word on a line to help you use f, F and family.
-
-This plugin should help you get to any word on a line in two or three keystrokes with Vim's built-in f<char> 
-(which moves your cursor to <char>).
-
-### Setup:
-- Install [IdeaVim-Quickscope](https://plugins.jetbrains.com/plugin/19417-ideavim-quickscope) plugin.
-- Add the following command to `~/.ideavimrc`: `set quickscope`
-
-### Instructions
-
-https://plugins.jetbrains.com/plugin/19417-ideavim-quickscope
-
-</details>
-
-<details>
-<summary><h2>ReplaceWithRegister: Adds two-in-one command that replaces text with the contents of a register.</h2></summary>
-
+<summary><h2>ReplaceWithRegister</h2></summary>
+   
 By [igrekster](https://github.com/igrekster)  
 Original plugin: [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister).
-
-### Summary:
-This plugin offers a two-in-one command that replaces text covered by a
-{motion}, entire line(s) or the current selection with the contents of a
-register; the old text is deleted into the black-hole register, i.e. it's
-gone. (But of course, the command can be easily undone.)
-
+   
 ### Setup:
 - Add the following command to `~/.ideavimrc`: `Plug 'vim-scripts/ReplaceWithRegister'`
     <details>
@@ -464,99 +203,78 @@ gone. (But of course, the command can be easily undone.)
       <br/>
       <code>set ReplaceWithRegister</code>
       </details>
-
+   
 ### Instructions
-
+   
 https://github.com/vim-scripts/ReplaceWithRegister/blob/master/doc/ReplaceWithRegister.txt
 
 </details>
 
 <details>
-<summary><h2>sneak: Jump to any location specified by two characters</h2></summary>
+<summary><h2>argtextobj</h2></summary>
 
-<img src="images/sneakIcon.svg" width="80" height="80" alt="icon"/>  
-
-By [Mikhail Levchenko](https://github.com/Mishkun)  
-Original repository with the plugin: https://github.com/Mishkun/ideavim-sneak  
-Original plugin: [vim-sneak](https://github.com/justinmk/vim-sneak).
-
-### Summary:
-Jump to any location specified by two characters.
-
-### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'justinmk/vim-sneak'`
-
-### Instructions
-
-* Type `s` and two chars to start sneaking in forward direction
-* Type `S` and two chars to start sneaking in backward direction
-* Type `;` or `,` to proceed with sneaking just as if you were using `f` or `t` commands
-
-</details>
-
-<details>
-<summary><h2>surround: Adds provides mappings to easily delete, change, and add surroundings in pairs</h2></summary>
+Original plugin: [argtextobj.vim](https://www.vim.org/scripts/script.php?script_id=2699).
    
-Original plugin: [vim-surround](https://github.com/tpope/vim-surround).
-   
-### Summary:
-Surround.vim is all about "surroundings": parentheses, brackets, quotes, XML tags, and more. 
-The plugin provides mappings to easily delete, change and add such surroundings in pairs.
-
 ### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'tpope/vim-surround'`
+- Add the following command to `~/.ideavimrc`: `Plug 'vim-scripts/argtextobj.vim'`
     <details>
       <summary>Alternative syntax</summary>
-      <code>Plugin 'tpope/vim-surround'</code>
+      <code>Plugin 'vim-scripts/argtextobj.vim'</code>
       <br/>
-      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=1697'</code>
+      <code>Plug 'https://github.com/vim-scripts/argtextobj.vim'</code>
       <br/>
-      <code>Plug 'vim-surround'</code>
+      <code>Plug 'argtextobj.vim'</code>
       <br/>
-      <code>set surround</code>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=2699'</code>
+      <br/>
+      <code>set argtextobj</code>
       </details>
    
 ### Instructions
    
-https://github.com/tpope/vim-surround/blob/master/doc/surround.txt
+By default, only the arguments inside parenthesis are considered. To extend the functionality
+      to other types of brackets, set `g:argtextobj_pairs` variable to a comma-separated
+      list of colon-separated pairs (same as VIM's `matchpairs` option), like
+      `let g:argtextobj_pairs="(:),{:},<:>"`. The order of pairs matters when
+      handling symbols that can also be operators: `func(x << 5, 20) >> 17`. To handle
+      this syntax parenthesis, must come before angle brackets in the list.
+   
+https://www.vim.org/scripts/script.php?script_id=2699
 
 </details>
+   
 
 <details>
-<summary><h2>Switch: Switch some text under the cursor based on regex patterns</h2></summary>
-
-By Julien Phalip  
-Original plugin: [switch.vim](https://github.com/AndrewRadev/switch.vim).
-
-### Summary:
-The purpose of the plugin is to switch some text under the cursor based on regex patterns. 
-The main entry point is a single command, :Switch. 
-When the command is executed, 
-the plugin looks for one of a few specific patterns under the cursor and performs a substitution depending on it. 
-
-### Setup
-
-Add `set switch` to your `~/.ideavimrc` file, then run `:source ~/.ideavimrc`
-or restart the IDE.
+<summary><h2>exchange</h2></summary>
 
+By [fan-tom](https://github.com/fan-tom)  
+Original plugin: [vim-exchange](https://github.com/tommcdo/vim-exchange).
+   
+### Setup:
+- Add the following command to `~/.ideavimrc`: `Plug 'tommcdo/vim-exchange'`
+    <details>
+      <summary>Alternative syntax</summary>
+      <code>Plugin 'tommcdo/vim-exchange'</code>
+      <br/>
+      <code>Plug 'https://github.com/tommcdo/vim-exchange'</code>
+      <br/>
+      <code>Plug 'vim-exchange'</code>
+      <br/>
+      <code>set exchange</code>
+      </details>
+   
 ### Instructions
-
-https://plugins.jetbrains.com/plugin/25899-vim-switch
+   
+https://github.com/tommcdo/vim-exchange/blob/master/doc/exchange.txt
 
 </details>
-
+   
 <details>
-<summary><h2>textobj-entire: Adds mapping for selecting entire contents of file regardless of cursor position</h2></summary>
+<summary><h2>textobj-entire</h2></summary>
 
 By [Alexandre Grison](https://github.com/agrison)  
 Original plugin: [vim-textobj-entire](https://github.com/kana/vim-textobj-entire).
    
-### Summary:
-vim-textobj-entire is a Vim plugin to provide text objects 
-(ae and ie by default) to select the entire content of a buffer. 
-Though these are trivial operations (e.g. ggVG), text object versions are more handy, 
-because you do not have to be conscious of the cursor position (e.g. vae).
-
 ### Setup:
 - Add the following command to `~/.ideavimrc`: `Plug 'kana/vim-textobj-entire'`
     <details>
@@ -577,13 +295,137 @@ https://github.com/kana/vim-textobj-entire/blob/master/doc/textobj-entire.txt
 </details>
    
 <details>
-<summary><h2>Which-Key: Displays available keybindings in popup</h2></summary>
+<summary><h2>highlightedyank</h2></summary>
+
+By [KostkaBrukowa](https://github.com/KostkaBrukowa)  
+Original plugin: [vim-highlightedyank](https://github.com/machakann/vim-highlightedyank).
+   
+### Setup:
+- Add the following command to `~/.ideavimrc`: `Plug 'machakann/vim-highlightedyank'`
+    <details>
+      <summary>Alternative syntax</summary>
+      <code>Plugin 'machakann/vim-highlightedyank'</code>
+      <br/>
+      <code>Plug 'https://github.com/machakann/vim-highlightedyank'</code>
+      <br/>
+      <code>Plug 'vim-highlightedyank'</code>
+      <br/>
+      <code>set highlightedyank</code>
+      </details>
+   
+### Instructions
+   
+If you want to optimize highlight duration, assign a time in milliseconds:  
+      `let g:highlightedyank_highlight_duration = "1000"`  
+      A negative number makes the highlight persistent.  
+   
+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)"`
+   
+https://github.com/machakann/vim-highlightedyank/blob/master/doc/highlightedyank.txt
+
+</details>
+
+<details>
+<summary><h2>vim-paragraph-motion</h2></summary>
+
+Original plugin: [vim-paragraph-motion](https://github.com/dbakker/vim-paragraph-motion).
+   
+### Setup:
+- Add the following command to `~/.ideavimrc`: `Plug 'dbakker/vim-paragraph-motion'`
+    <details>
+      <summary>Alternative syntax</summary>
+      <code>Plugin 'dbakker/vim-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'https://github.com/dbakker/vim-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'vim-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'https://github.com/vim-scripts/Improved-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'vim-scripts/Improved-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'Improved-paragraph-motion'</code>
+      <br/>
+      <code>set vim-paragraph-motion</code>
+      </details>
+   
+### Instructions
+   
+https://github.com/dbakker/vim-paragraph-motion#vim-paragraph-motion
+
+</details>
+   
+<details>
+<summary><h2>vim-indent-object</h2></summary>
+
+By [Shrikant Sharat Kandula](https://github.com/sharat87)  
+Original plugin: [vim-indent-object](https://github.com/michaeljsmith/vim-indent-object).
+   
+### Setup:
+- Add the following command to `~/.ideavimrc`: `Plug 'michaeljsmith/vim-indent-object'`
+    <details>
+      <summary>Alternative syntax</summary>
+      <code>Plugin 'michaeljsmith/vim-indent-object'</code>
+      <br/>
+      <code>Plug 'https://github.com/michaeljsmith/vim-indent-object'</code>
+      <br/>
+      <code>Plug 'vim-indent-object'</code>
+      <br/>
+      <code>set textobj-indent</code>
+      </details>
+   
+### Instructions
+   
+https://github.com/michaeljsmith/vim-indent-object/blob/master/doc/indent-object.txt
+
+</details>
+   
+   
+<details>
+<summary><h2>matchit.vim</h2></summary>
+
+By [Martin Yzeiri](https://github.com/myzeiri)
+Original plugin: [matchit.vim](https://github.com/chrisbra/matchit).
+   
+### Setup:
+- Add the following command to `~/.ideavimrc`: `packadd matchit`
+    <details>
+      <summary>Alternative syntax</summary>
+      <code>Plug 'vim-matchit'</code>
+      <br/>
+      <code>Plug 'chrisbra/matchit'</code>
+      <br/>
+      <code>set matchit</code>
+      </details>
+   
+### Instructions
+   
+https://github.com/adelarsq/vim-matchit/blob/master/doc/matchit.txt
+
+</details>
+
+<details>
+<summary><h2>IdeaVim-Quickscope</h2></summary>
+
+Original plugin: [quick-scope](https://github.com/unblevable/quick-scope).
+
+### Setup:
+- Install [IdeaVim-Quickscope](https://plugins.jetbrains.com/plugin/19417-ideavim-quickscope) plugin.
+- Add the following command to `~/.ideavimrc`: `set quickscope`
+
+### Instructions
+
+https://plugins.jetbrains.com/plugin/19417-ideavim-quickscope
+
+</details>
+
+
+<details>
+<summary><h2>Which-Key</h2></summary>
 
 Original plugin: [vim-which-key](https://github.com/liuchengxu/vim-which-key).
 
-### Summary:
-vim-which-key is vim port of emacs-which-key that displays available keybindings in popup.
-
 ### Setup:
 - Install [Which-Key](https://plugins.jetbrains.com/plugin/15976-which-key) plugin.
 - Add the following command to `~/.ideavimrc`: `set which-key`

doc/posts/Some-Facts-About-Vim.md

@@ -1,44 +0,0 @@
-# Some facts about Vim
-
-Let’s relax and have some fun now! Here are a few things we've found interesting during development
-and would like to share with you.
-
-- There are no such commands as `dd`, `yy`, or `cc`. For example, `dd` is not a separate command for deleting the line,
-  but a `d` command with a `d` motion.  
-  Wait, but there isn't a `d` motion in Vim! That’s right, and that’s why Vim has a dedicated set of commands
-  for which it checks whether the
-  [command equals to motion](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/normal.c#L6468)
-  and if so, it executes `_` motion instead.  
-  `_` is an interesting motion that isn't even documented in vi, and it refers to the current line.
-  So, commands like `dd`, `yy`, and similar ones are simply translated to `d_`, `y_`, etc.
-  [Here](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/normal.c#L6502)
-  is the source of this knowledge.
-
-- `x`, `D`, and `&` are not separate commands either. They are synonyms of `dl`, `d$`, and `:s\r`, respectively.
-  [Here](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/normal.c#L5365)
-  is the full list of synonyms.
-
-- You can read a [post](https://github.com/JetBrains/ideavim/wiki/how-many-modes-does-vim-have) about how modes work in Vim and IdeaVim.
-
-- Have you ever used `U` after `dd`? [Don't even try](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/ops.c#L874).
-
-- A lot of variables that refer to visual mode start with two uppercase letters, e.g. `VIsual_active`. [Some examples](https://github.com/vim/vim/blob/master/src/normal.c#L17).
-  As mentioned [here](https://vi.stackexchange.com/a/42885/12441), this was done this way to avoid the clash with X11.
-
-- Other [strange things](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/ex_docmd.c#L1845) from vi:
-    * ":3"       jumps to line 3
-    * ":3|..."   prints line 3
-    * ":|"       prints current line
-
-- Vim script doesn't skip white space before comma. `F(a ,b)` => E475.
-
-- Fancy constants for [undolevels](https://vimhelp.org/options.txt.html#%27undolevels%27):
-  > The local value is set to -123456 when the global value is to be used.
-
-- Vi (not Vim) is a POSIX standard, and [has a spec](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/vi.html)! Vim is mostly POSIX compliant when Vi compatibility is selected with the `'compatible'` option, but there are still some differences that can be changed with `'copoptions'`. The spec is interesting because it documents the behaviour of different commands in a stricter style than the user documentation, describing the current line and column after the command, for example. [More details can be found by reading `:help posix`](https://vimhelp.org/vi_diff.txt.html#posix).
-
-- The Vim documentation contains many easter eggs. We encounter them occasionally, but GitHub user mikesmithgh has compiled a substantial collection [here](https://github.com/mikesmithgh/vimpromptu).
-    - In addition to `:call err_teapot()`, which returns `E418: I'm a teapot`, there is also `:call err_teapot(1)`, which returns `E503: Coffee is currently not available`. Naturally, this is also supported in IdeaVim.
-
-- Insert mode has all `Ctrl` keys mapped, except `Ctrl-B`. In the documentation, it is marked as **"CTRL-B in Insert
-  mode gone"**. Call `:h i_CTRL-B-gone` in Vim to read why `Ctrl-B` was removed.

doc/set-commands.md

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

doc/support-guide.md

@@ -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

gradle.properties

@@ -16,19 +16,25 @@
 # 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=2025.1
+ideaVersion=2024.2
 # Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 ideaType=IC
 instrumentPluginCode=true
-version=chylex-47
-javaVersion=21
+version=chylex-40
+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
-kotlinVersion=2.0.21
+kotlinVersion=2.0.0
 publishToken=token
 publishChannels=eap
 
@@ -48,5 +54,3 @@ kotlin.stdlib.default.dependency=false
 
 # Disable incremental annotation processing
 ksp.incremental=false
-# KSP2 is used with java 21: https://github.com/google/ksp/issues/740#issuecomment-2313498615
-ksp.useKSP2=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -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,8 +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\n' "$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
@@ -147,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
@@ -155,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
@@ -204,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" \

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
 

qodana.yaml

@@ -0,0 +1,30 @@
+version: 1.0
+profile:
+  name: Qodana
+include:
+  - name: CheckDependencyLicenses
+exclude:
+  - name: MoveVariableDeclarationIntoWhen
+  - name: PluginXmlValidity
+  - name: RedundantThrows
+  - name: SuperTearDownInFinally
+  - name: UnusedReturnValue
+  - name: All
+    paths:
+      - build.gradle.kts
+      - gradle/wrapper/gradle-wrapper.properties
+      - src/main/resources/icons/youtrack.svg
+      - src/main/java/com/maddyhome/idea/vim/helper/SearchHelper.java
+      - src/main/java/com/maddyhome/idea/vim/regexp/RegExp.kt
+      - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/JavaText.kt
+      - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/LoremText.kt
+      - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/SimpleText.kt
+      - vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
+      - vim-engine/src/main/java/com/maddyhome/idea/vim/parser/generated
+      - src/main/java/com/maddyhome/idea/vim/group/SearchGroup.java
+      - tests/ui-fixtures
+dependencyIgnores:
+  - name: "acejump"
+  - name: "icu4j"
+  - name: "antlr-runtime"
+  - name: "javax.json"

scripts/build.gradle.kts

@@ -20,17 +20,17 @@ repositories {
 }
 
 dependencies {
-  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:2.1.21")
+  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.25")
 
-  implementation("io.ktor:ktor-client-core:3.1.3")
-  implementation("io.ktor:ktor-client-cio:3.1.3")
-  implementation("io.ktor:ktor-client-content-negotiation:3.1.3")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:3.1.3")
-  implementation("io.ktor:ktor-client-auth:3.1.3")
+  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.2.0.202503040940-r")
+  implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.10.0.202406032230-r")
   implementation("com.vdurmont:semver4j:3.1.0")
 }
 
@@ -107,6 +107,13 @@ tasks.register("calculateNewEapVersion", JavaExec::class) {
   args = listOf("${rootProject.rootDir}")
 }
 
+tasks.register("calculateNewEapVersionFromBranch", JavaExec::class) {
+  group = "release"
+  mainClass.set("scripts.release.CalculateNewEapVersionFromBranchKt")
+  classpath = sourceSets["main"].runtimeClasspath
+  args = listOf("${rootProject.rootDir}")
+}
+
 tasks.register("calculateNewDevVersion", JavaExec::class) {
   group = "release"
   mainClass.set("scripts.release.CalculateNewDevVersionKt")

scripts/src/main/kotlin/scripts/checkNewPluginDependencies.kt

@@ -40,11 +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
-  "com.miksuki.HighlightCursor", // https://plugins.jetbrains.com/plugin/26743-highlightcursor
-  "com.ugarosa.idea.edgemotion", // https://plugins.jetbrains.com/plugin/27211-edgemotion
 )
 
 suspend fun main() {

scripts/src/main/kotlin/scripts/release/calculateNewEapVersionFromBranch.kt

@@ -0,0 +1,49 @@
+/*
+ * 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 scripts.release
+
+fun main(args: Array<String> ) {
+  val projectDir = args[0]
+  println("Working directory: $projectDir")
+  val branch = withRepo(projectDir) { it.branch }
+  val (majorBranchVersion, minorBranchVersion) = versions(branch)
+  val versions = getVersionsExistingVersionsFor(majorBranchVersion, minorBranchVersion, projectDir)
+  val maxExistingVersion = versions.keys.maxOrNull()
+
+  val nextVersion = if (maxExistingVersion != null) {
+    if (maxExistingVersion.suffixTokens.isEmpty()) {
+      maxExistingVersion.nextPatch().withSuffix("eap.1").value
+    }
+    else {
+      check(maxExistingVersion.suffixTokens.size == 2) {
+        "We should have exactly two suffix tokens. Current tokens: ${maxExistingVersion.suffixTokens.toList()}"
+      }
+      check(maxExistingVersion.suffixTokens[0] == "eap") {
+        "First suffix token must be eap. Current tokens: ${maxExistingVersion.suffixTokens.toList()}"
+      }
+
+      val newEapNumber = maxExistingVersion.suffixTokens[1].toInt().inc()
+      maxExistingVersion.withSuffix("eap.$newEapNumber").value
+    }
+  } else {
+    "$majorBranchVersion.$minorBranchVersion.0-eap.1"
+  }
+
+
+  println("Next eap version: $nextVersion")
+  println("##teamcity[setParameter name='env.ORG_GRADLE_PROJECT_version' value='$nextVersion']")
+}
+
+private val regex = "releases/(\\d+)\\.(\\d+)\\.x".toRegex()
+private fun versions(branchName: String): Pair<Int, Int> {
+  val match = regex.matchEntire(branchName) ?: error("Cannot match branch: $branchName")
+  val major = match.groups[1]
+  val minor = match.groups[2]
+  return major!!.value.toInt() to minor!!.value.toInt()
+}

settings.gradle.kts

@@ -19,4 +19,3 @@ include("tests:long-running-tests")
 include("tests:ui-ij-tests")
 include("tests:ui-py-tests")
 include("tests:ui-fixtures")
-include("tests:ui-rd-tests")

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

@@ -8,11 +8,6 @@
 
 package com.maddyhome.idea.vim
 
-import com.intellij.ide.BrowserUtil
-import com.intellij.ide.plugins.IdeaPluginDescriptor
-import com.intellij.ide.plugins.InstalledPluginsState
-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
@@ -22,7 +17,6 @@ import com.intellij.openapi.updateSettings.impl.UpdateSettings
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.newapi.IjVimEditor
-import com.maddyhome.idea.vim.newapi.IjVimEnabler
 import com.maddyhome.idea.vim.newapi.globalIjOptions
 import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.ui.JoinEap
@@ -35,38 +29,17 @@ 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
 
-    if (!VimPlugin.getVimState().wasSubscribedToEAPAutomatically && ApplicationManager.getApplication().isEAP && !JoinEap.eapActive()) {
-      VimPlugin.getVimState().wasSubscribedToEAPAutomatically = true
+    if (!VimPlugin.getVimState().wasSubscibedToEAPAutomatically && ApplicationManager.getApplication().isEAP && !JoinEap.eapActive()) {
+      VimPlugin.getVimState().wasSubscibedToEAPAutomatically = true
       UpdateSettings.getInstance().storedPluginHosts += EAP_LINK
     }
 
     // This code should be executed once
     VimPlugin.getInstance().initialize()
-
-    (injector.enabler as IjVimEnabler).ideOpened()
-
-    // Uninstall survey. Should be registered once for all projects
-    PluginStateManager.addStateListener(object : PluginStateListener {
-      override fun install(p0: IdeaPluginDescriptor) {/*Nothing*/
-      }
-
-      override fun uninstall(descriptor: IdeaPluginDescriptor) {
-        val pluginId = VimPlugin.getPluginId()
-        // This event is called for both uninstall and update. There is no proper way to distinguish these two events.
-        // In order not to show the form for the update, we check if the new version is available. If so,
-        //   this may be an update (and may not), and we don't show the form.
-        if (descriptor.pluginId == pluginId && !InstalledPluginsState.getInstance().hasNewerVersion(pluginId)) {
-          BrowserUtil.open("https://jb.gg/z6c7db")
-        }
-      }
-    })
   }
 }
 

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() {
@@ -215,8 +217,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
 
     if (enabled) {
       VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOn();
-    }
-    else {
+    } else {
       VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOff();
     }
 
@@ -338,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();
@@ -355,12 +354,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     if (unsubscribe) {
       VimListenerManager.INSTANCE.turnOff();
     }
-    // Use getServiceIfCreated to avoid creating the service during the dispose (this is prohibited by the platform)
-    @Nullable VimCommandLineService service =
-      ApplicationManager.getApplication().getServiceIfCreated(VimCommandLineService.class);
-    if (service != null) {
-      service.fullReset();
-    }
+    injector.getCommandLine().fullReset();
 
     // Unregister vim actions in command mode
     RegisterActions.unregisterActions();
@@ -376,7 +370,8 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     if (isEnabled() && !ApplicationManager.getApplication().isUnitTestMode()) {
       stateUpdated = true;
       if (SystemInfo.isMac) {
-        final Boolean enabled = MacKeyRepeat.INSTANCE.isEnabled();
+        final MacKeyRepeat keyRepeat = MacKeyRepeat.getInstance();
+        final Boolean enabled = keyRepeat.isEnabled();
         final Boolean isKeyRepeat = getEditor().isKeyRepeat();
         if ((enabled == null || !enabled) && (isKeyRepeat == null || isKeyRepeat)) {
           // This system property is used in IJ ui robot to hide the startup tips
@@ -386,7 +381,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
           if (showNotification) {
             if (VimPlugin.getNotifications().enableRepeatingMode() == Messages.YES) {
               getEditor().setKeyRepeat(true);
-              MacKeyRepeat.INSTANCE.setEnabled(true);
+              keyRepeat.setEnabled(true);
             }
             else {
               getEditor().setKeyRepeat(false);

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

@@ -44,12 +44,7 @@ class VimTypedActionHandler(origHandler: TypedActionHandler) : TypedActionHandle
     LOG.trace("Before execute for typed action")
     if (editor.isIdeaVimDisabledHere) {
       LOG.trace("IdeaVim disabled here, finish")
-      (KeyHandlerKeeper.getInstance().originalHandler as? TypedActionHandlerEx)?.beforeExecute(
-        editor,
-        charTyped,
-        context,
-        plan
-      )
+      (KeyHandlerKeeper.getInstance().originalHandler as? TypedActionHandlerEx)?.beforeExecute(editor, charTyped, context, plan)
       return
     }
 

src/main/java/com/maddyhome/idea/vim/action/VimShortcutKeyAction.kt

@@ -8,23 +8,19 @@
 package com.maddyhome.idea.vim.action
 
 import com.google.common.collect.ImmutableSet
-import com.intellij.codeInsight.completion.CompletionService
 import com.intellij.codeInsight.lookup.LookupManager
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.AnActionWrapper
-import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.application.invokeLater
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.impl.EditorComponentImpl
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.util.Key
-import com.intellij.openapi.util.registry.Registry
 import com.intellij.ui.KeyStrokeAdapter
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
@@ -45,6 +41,7 @@ import com.maddyhome.idea.vim.helper.updateCaretsVisualAttributes
 import com.maddyhome.idea.vim.key.ShortcutOwner
 import com.maddyhome.idea.vim.key.ShortcutOwnerInfo
 import com.maddyhome.idea.vim.listener.AceJumpService
+import com.maddyhome.idea.vim.listener.AppCodeTemplates.appCodeTemplateCaptured
 import com.maddyhome.idea.vim.newapi.globalIjOptions
 import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.newapi.vim
@@ -91,9 +88,9 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
         keyHandler.handleKey(editor.vim, keyStroke, e.dataContext.vim, keyHandler.keyHandlerState)
         if (start != null) {
           val duration = System.currentTimeMillis() - start
-          LOG.info("VimShortcut execution '$keyStroke': $duration ms")
+          LOG.info("VimShortcut update '$keyStroke': $duration ms")
         }
-      } catch (_: ProcessCanceledException) {
+      } catch (ignored: ProcessCanceledException) {
         // Control-flow exceptions (like ProcessCanceledException) should never be logged
         // See {@link com.intellij.openapi.diagnostic.Logger.checkException}
       } catch (throwable: Throwable) {
@@ -119,127 +116,115 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
   }
 
   private fun isEnabled(e: AnActionEvent, keyStroke: KeyStroke?): ActionEnableStatus {
-    if (keyStroke == null) return ActionEnableStatus.no("Keystroke is null", LogLevel.DEBUG)
     if (VimPlugin.isNotEnabled()) return ActionEnableStatus.no("IdeaVim is disabled", LogLevel.DEBUG)
-    val editor = getEditor(e) ?: return ActionEnableStatus.no("Can't get Editor", LogLevel.DEBUG)
-
-    if (enableOctopus) {
-      if (isOctopusEnabled(keyStroke, editor)) {
-        return ActionEnableStatus.no(
-          "Processing VimShortcutKeyAction for the key that is used in the octopus handler",
-          LogLevel.ERROR
-        )
+    val editor = getEditor(e)
+    if (editor != null && keyStroke != null) {
+      if (enableOctopus) {
+        if (isOctopusEnabled(keyStroke, editor)) {
+          return ActionEnableStatus.no(
+            "Processing VimShortcutKeyAction for the key that is used in the octopus handler",
+            LogLevel.ERROR
+          )
+        }
       }
-    }
-
-    if (e.dataContext.isNotSupportedContextComponent && Registry.`is`("ideavim.only.in.editor.component")) {
-      // Note: Currently, IdeaVim works ONLY in the editor & ExTextField component. However, the presence of the
-      //   PlatformDataKeys.EDITOR in the data context does not mean that the current focused component is editor.
-      // Note2: The registry key is needed for quick disabling in case something gets broken. It can be removed after
-      //   some time if no issues are found.
-      return ActionEnableStatus.no("Context component is not editor", LogLevel.INFO)
-    }
-
-    if (editor.isIdeaVimDisabledHere) {
-      return ActionEnableStatus.no("IdeaVim is disabled in this place", LogLevel.INFO)
-    }
-
-    // Workaround for smart step into
-    @Suppress("DEPRECATION", "LocalVariableName", "VariableNaming")
-    val SMART_STEP_INPLACE_DATA = Key.findKeyByName("SMART_STEP_INPLACE_DATA")
-    if (SMART_STEP_INPLACE_DATA != null && editor.getUserData(SMART_STEP_INPLACE_DATA) != null) {
-      LOG.trace("Do not execute shortcut because of smart step")
-      return ActionEnableStatus.no("Smart step into is active", LogLevel.INFO)
-    }
-
-    val keyCode = keyStroke.keyCode
-
-    if (HandlerInjector.notebookCommandMode(editor)) {
-      LOG.debug("Python Notebook command mode")
-      if (keyCode == KeyEvent.VK_RIGHT || keyCode == KeyEvent.VK_KP_RIGHT || keyCode == KeyEvent.VK_ENTER) {
-        invokeLater { editor.updateCaretsVisualAttributes() }
+      if (editor.isIdeaVimDisabledHere) {
+        return ActionEnableStatus.no("IdeaVim is disabled in this place", LogLevel.INFO)
       }
-      return ActionEnableStatus.no("Python notebook is in command mode", LogLevel.INFO)
-    }
-
-    if (AceJumpService.getInstance()?.isActive(editor) == true) {
-      return ActionEnableStatus.no("AceJump is active", LogLevel.INFO)
-    }
-
-    if (LookupManager.getActiveLookup(editor) != null && !LookupKeys.isEnabledForLookup(keyStroke)) {
-      return ActionEnableStatus.no("Lookup keys are active", LogLevel.INFO)
-    }
-
-    if (keyCode == KeyEvent.VK_ESCAPE) {
-      return if (isEnabledForEscape(editor)) {
-        ActionEnableStatus.yes("Is enabled for Esc", LogLevel.INFO)
-      } else {
-        ActionEnableStatus.no("Is disabled for Esc", LogLevel.INFO)
-      }
-    }
-
-    if (keyCode == KeyEvent.VK_TAB && editor.isTemplateActive()) {
-      return ActionEnableStatus.no("The key is tab and the template is active", LogLevel.INFO)
-    }
-
-    if (editor.inInsertMode) {
-      if (keyCode == KeyEvent.VK_TAB) {
-        // TODO: This stops VimEditorTab seeing <Tab> in insert mode and correctly scrolling the view
-        // There are multiple actions registered for VK_TAB. The important items, in order, are this, the Live
-        // Templates action and TabAction. Returning false in insert mode means that the Live Template action gets to
-        // execute, and this allows Emmet to work (VIM-674). But it also means that the VimEditorTab handle is never
-        // called, so we can't scroll the caret into view correctly.
-        // If we do return true, VimEditorTab handles the Vim side of things and then invokes
-        // IdeActions.ACTION_EDITOR_TAB, which inserts the tab. It also bypasses the Live Template action, and Emmet
-        // no longer works.
-        // This flag is used when recording text entry/keystrokes for repeated insertion. Because we return false and
-        // don't execute the VimEditorTab handler, we don't record tab as an action. Instead, we see an incoming text
-        // change of multiple whitespace characters, which is normally ignored because it's auto-indent content from
-        // hitting <Enter>. When this flag is set, we record the whitespace as the output of the <Tab>
-        VimPlugin.getChange().tabAction = true
-        return ActionEnableStatus.no("Tab action in insert mode", LogLevel.INFO)
-      }
-      // Debug watch, Python console, etc.
-      if (keyStroke in NON_FILE_EDITOR_KEYS && !EditorHelper.isFileEditor(editor)) {
-        return ActionEnableStatus.no("Non file editor keys", LogLevel.INFO)
-      }
-    }
-
-    if (keyStroke in VIM_ONLY_EDITOR_KEYS) {
-      return ActionEnableStatus.yes("Vim only editor keys", LogLevel.INFO)
-    }
-
-    if (CompletionService.getCompletionService().currentCompletion != null) {
-      return ActionEnableStatus.no("Code completion active", LogLevel.INFO)
-    }
-    
-    val savedShortcutConflicts = VimPlugin.getKey().savedShortcutConflicts
-    val info = savedShortcutConflicts[keyStroke]
-    return when (info?.forEditor(editor.vim)) {
-      ShortcutOwner.VIM -> {
-        ActionEnableStatus.yes("Owner is vim", LogLevel.DEBUG)
+      // Workaround for smart step into
+      @Suppress("DEPRECATION", "LocalVariableName", "VariableNaming")
+      val SMART_STEP_INPLACE_DATA = Key.findKeyByName("SMART_STEP_INPLACE_DATA")
+      if (SMART_STEP_INPLACE_DATA != null && editor.getUserData(SMART_STEP_INPLACE_DATA) != null) {
+        LOG.trace("Do not execute shortcut because of smart step")
+        return ActionEnableStatus.no("Smart step into is active", LogLevel.INFO)
       }
 
-      ShortcutOwner.IDE -> {
-        if (!isShortcutConflict(keyStroke)) {
-          ActionEnableStatus.yes("Owner is IDE, but no actionve shortcut conflict", LogLevel.DEBUG)
+      val keyCode = keyStroke.keyCode
+
+      if (HandlerInjector.notebookCommandMode(editor)) {
+        LOG.debug("Python Notebook command mode")
+        if (keyCode == KeyEvent.VK_RIGHT || keyCode == KeyEvent.VK_KP_RIGHT || keyCode == KeyEvent.VK_ENTER) {
+          invokeLater { editor.updateCaretsVisualAttributes() }
+        }
+        return ActionEnableStatus.no("Python notebook is in command mode", LogLevel.INFO)
+      }
+
+      if (AceJumpService.getInstance()?.isActive(editor) == true) {
+        return ActionEnableStatus.no("AceJump is active", LogLevel.INFO)
+      }
+
+      if (LookupManager.getActiveLookup(editor) != null && !LookupKeys.isEnabledForLookup(keyStroke)) {
+        return ActionEnableStatus.no("Lookup keys are active", LogLevel.INFO)
+      }
+
+      if (keyCode == KeyEvent.VK_ESCAPE) {
+        return if (isEnabledForEscape(editor)) {
+          ActionEnableStatus.yes("Is enabled for Esc", LogLevel.INFO)
         } else {
-          ActionEnableStatus.no("Owner is IDE", LogLevel.DEBUG)
+          ActionEnableStatus.no("Is disabled for Esc", LogLevel.INFO)
         }
       }
 
-      else -> {
-        if (isShortcutConflict(keyStroke)) {
-          savedShortcutConflicts[keyStroke] = ShortcutOwnerInfo.allUndefined
+      if (keyCode == KeyEvent.VK_TAB && editor.isTemplateActive()) {
+        return ActionEnableStatus.no("The key is tab and the template is active", LogLevel.INFO)
+      }
+
+      if ((keyCode == KeyEvent.VK_TAB || keyCode == KeyEvent.VK_ENTER) && editor.appCodeTemplateCaptured()) {
+        return ActionEnableStatus.no("App code template is active", LogLevel.INFO)
+      }
+
+      if (editor.inInsertMode) {
+        if (keyCode == KeyEvent.VK_TAB) {
+          // TODO: This stops VimEditorTab seeing <Tab> in insert mode and correctly scrolling the view
+          // There are multiple actions registered for VK_TAB. The important items, in order, are this, the Live
+          // Templates action and TabAction. Returning false in insert mode means that the Live Template action gets to
+          // execute, and this allows Emmet to work (VIM-674). But it also means that the VimEditorTab handle is never
+          // called, so we can't scroll the caret into view correctly.
+          // If we do return true, VimEditorTab handles the Vim side of things and then invokes
+          // IdeActions.ACTION_EDITOR_TAB, which inserts the tab. It also bypasses the Live Template action, and Emmet
+          // no longer works.
+          // This flag is used when recording text entry/keystrokes for repeated insertion. Because we return false and
+          // don't execute the VimEditorTab handler, we don't record tab as an action. Instead, we see an incoming text
+          // change of multiple whitespace characters, which is normally ignored because it's auto-indent content from
+          // hitting <Enter>. When this flag is set, we record the whitespace as the output of the <Tab>
+          VimPlugin.getChange().tabAction = true
+          return ActionEnableStatus.no("Tab action in insert mode", LogLevel.INFO)
+        }
+        // Debug watch, Python console, etc.
+        if (keyStroke in NON_FILE_EDITOR_KEYS && !EditorHelper.isFileEditor(editor)) {
+          return ActionEnableStatus.no("Non file editor keys", LogLevel.INFO)
+        }
+      }
+
+      if (keyStroke in VIM_ONLY_EDITOR_KEYS) {
+        return ActionEnableStatus.yes("Vim only editor keys", LogLevel.INFO)
+      }
+
+      val savedShortcutConflicts = VimPlugin.getKey().savedShortcutConflicts
+      val info = savedShortcutConflicts[keyStroke]
+      return when (info?.forEditor(editor.vim)) {
+        ShortcutOwner.VIM -> {
+          return ActionEnableStatus.yes("Owner is vim", LogLevel.DEBUG)
+        }
+        ShortcutOwner.IDE -> {
+          if (!isShortcutConflict(keyStroke)) {
+            ActionEnableStatus.yes("Owner is IDE, but no actionve shortcut conflict", LogLevel.DEBUG)
+          } else {
+            ActionEnableStatus.no("Owner is IDE", LogLevel.DEBUG)
+          }
+        }
+        else -> {
+          if (isShortcutConflict(keyStroke)) {
+            savedShortcutConflicts[keyStroke] = ShortcutOwnerInfo.allUndefined
+          }
+          ActionEnableStatus.yes("Enable vim for shortcut without owner", LogLevel.DEBUG)
         }
-        ActionEnableStatus.yes("Enable vim for shortcut without owner", LogLevel.DEBUG)
       }
     }
+    return ActionEnableStatus.no("End of the selection", LogLevel.DEBUG)
   }
 
   private fun isEnabledForEscape(editor: Editor): Boolean {
-    val ideaVimSupportDialog =
-      injector.globalIjOptions().ideavimsupport.contains(IjOptionConstants.ideavimsupport_dialog)
+    val ideaVimSupportDialog = injector.globalIjOptions().ideavimsupport.contains(IjOptionConstants.ideavimsupport_dialog)
     return editor.isPrimaryEditor() ||
       EditorHelper.isFileEditor(editor) && !editor.vim.mode.inNormalMode ||
       ideaVimSupportDialog && !editor.vim.mode.inNormalMode
@@ -313,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,
@@ -402,10 +403,4 @@ private class ActionEnableStatus(
 
 private enum class LogLevel {
   DEBUG, INFO, ERROR,
-}
-
-private val DataContext.isNotSupportedContextComponent: Boolean
-  get() {
-    val contextComponent = this.getData(PlatformDataKeys.CONTEXT_COMPONENT) ?: return true
-    return contextComponent !is EditorComponentImpl && contextComponent !is ExTextField
-  }
+}

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

@@ -37,12 +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"))
@@ -62,11 +57,12 @@ private fun doOperatorAction(
         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 {
+        }
+        else {
           func
         }
 
@@ -81,7 +77,7 @@ private fun doOperatorAction(
     return false
   }
 
-  val arg = when (motionType) {
+  val arg = when (selectionType) {
     SelectionType.LINE_WISE -> "line"
     SelectionType.CHARACTER_WISE -> "char"
     SelectionType.BLOCK_WISE -> "block"
@@ -104,19 +100,20 @@ 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
+  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
+    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
   }
@@ -124,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
@@ -139,7 +136,7 @@ internal class OperatorAction : VimActionHandler.SingleExecution() {
       operatorArguments,
     )?.normalize()?.let {
       // If we're linewise, make sure the end offset isn't just the EOL char
-      if (argument.getMotionType() == SelectionType.LINE_WISE && it.endOffset < editor.fileSize()) {
+      if (argument.motion.isLinewiseMotion() && it.endOffset < editor.fileSize()) {
         TextRange(it.startOffset, it.endOffset + 1)
       } else {
         it

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

@@ -23,14 +23,9 @@ import com.maddyhome.idea.vim.newapi.ij
 internal class RepeatChangeAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_WRITABLE
 
-  override fun execute(
-    editor: VimEditor,
-    context: ExecutionContext,
-    cmd: Command,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
+  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
 
@@ -62,7 +57,12 @@ internal class RepeatChangeAction : VimActionHandler.SingleExecution() {
       )
     } else if (!repeatHandler && lastCommand != null) {
       if (cmd.rawCount > 0) {
-        lastCommand = lastCommand.copy(rawCount = cmd.rawCount)
+        lastCommand.rawCount = cmd.count
+        val arg = lastCommand.argument
+        if (arg != null) {
+          val mot = arg.motion
+          mot.rawCount = 0
+        }
       }
       state.executingCommand = lastCommand
 

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

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

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

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

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,

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,

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

@@ -20,10 +20,13 @@ 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 = ["<C-H>", "<BS>"], modes = [Mode.INSERT])
+internal class VimEditorBackSpace : IdeActionHandler(IdeActions.ACTION_EDITOR_BACKSPACE) {
+  override val type: Command.Type = Command.Type.DELETE
+}
+
 @CommandOrMotion(keys = ["<Del>"], modes = [Mode.INSERT])
 internal class VimEditorDelete : IdeActionHandler(IdeActions.ACTION_EDITOR_DELETE) {
   override val type: Command.Type = Command.Type.DELETE
@@ -38,16 +41,11 @@ internal class VimEditorDown : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CA
     editor: VimEditor,
     context: ExecutionContext,
     cmd: Command,
-    operatorArguments: OperatorArguments,
+    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)
   }
 }
@@ -67,16 +65,11 @@ internal class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARE
     editor: VimEditor,
     context: ExecutionContext,
     cmd: Command,
-    operatorArguments: OperatorArguments,
+    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)
   }
 }
@@ -85,12 +78,7 @@ internal class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARE
 internal class VimQuickJavaDoc : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
-  override fun execute(
-    editor: VimEditor,
-    context: ExecutionContext,
-    cmd: Command,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
+  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     injector.actionExecutor.executeAction(editor, IdeActions.ACTION_QUICK_JAVADOC, context)
     return true
   }

src/main/java/com/maddyhome/idea/vim/command/CommandState.kt

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package com.maddyhome.idea.vim.command
+
+import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.state.VimStateMachine
+
+/**
+ * COMPATIBILITY-LAYER: Additional class
+ * Please see: https://jb.gg/zo8n0r
+ */
+@Deprecated("Use `injector.vimState`")
+class CommandState(private val machine: VimStateMachine) {
+
+  val mode: Mode
+    get() {
+      val myMode = machine.mode
+      return when (myMode) {
+        is com.maddyhome.idea.vim.state.mode.Mode.CMD_LINE -> Mode.CMD_LINE
+        com.maddyhome.idea.vim.state.mode.Mode.INSERT -> Mode.INSERT
+        is com.maddyhome.idea.vim.state.mode.Mode.NORMAL -> Mode.COMMAND
+        is com.maddyhome.idea.vim.state.mode.Mode.OP_PENDING -> Mode.OP_PENDING
+        com.maddyhome.idea.vim.state.mode.Mode.REPLACE -> Mode.REPLACE
+        is com.maddyhome.idea.vim.state.mode.Mode.SELECT -> Mode.SELECT
+        is com.maddyhome.idea.vim.state.mode.Mode.VISUAL -> Mode.VISUAL
+      }
+    }
+
+  @Deprecated("Use `KeyHandler.keyHandlerState.commandBuilder", ReplaceWith(
+    "KeyHandler.getInstance().keyHandlerState.commandBuilder",
+    "com.maddyhome.idea.vim.KeyHandler"
+  )
+  )
+  val commandBuilder: CommandBuilder
+    get() = KeyHandler.getInstance().keyHandlerState.commandBuilder
+
+  @Deprecated("Use `KeyHandler.keyHandlerState.mappingState", ReplaceWith(
+    "KeyHandler.getInstance().keyHandlerState.mappingState",
+    "com.maddyhome.idea.vim.KeyHandler"
+  )
+  )
+  val mappingState: MappingState
+    get() = KeyHandler.getInstance().keyHandlerState.mappingState
+
+  enum class Mode {
+    // Basic modes
+    COMMAND, VISUAL, SELECT, INSERT, CMD_LINE, /*EX*/
+
+    // Additional modes
+    OP_PENDING, REPLACE /*, VISUAL_REPLACE*/, INSERT_NORMAL, INSERT_VISUAL, INSERT_SELECT
+  }
+
+  enum class SubMode {
+    NONE, VISUAL_CHARACTER, VISUAL_LINE, VISUAL_BLOCK
+  }
+
+  companion object {
+    @JvmStatic
+    @Deprecated("Use `injector.vimState`")
+    fun getInstance(editor: Editor): CommandState {
+      return CommandState(injector.vimState)
+    }
+  }
+}

src/main/java/com/maddyhome/idea/vim/common/IndentConfig.kt

@@ -14,7 +14,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings.IndentOptions
 import com.maddyhome.idea.vim.api.VimIndentConfig
 
-internal class IndentConfig private constructor(indentOptions: IndentOptions) : VimIndentConfig {
+internal class IndentConfig private constructor(indentOptions: IndentOptions): VimIndentConfig {
   private val indentSize = indentOptions.INDENT_SIZE
   private val tabSize = indentOptions.TAB_SIZE
   private val isUseTabs = indentOptions.USE_TAB_CHARACTER

src/main/java/com/maddyhome/idea/vim/config/VimState.kt

@@ -18,8 +18,8 @@ import kotlin.reflect.KProperty
 internal class VimState {
   var isIdeaJoinNotified by StateProperty("idea-join")
   var isIdeaPutNotified by StateProperty("idea-put")
-  var wasSubscribedToEAPAutomatically by StateProperty("was-automatically-subscribed-to-eap")
-  var firstIdeaVimVersion: String? by StringProperty("first-ideavim-version", null)
+  var isNewUndoNotified by StateProperty("idea-undo")
+  var wasSubscibedToEAPAutomatically by StateProperty("was-automatically-subscribed-to-eap")
 
   fun readData(element: Element) {
     val notifications = element.getChild("notifications")
@@ -28,11 +28,6 @@ internal class VimState {
         map[name] = it.toBoolean()
       }
     }
-    stringMap.keys.forEach { name ->
-      notifications?.getChild(name)?.getAttributeValue("value")?.let {
-        stringMap[name] = it.decode
-      }
-    }
   }
 
   fun saveData(element: Element) {
@@ -44,22 +39,10 @@ internal class VimState {
       child.setAttribute("enabled", value.toString())
       notifications.addContent(child)
     }
-    stringMap.forEach { (name, value) ->
-      val child = Element(name)
-      child.setAttribute("value", value.encode)
-      notifications.addContent(child)
-    }
   }
 }
 
-private val String?.encode: String get() = this ?: NULL_VALUE
-private val String?.decode: String? get() = if (this == NULL_VALUE) null else this
-
-// Settings cannot store null values
-private const val NULL_VALUE = "__NULL_VALUE_CONST__"
-
 private val map by lazy { mutableMapOf<String, Boolean>() }
-private val stringMap by lazy { mutableMapOf<String, String?>() }
 
 private class StateProperty(val xmlName: String) : ReadWriteProperty<VimState, Boolean> {
 
@@ -73,19 +56,3 @@ private class StateProperty(val xmlName: String) : ReadWriteProperty<VimState, B
     map[xmlName] = value
   }
 }
-
-private class StringProperty(val propertyName: String, val defaultValue: String?) :
-  ReadWriteProperty<VimState, String?> {
-
-  init {
-    stringMap[propertyName] = defaultValue
-  }
-
-  override fun getValue(thisRef: VimState, property: KProperty<*>): String? {
-    return stringMap.getOrPut(propertyName) { defaultValue }
-  }
-
-  override fun setValue(thisRef: VimState, property: KProperty<*>, value: String?) {
-    stringMap[propertyName] = value
-  }
-}

src/main/java/com/maddyhome/idea/vim/customization/feature/terminal/IdeaVimTerminalDisablerExtension.kt

@@ -1,27 +0,0 @@
-/*
- * Copyright 2003-2025 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.customization.feature.terminal
-
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.key.IdeaVimDisablerExtensionPoint
-import org.jetbrains.plugins.terminal.block.util.TerminalDataContextUtils.isAlternateBufferEditor
-import org.jetbrains.plugins.terminal.block.util.TerminalDataContextUtils.isAlternateBufferModelEditor
-import org.jetbrains.plugins.terminal.block.util.TerminalDataContextUtils.isOutputEditor
-import org.jetbrains.plugins.terminal.block.util.TerminalDataContextUtils.isOutputModelEditor
-import org.jetbrains.plugins.terminal.block.util.TerminalDataContextUtils.isPromptEditor
-
-/**
- * The only implementation is defined right here.
- */
-internal class IdeaVimTerminalDisablerExtension : IdeaVimDisablerExtensionPoint {
-  override fun isDisabledForEditor(editor: Editor): Boolean {
-    return editor.isPromptEditor || editor.isOutputEditor || editor.isAlternateBufferEditor
-      || editor.isOutputModelEditor || editor.isAlternateBufferModelEditor
-  }
-}

src/main/java/com/maddyhome/idea/vim/ex/ExOutputModel.kt

@@ -127,7 +127,8 @@ class ExOutputModel(private val myEditor: WeakReference<Editor>) : VimOutputPane
   override fun close() {
     if (!ApplicationManager.getApplication().isUnitTestMode) {
       editor?.let { ExOutputPanel.getInstance(it).close() }
-    } else {
+    }
+    else {
       isActiveInTestMode = false
     }
   }

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() {

src/main/java/com/maddyhome/idea/vim/extension/VimExtensionFacade.kt

@@ -189,20 +189,14 @@ object VimExtensionFacade {
 
   /** 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
+  fun getRegister(register: Char): List<KeyStroke>? {
+    val reg = VimPlugin.getRegister().getRegister(register) ?: return null
     return reg.keys
   }
 
   @JvmStatic
-  fun getRegisterForCaret(
-    editor: VimEditor,
-    context: ExecutionContext,
-    register: Char,
-    caret: VimCaret,
-  ): List<KeyStroke>? {
-    val reg = caret.registerStorage.getRegister(editor, context, register) ?: return null
+  fun getRegisterForCaret(register: Char, caret: VimCaret): List<KeyStroke>? {
+    val reg = injector.registerGroup.getRegister(register) ?: return null
     return reg.keys
   }
 
@@ -214,14 +208,8 @@ object VimExtensionFacade {
 
   /** Set the current contents of the given register */
   @JvmStatic
-  fun setRegisterForCaret(
-    editor: VimEditor,
-    context: ExecutionContext,
-    register: Char,
-    caret: ImmutableVimCaret,
-    keys: List<KeyStroke?>?,
-  ) {
-    caret.registerStorage.setKeys(register, keys?.filterNotNull() ?: emptyList())
+  fun setRegisterForCaret(register: Char, caret: ImmutableVimCaret, keys: List<KeyStroke?>?) {
+    injector.registerGroup.setKeys(register, keys?.filterNotNull() ?: emptyList())
   }
 
   /** Set the current contents of the given register */
@@ -238,7 +226,7 @@ object VimExtensionFacade {
     defaultArgs: List<Pair<String, Expression>>,
     hasOptionalArguments: Boolean,
     flags: EnumSet<FunctionFlag>,
-    function: ScriptFunction,
+    function: ScriptFunction
   ) {
     var functionDeclaration: FunctionDeclaration? = null
     val body = listOf(object : Executable {
@@ -268,7 +256,8 @@ object VimExtensionFacade {
 }
 
 fun VimExtensionFacade.exportOperatorFunction(name: String, function: OperatorFunction) {
-  exportScriptFunction(null, name, listOf("type"), emptyList(), false, noneOfEnum()) { editor, context, args ->
+  exportScriptFunction(null, name, listOf("type"), emptyList(), false, noneOfEnum()) {
+    editor, context, args ->
 
     val type = args["type"]?.asString()
     val selectionType = when (type) {
@@ -280,7 +269,8 @@ fun VimExtensionFacade.exportOperatorFunction(name: String, function: OperatorFu
 
     if (function.apply(editor, context, selectionType)) {
       ExecutionResult.Success
-    } else {
+    }
+    else {
       ExecutionResult.Error
     }
   }

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() {

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

@@ -12,9 +12,7 @@ import com.intellij.openapi.editor.Document;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.*;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.command.OperatorArguments;
-import com.maddyhome.idea.vim.command.TextObjectVisualType;
+import com.maddyhome.idea.vim.command.*;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.extension.ExtensionHandler;
 import com.maddyhome.idea.vim.extension.VimExtension;
@@ -35,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;
@@ -65,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) {
@@ -88,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;
@@ -128,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;
@@ -158,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();
@@ -191,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) {
@@ -234,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) {
@@ -261,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))));
       }
     }
   }
@@ -271,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;
@@ -300,7 +305,7 @@ public class VimArgTextObjExtension implements VimExtension {
      * @param position starting position.
      */
     boolean findBoundsAt(int position) throws IllegalStateException {
-      if (text.isEmpty()) {
+      if (text.length() == 0) {
         error = "empty document";
         return false;
       }

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

@@ -9,6 +9,7 @@ package com.maddyhome.idea.vim.extension.commentary
 
 import com.intellij.codeInsight.actions.AsyncActionExecutionService
 import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Ref
@@ -24,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
@@ -48,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 {
 
@@ -64,16 +69,18 @@ internal class CommentaryExtension : VimExtension {
         editor.ij.selectionModel.setSelection(range.startOffset, range.endOffset)
       }
 
-      // Treat block- and character-wise selections as block comments. Fall back if the first action isn't available
-      val actions = if (selectionType === SelectionType.LINE_WISE) {
-        listOf(IdeActions.ACTION_COMMENT_LINE, IdeActions.ACTION_COMMENT_BLOCK)
-      } else {
-        listOf(IdeActions.ACTION_COMMENT_BLOCK, IdeActions.ACTION_COMMENT_LINE)
-      }
+      return runWriteAction {
+        // Treat block- and character-wise selections as block comments. Fall back if the first action isn't available
+        val actions = if (selectionType === SelectionType.LINE_WISE) {
+          listOf(IdeActions.ACTION_COMMENT_LINE, IdeActions.ACTION_COMMENT_BLOCK)
+        } else {
+          listOf(IdeActions.ACTION_COMMENT_BLOCK, IdeActions.ACTION_COMMENT_LINE)
+        }
 
-      val project = editor.ij.project!!
-      val callback = { afterCommenting(mode, editor, resetCaret, range) }
-      return actions.any { executeActionWithCallbackOnSuccess(editor, it, project, context, callback) }
+        val project = editor.ij.project!!
+        val callback = { afterCommenting(mode, editor, resetCaret, range) }
+        actions.any { executeActionWithCallbackOnSuccess(editor, it, project, context, callback) }
+      }
     }
 
     private fun executeActionWithCallbackOnSuccess(
@@ -177,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))
     }
   }
 
@@ -221,16 +230,14 @@ internal class CommentaryExtension : VimExtension {
       val endOffset = editor.vim.getLineEndOffset(logicalLine, true)
       val startElement = file.findElementAt(startOffset) ?: return false
       var next: PsiElement? = startElement
-      var hasComment = false
       while (next != null && next.textRange.startOffset <= endOffset) {
-        when {
-          next is PsiWhiteSpace -> {} // Skip whitespace elementl
-          isComment(next) -> hasComment = true // Mark when we find a comment
-          else -> return false // Non-comment content found, exit early
+        if (next !is PsiWhiteSpace && !isComment(next)) {
+          return false
         }
         next = PsiTreeUtil.nextLeaf(next, true)
       }
-      return hasComment
+
+      return true
     }
 
     private fun isComment(element: PsiElement) =

src/main/java/com/maddyhome/idea/vim/extension/exchange/VimExchangeExtension.kt

@@ -8,6 +8,7 @@
 
 package com.maddyhome.idea.vim.extension.exchange
 
+import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.LogicalPosition
 import com.intellij.openapi.editor.colors.EditorColors
@@ -110,10 +111,12 @@ internal class VimExchangeExtension : VimExtension {
 
   private class VExchangeHandler : ExtensionHandler {
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      val mode = editor.mode
-      // Leave visual mode to create selection marks
-      executeNormalWithoutMapping(injector.parser.parseKeys("<Esc>"), editor.ij)
-      Operator(true).apply(editor, context, mode.selectionType ?: SelectionType.CHARACTER_WISE)
+      runWriteAction {
+        val mode = editor.mode
+        // Leave visual mode to create selection marks
+        executeNormalWithoutMapping(injector.parser.parseKeys("<Esc>"), editor.ij)
+        Operator(true).apply(editor, context, mode.selectionType ?: SelectionType.CHARACTER_WISE)
+      }
     }
   }
 
@@ -219,26 +222,27 @@ 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, '+')
-
-      // TODO handle:
-      // 	" Compare using =~ because "'==' != 0" returns 0
-      // 	let indent = s:get_setting('exchange_indent', 1) !~ 0 && a:x.type ==# 'V' && a:y.type ==# 'V'
-      pasteExchange(ex1, ex2)
-      if (!expand) {
-        pasteExchange(ex2, ex1)
+      val zRegText = getRegister('z')
+      val unnRegText = getRegister('"')
+      val startRegText = getRegister('*')
+      val plusRegText = getRegister('+')
+      runWriteAction {
+        // TODO handle:
+        // 	" Compare using =~ because "'==' != 0" returns 0
+        // 	let indent = s:get_setting('exchange_indent', 1) !~ 0 && a:x.type ==# 'V' && a:y.type ==# 'V'
+        pasteExchange(ex1, ex2)
+        if (!expand) {
+          pasteExchange(ex2, ex1)
+        }
+        // TODO: handle: if ident
+        if (!expand) {
+          fixCursor(ex1, ex2, reverse)
+        }
+        setRegister('z', zRegText)
+        setRegister('"', unnRegText)
+        setRegister('*', startRegText)
+        setRegister('+', plusRegText)
       }
-      // TODO: handle: if ident
-      if (!expand) {
-        fixCursor(ex1, ex2, reverse)
-      }
-      setRegister('z', zRegText)
-      setRegister('"', unnRegText)
-      setRegister('*', startRegText)
-      setRegister('+', plusRegText)
     }
 
     private fun compareExchanges(x: Exchange, y: Exchange): ExchangeCompareResult {
@@ -295,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) {
@@ -309,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) {

src/main/java/com/maddyhome/idea/vim/extension/highlightedyank/VimHighlightedYank.kt

@@ -45,10 +45,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 +75,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 {
@@ -188,15 +181,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 +200,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 {

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

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

src/main/java/com/maddyhome/idea/vim/extension/miniai/MiniAI.kt

@@ -1,290 +0,0 @@
-/*
- * Copyright 2003-2025 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.extension.miniai
-
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.api.ExecutionContext
-import com.maddyhome.idea.vim.api.ImmutableVimCaret
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-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
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.extension.ExtensionHandler
-import com.maddyhome.idea.vim.extension.VimExtension
-import com.maddyhome.idea.vim.extension.VimExtensionFacade.putExtensionHandlerMapping
-import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMapping
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.EnumSet
-
-/**
- * A simplified imitation of mini.ai approach for motions "aq", "iq", "ab", "ib".
- * Instead of "closest" text object, we apply a "cover-or-next" logic:
- *
- * 1) Among all candidate pairs, pick any that cover the caret (start <= caret < end).
- *    Among those, pick the smallest range.
- * 2) If none cover the caret, pick the "next" pair (start >= caret) that is closest.
- * 3) If none are next, pick the "previous" pair (end <= caret) that is closest.
- *
- * For "i" text object, we shrink the boundaries inward by one character on each side.
- */
-class MiniAI : VimExtension {
-
-  companion object {
-    // <Plug> mappings
-    private const val PLUG_AQ = "<Plug>mini-ai-aq"
-    private const val PLUG_IQ = "<Plug>mini-ai-iq"
-    private const val PLUG_AB = "<Plug>mini-ai-ab"
-    private const val PLUG_IB = "<Plug>mini-ai-ib"
-
-    // Actual user key sequences
-    private const val KEY_AQ = "aq"
-    private const val KEY_IQ = "iq"
-    private const val KEY_AB = "ab"
-    private const val KEY_IB = "ib"
-  }
-
-  override fun getName() = "mini-ai"
-
-  override fun init() {
-    registerMappings()
-  }
-
-  private fun registerMappings() {
-    fun createHandler(
-      rangeFunc: (VimEditor, ImmutableVimCaret, Boolean) -> TextRange?
-    ): ExtensionHandler = object : ExtensionHandler {
-      override val isRepeatable = true
-      override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-        addAction(PortedMiniAiAction(rangeFunc))
-      }
-    }
-
-    listOf(
-      // Outer quotes
-      PLUG_AQ to createHandler { e, c, _ -> findQuoteRange(e, c, isOuter = true) },
-      // Inner quotes
-      PLUG_IQ to createHandler { e, c, _ -> findQuoteRange(e, c, isOuter = false) },
-      // Outer brackets
-      PLUG_AB to createHandler { e, c, _ -> findBracketRange(e, c, isOuter = true) },
-      // Inner brackets
-      PLUG_IB to createHandler { e, c, _ -> findBracketRange(e, c, isOuter = false) }
-    ).forEach { (plug, handler) ->
-      putExtensionHandlerMapping(MappingMode.XO, injector.parser.parseKeys(plug), owner, handler, false)
-    }
-
-    // Map user keys -> <Plug> keys
-    listOf(
-      KEY_AQ to PLUG_AQ,
-      KEY_IQ to PLUG_IQ,
-      KEY_AB to PLUG_AB,
-      KEY_IB to PLUG_IB
-    ).forEach { (key, plug) ->
-      putKeyMapping(MappingMode.XO, injector.parser.parseKeys(key), owner, injector.parser.parseKeys(plug), true)
-    }
-  }
-}
-
-// A text object action that uses the "mini.ai-like" picking strategy.
-private class PortedMiniAiAction(
-  private val rangeFunc: (VimEditor, ImmutableVimCaret, Boolean) -> TextRange?
-) : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: VimEditor,
-    caret: ImmutableVimCaret,
-    context: ExecutionContext,
-    count: Int,
-    rawCount: Int
-  ): TextRange? = rangeFunc(editor, caret, true).also {
-    // We don't do 'count' expansions here. If you wanted to replicate
-    // mini.ai's multi-level expansions, you'd call the "rangeFunc" multiple
-    // times re-feeding the last output as reference, etc.
-  }
-}
-
-// Utility to register action in KeyHandler
-private fun addAction(action: TextObjectActionHandler) {
-  KeyHandler.getInstance().keyHandlerState.commandBuilder.addAction(action)
-}
-
-/* -------------------------------------------------------------------------
- * Core mini.ai-like logic
- * ------------------------------------------------------------------------- */
-
-/**
- * Find a text range for quotes (", ', `) around the caret using a "cover-or-next" approach.
- * - If one or more pairs **cover** the caret, pick the *smallest* covering pair.
- * - Else pick the "next" pair whose start >= caret offset (closest).
- * - Else pick the "previous" pair whose end <= caret offset (closest).
- *
- * If [isOuter] == false (i.e. 'iq'), shrink the final range by 1 char on each side.
- */
-private fun findQuoteRange(editor: VimEditor, caret: ImmutableVimCaret, isOuter: Boolean): TextRange? {
-  val text = editor.text()
-  val caretOffset = caret.offset
-  val caretLine = caret.getLine()
-
-  // 1) Gather quotes in *this caret's line*
-  val lineStart = editor.getLineStartOffset(caretLine)
-  val lineEnd = editor.getLineEndOffset(caretLine)
-  val lineText = text.substring(lineStart, lineEnd)
-  val lineRanges = gatherAllQuoteRanges(lineText).map {
-    TextRange(it.startOffset + lineStart, it.endOffset + lineStart)
-  }
-
-  val localBest = pickBestRange(lineRanges, caretOffset)
-  if (localBest != null) {
-    return adjustRangeForInnerOuter(localBest, isOuter)
-  }
-
-  // 2) Fallback: entire buffer
-  val allRanges = gatherAllQuoteRanges(text)
-  val bestOverall = pickBestRange(allRanges, caretOffset) ?: return null
-  return adjustRangeForInnerOuter(bestOverall, isOuter)
-}
-
-/** Adjust final range if user requested 'inner' (i.e. skip bounding chars). */
-private fun adjustRangeForInnerOuter(range: TextRange, isOuter: Boolean): TextRange? {
-  if (isOuter) return range
-  // For 'inner', skip bounding chars if possible
-  if (range.endOffset - range.startOffset < 2) return null
-  return TextRange(range.startOffset + 1, range.endOffset - 1)
-}
-
-/**
- * Gather all "balanced" pairs for single/double/backtick quotes in the entire text.
- * For simplicity, we treat each ["]...["] or [']...['] or [`]...[`] as one range,
- * ignoring complicated cases of escaping, multi-line, etc.
- */
-private fun gatherAllQuoteRanges(text: CharSequence): List<TextRange> {
-  val results = mutableListOf<TextRange>()
-  val patterns = listOf(
-    "\"([^\"]*)\"",
-    "'([^']*)'",
-    "`([^`]*)`"
-  )
-  for (p in patterns) {
-    Regex(p).findAll(text).forEach {
-      results.add(TextRange(it.range.first, it.range.last + 1))
-    }
-  }
-  return results
-}
-
-/**
- * Find a text range for brackets using a "cover-or-next" approach.
- * We treat bracket pairs ( (), [], {}, <> ) in a naive balanced scanning way.
- * If [isOuter] is false, we shrink boundaries to skip the bracket chars.
- */
-private fun findBracketRange(editor: VimEditor, caret: ImmutableVimCaret, isOuter: Boolean): TextRange? {
-  val text = editor.text()
-  val caretOffset = caret.offset
-  val caretLine = caret.getLine()
-
-  // 1) Gather bracket pairs in *this caret's line*
-  val lineStart = editor.getLineStartOffset(caretLine)
-  val lineEnd = editor.getLineEndOffset(caretLine)
-  val bracketChars = listOf('(', ')', '[', ']', '{', '}', '<', '>')
-  // Gather local line bracket pairs
-  val lineText = text.substring(lineStart, lineEnd)
-  val lineRanges = gatherAllBracketRanges(lineText, bracketChars).map {
-    // Shift each range's offsets to the global text
-    TextRange(it.startOffset + lineStart, it.endOffset + lineStart)
-  }
-
-  // Pick the best match on this line
-  val localBest = pickBestRange(lineRanges, caretOffset)
-  if (localBest != null) {
-    return adjustRangeForInnerOuter(localBest, isOuter)
-  }
-
-  // 2) Fallback: gather bracket pairs in the entire file
-  val allRanges = gatherAllBracketRanges(text, bracketChars)
-  val bestOverall = pickBestRange(allRanges, caretOffset) ?: return null
-
-  return adjustRangeForInnerOuter(bestOverall, isOuter)
-}
-
-/**
- * Gathers naive "balanced bracket" ranges for the given bracket pairs.
- * This is a simplified stack-based approach scanning the entire file text.
- */
-private fun gatherAllBracketRanges(
-  text: CharSequence,
-  brackets: List<Char>
-): List<TextRange> {
-  val pairs = mapOf('(' to ')', '[' to ']', '{' to '}', '<' to '>')
-  val results = mutableListOf<TextRange>()
-  val stack = ArrayDeque<Int>()         // offsets of open bracket
-  val bracketTypeStack = ArrayDeque<Char>() // store which bracket
-
-  text.forEachIndexed { i, ch ->
-    if (pairs.containsKey(ch)) {
-      // Opening bracket
-      stack.addLast(i)
-      bracketTypeStack.addLast(ch)
-    } else {
-      // Maybe a closing bracket?
-      val top = bracketTypeStack.lastOrNull() ?: '\u0000'
-      if (pairs[top] == ch) {
-        // Balanced pair
-        val openPos = stack.removeLast()
-        bracketTypeStack.removeLast()
-        results.add(TextRange(openPos, i + 1)) // i+1 for endOffset
-      }
-    }
-  }
-  return results
-}
-
-/**
- * Picks best range among [candidates] in a “cover-or-next” approach:
- *   1) Among those covering [caretOffset], pick the narrowest.
- *   2) Else pick the "next" bracket whose start >= caret, if any (closest).
- *   3) Else pick the "previous" bracket whose end <= caret, if any (closest).
- */
-private fun pickBestRange(candidates: List<TextRange>, caretOffset: Int): TextRange? {
-  if (candidates.isEmpty()) return null
-  val covering = mutableListOf<TextRange>()
-  val nextOnes = mutableListOf<TextRange>()
-  val prevOnes = mutableListOf<TextRange>()
-
-  for (r in candidates) {
-    if (r.startOffset <= caretOffset && caretOffset < r.endOffset) {
-      covering.add(r)
-    } else if (r.startOffset >= caretOffset) {
-      nextOnes.add(r)
-    } else if (r.endOffset <= caretOffset) {
-      prevOnes.add(r)
-    }
-  }
-
-  // 1) Covering, smallest width
-  if (covering.isNotEmpty()) {
-    return covering.minByOrNull { it.endOffset - it.startOffset }
-  }
-
-  // 2) Next (closest by startOffset)
-  if (nextOnes.isNotEmpty()) {
-    return nextOnes.minByOrNull { kotlin.math.abs(it.startOffset - caretOffset) }
-  }
-
-  // 3) Previous (closest by endOffset)
-  if (prevOnes.isNotEmpty()) {
-    return prevOnes.minByOrNull { kotlin.math.abs(it.endOffset - caretOffset) }
-  }
-
-  return null
-}

src/main/java/com/maddyhome/idea/vim/extension/multiplecursors/VimMultipleCursorsExtension.kt

@@ -34,6 +34,7 @@ import com.maddyhome.idea.vim.helper.SearchOptions
 import com.maddyhome.idea.vim.helper.endOffsetInclusive
 import com.maddyhome.idea.vim.helper.enumSetOf
 import com.maddyhome.idea.vim.helper.exitVisualMode
+import com.maddyhome.idea.vim.helper.findWordUnderCursor
 import com.maddyhome.idea.vim.helper.inVisualMode
 import com.maddyhome.idea.vim.helper.updateCaretsVisualAttributes
 import com.maddyhome.idea.vim.helper.userData
@@ -234,7 +235,7 @@ internal class VimMultipleCursorsExtension : VimExtension {
       val text = if (editor.inVisualMode) {
         primaryCaret.selectedText ?: return
       } else {
-        val range = injector.searchHelper.findWordNearestCursor(editor.vim, primaryCaret.vim) ?: return
+        val range = findWordUnderCursor(editor, primaryCaret) ?: return
         if (range.startOffset > primaryCaret.offset) return
         IjVimEditor(editor).getText(range)
       }
@@ -299,8 +300,7 @@ internal class VimMultipleCursorsExtension : VimExtension {
   }
 
   private fun selectWordUnderCaret(editor: Editor, caret: Caret): TextRange? {
-    // TODO: I think vim-multiple-cursors uses a text object rather than the star operator
-    val range = injector.searchHelper.findWordNearestCursor(editor.vim, caret.vim) ?: return null
+    val range = findWordUnderCursor(editor, caret) ?: return null
     if (range.startOffset > caret.offset) return null
 
     enterVisualMode(editor.vim)

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,

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)
   }
 }

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
@@ -143,7 +144,7 @@ internal class ReplaceWithRegister : VimExtension {
 private fun doReplace(editor: Editor, context: DataContext, caret: ImmutableVimCaret, visualSelection: PutData.VisualSelection) {
   val registerGroup = injector.registerGroup
   val lastRegisterChar = if (editor.caretModel.caretCount == 1) registerGroup.currentRegister else registerGroup.getCurrentRegisterForMulticaret()
-  val savedRegister = caret.registerStorage.getRegister(editor.vim, context.vim, lastRegisterChar) ?: return
+  val savedRegister = registerGroup.getRegister(lastRegisterChar) ?: return
 
   var usedType = savedRegister.type
   var usedText = savedRegister.text
@@ -165,11 +166,17 @@ private fun doReplace(editor: Editor, context: DataContext, caret: ImmutableVimC
     putToLine = -1,
   )
   val vimEditor = editor.vim
+  val keyHandler = KeyHandler.getInstance()
   ClipboardOptionHelper.IdeaputDisabler().use {
     VimPlugin.getPut().putText(
       vimEditor,
       context.vim,
       putData,
+      operatorArguments = OperatorArguments(
+        keyHandler.isOperatorPending(vimEditor.mode, keyHandler.keyHandlerState),
+        0,
+        editor.vim.mode,
+      ),
       saveToRegister = false
     )
   }

src/main/java/com/maddyhome/idea/vim/extension/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

src/main/java/com/maddyhome/idea/vim/extension/surround/VimSurroundExtension.kt

@@ -11,7 +11,6 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.application.runWriteAction
 import com.intellij.openapi.diagnostic.logger
 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.VimCaret
@@ -52,6 +51,7 @@ 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.
@@ -142,10 +142,6 @@ internal class VimSurroundExtension : VimExtension {
       runWriteAction {
         // Leave visual mode
         editor.exitVisualMode()
-        
-        // Reset the key handler so that the command trie is updated for the new mode (Normal)
-        // TODO: This should probably be handled by ToHandlerMapping.execute
-        KeyHandler.getInstance().reset(editor)
       }
     }
   }
@@ -165,17 +161,17 @@ internal class VimSurroundExtension : VimExtension {
     }
 
     companion object {
-      fun change(editor: VimEditor, context: ExecutionContext, charFrom: Char, newSurround: SurroundPair?) {
+      fun change(editor: VimEditor, context: ExecutionContext, charFrom: Char, newSurround: Pair<String, String>?) {
         editor.ij.runWithEveryCaretAndRestore { changeAtCaret(editor, context, charFrom, newSurround) }
       }
       
-      fun changeAtCaret(editor: VimEditor, context: ExecutionContext, charFrom: Char, newSurround: SurroundPair?) {
+      fun changeAtCaret(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(editor, context, REGISTER, it)
-            setRegisterForCaret(editor, context, REGISTER, it, null)
-            SurroundingInfo(editor, context, it, null, oldValue, false)
+            val oldValue: List<KeyStroke>? = getRegisterForCaret(REGISTER, it)
+            setRegisterForCaret(REGISTER, it, null)
+            SurroundingInfo(it, null, oldValue)
           }
 
         // Delete surrounding's content
@@ -187,31 +183,25 @@ internal class VimSurroundExtension : VimExtension {
           val currentSurrounding = getCurrentSurrounding(it.caret, pick(charFrom))
           if (currentSurrounding != null) {
             it.caret.moveToOffset(currentSurrounding.startOffset)
-            injector.application.runWriteAction {
-              editor.deleteString(currentSurrounding)
-            }
+            editor.deleteString(currentSurrounding)
           }
 
-          val registerValue = getRegisterForCaret(editor, context, REGISTER, it.caret)
-          val innerValue = if (registerValue.isNullOrEmpty()) emptyList() else registerValue
+          val registerValue = getRegisterForCaret(REGISTER, it.caret)
+          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)
 
@@ -264,16 +254,9 @@ internal class VimSurroundExtension : VimExtension {
     }
   }
 
-  private data class SurroundingInfo(
-    val editor: VimEditor,
-    val context: ExecutionContext,
-    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(editor, context, REGISTER, caret, oldRegisterContent)
+      setRegisterForCaret(REGISTER, caret, oldRegisterContent)
     }
   }
 
@@ -314,7 +297,7 @@ internal class VimSurroundExtension : VimExtension {
       return true
     }
     
-    private fun applyOnce(editor: Editor, change: VimChangeGroup, pair: SurroundPair, count: Int) {
+    private fun applyOnce(editor: Editor, change: VimChangeGroup, pair: Pair<String, String>, count: Int) {
       // XXX: Will it work with line-wise or block-wise selections?
       val primaryCaret = editor.caretModel.primaryCaret
       val range = getSurroundRange(primaryCaret.vim)
@@ -329,7 +312,7 @@ internal class VimSurroundExtension : VimExtension {
     private fun getSurroundRange(caret: VimCaret): TextRange? {
       val editor = caret.editor
       if (editor.mode is Mode.CMD_LINE) {
-        editor.mode = editor.mode.returnTo
+        editor.mode = (editor.mode as Mode.CMD_LINE).returnTo()
       }
       return when (editor.mode) {
         is Mode.NORMAL -> injector.markService.getChangeMarks(caret)
@@ -346,44 +329,42 @@ 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
+    editor.vim.mode = editor.vim.mode.returnTo()
   }
   val matcher = tagNameAndAttributesCapturePattern.matcher(tagInput)
   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
   }
@@ -393,20 +374,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
+    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)
@@ -425,7 +402,7 @@ 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, count: Int, tagsOnNewLines: Boolean = false) {
   runWriteAction {
     val editor = caret.editor
     val change = VimPlugin.getChange()

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

@@ -14,9 +14,7 @@ import com.maddyhome.idea.vim.api.ExecutionContext;
 import com.maddyhome.idea.vim.api.ImmutableVimCaret;
 import com.maddyhome.idea.vim.api.VimEditor;
 import com.maddyhome.idea.vim.api.VimInjectorKt;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.command.OperatorArguments;
-import com.maddyhome.idea.vim.command.TextObjectVisualType;
+import com.maddyhome.idea.vim.command.*;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.extension.ExtensionHandler;
 import com.maddyhome.idea.vim.extension.VimExtension;
@@ -31,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:
@@ -51,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)
  */
@@ -94,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
@@ -124,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) {
@@ -152,7 +155,9 @@ public class VimTextObjEntireExtension implements VimExtension {
 
         });
       } else {
-        keyHandlerState.getCommandBuilder().addAction(textObjectHandler);
+        keyHandlerState.getCommandBuilder().completeCommandPart(new Argument(new Command(count,
+                                                                                         textObjectHandler, Command.Type.MOTION,
+                                                                                         EnumSet.noneOf(CommandFlags.class))));
       }
     }
   }

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

@@ -14,9 +14,7 @@ import com.maddyhome.idea.vim.api.ExecutionContext;
 import com.maddyhome.idea.vim.api.ImmutableVimCaret;
 import com.maddyhome.idea.vim.api.VimEditor;
 import com.maddyhome.idea.vim.api.VimInjectorKt;
-import com.maddyhome.idea.vim.command.MappingMode;
-import com.maddyhome.idea.vim.command.OperatorArguments;
-import com.maddyhome.idea.vim.command.TextObjectVisualType;
+import com.maddyhome.idea.vim.command.*;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.extension.ExtensionHandler;
 import com.maddyhome.idea.vim.extension.VimExtension;
@@ -32,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:
@@ -49,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)
  */
@@ -98,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();
 
@@ -248,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;
       }
 
@@ -262,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) {
@@ -282,7 +285,9 @@ public class VimIndentObject implements VimExtension {
 
         });
       } else {
-        keyHandlerState.getCommandBuilder().addAction(textObjectHandler);
+        keyHandlerState.getCommandBuilder().completeCommandPart(new Argument(new Command(count,
+                                                                                         textObjectHandler, Command.Type.MOTION,
+                                                                                         EnumSet.noneOf(CommandFlags.class))));
       }
     }
   }

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

@@ -7,7 +7,7 @@
  */
 package com.maddyhome.idea.vim.group
 
-import com.intellij.codeInsight.actions.AsyncActionExecutionService
+import com.intellij.codeInsight.actions.AsyncActionExecutionService.Companion.getInstance
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.application.ApplicationManager
@@ -15,7 +15,6 @@ import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.command.UndoConfirmationPolicy
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.actionSystem.TypedActionHandler
 import com.intellij.openapi.editor.actions.EnterAction
 import com.intellij.openapi.editor.event.EditorMouseEvent
 import com.intellij.openapi.editor.event.EditorMouseListener
@@ -34,15 +33,12 @@ import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.group.visual.vimSetSystemSelectionSilently
 import com.maddyhome.idea.vim.handler.commandContinuation
 import com.maddyhome.idea.vim.helper.inInsertMode
-import com.maddyhome.idea.vim.key.KeyHandlerKeeper
+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
 
 /**
  * Provides all the insert/replace related functionality
@@ -62,36 +58,16 @@ class ChangeGroup : VimChangeGroupBase() {
   }
 
   override fun type(vimEditor: VimEditor, context: ExecutionContext, key: Char) {
-    doType(vimEditor, context) {
-      it.execute(vimEditor.ij, key, context.ij)
-    }
-  }
-
-  override fun type(vimEditor: VimEditor, context: ExecutionContext, string: String) {
-    doType(vimEditor, context) { handler ->
-      string.forEach { char ->
-        handler.execute(vimEditor.ij, char, context.ij)
-      }
-    }
-  }
-
-  private fun doType(vimEditor: VimEditor, context: ExecutionContext, action: (TypedActionHandler) -> Unit) {
     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().runWriteAction {
-          action(KeyHandlerKeeper.getInstance().originalHandler)
-        }
+        ApplicationManager.getApplication()
+          .runWriteAction { getInstance().originalHandler.execute(editor, key, ijContext) }
       }, "", doc,
       UndoConfirmationPolicy.DEFAULT, doc
     )
@@ -127,11 +103,6 @@ class ChangeGroup : VimChangeGroupBase() {
     }
   }
 
-  override fun processBackspace(editor: VimEditor, context: ExecutionContext) {
-    injector.actionExecutor.executeAction(editor, name = IdeActions.ACTION_EDITOR_BACKSPACE, context = context)
-    injector.scroll.scrollCaretIntoView(editor)
-  }
-
   private fun restoreCursor(editor: VimEditor, caret: VimCaret, startLine: Int) {
     if (caret != editor.primaryCaret()) {
       (editor as IjVimEditor).editor.caretModel.addCaret(
@@ -144,9 +115,7 @@ class ChangeGroup : VimChangeGroupBase() {
     val project = (editor as IjVimEditor).editor.project ?: return
     val file = PsiUtilBase.getPsiFileInEditor(editor.editor, project) ?: return
     val textRange = com.intellij.openapi.util.TextRange.create(start, end)
-    injector.application.runWriteAction {
-      CodeStyleManager.getInstance(project).reformatText(file, listOf(textRange))
-    }
+    CodeStyleManager.getInstance(project).reformatText(file, listOf(textRange))
   }
 
   override fun autoIndentRange(
@@ -162,10 +131,10 @@ class ChangeGroup : VimChangeGroupBase() {
 
     // 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() 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
@@ -184,39 +153,31 @@ class ChangeGroup : VimChangeGroupBase() {
       restoreCursor(editor, caret, (caret as IjVimCaret).caret.logicalPosition.line)
     }
     if (project != null) {
-      AsyncActionExecutionService.getInstance(project)
+      getInstance(project)
         .withExecutionAfterAction(IdeActions.ACTION_EDITOR_AUTO_INDENT_LINES, actionExecution, afterAction)
     } else {
       actionExecution.invoke()
       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
     }
   }
 
-  @Deprecated(
-    message = "Please use listenersNotifier",
-    replaceWith = ReplaceWith(
-      "injector.listenersNotifier.modeChangeListeners.add",
-      imports = ["import com.maddyhome.idea.vim.api.injector"]
-    )
-  )
+  @Deprecated(message = "Please use listenersNotifier", replaceWith = ReplaceWith("injector.listenersNotifier.modeChangeListeners.add", imports = ["import com.maddyhome.idea.vim.api.injector"]))
   fun addInsertListener(listener: VimInsertListener) {
     injector.listenersNotifier.modeChangeListeners.add(listener)
   }
 
-  @Deprecated(
-    message = "Please use listenersNotifier",
-    replaceWith = ReplaceWith(
-      "injector.listenersNotifier.modeChangeListeners.remove",
-      imports = ["import com.maddyhome.idea.vim.api.injector"]
-    )
-  )
+  @Deprecated(message = "Please use listenersNotifier", replaceWith = ReplaceWith("injector.listenersNotifier.modeChangeListeners.remove", imports = ["import com.maddyhome.idea.vim.api.injector"]))
   fun removeInsertListener(listener: VimInsertListener) {
     injector.listenersNotifier.modeChangeListeners.remove(listener)
   }

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());
+}

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

@@ -23,6 +23,7 @@ import com.intellij.openapi.editor.ex.EditorGutterComponentEx;
 import com.intellij.openapi.project.Project;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.*;
+import com.maddyhome.idea.vim.ex.ExOutputModel;
 import com.maddyhome.idea.vim.helper.CaretVisualAttributesHelperKt;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import com.maddyhome.idea.vim.helper.UserDataManager;
@@ -42,7 +43,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static com.intellij.openapi.editor.EditorSettings.LineNumerationType;
+import static com.intellij.openapi.editor.EditorSettings.*;
 import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
 import static com.maddyhome.idea.vim.api.VimInjectorKt.options;
 import static com.maddyhome.idea.vim.newapi.IjVimInjectorKt.ijOptions;
@@ -156,8 +157,7 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
 
   private static void repaintRelativeLineNumbers(final @NotNull Editor editor) {
     final EditorGutter gutter = editor.getGutter();
-    final EditorGutterComponentEx gutterComponent =
-      gutter instanceof EditorGutterComponentEx ? (EditorGutterComponentEx)gutter : null;
+    final EditorGutterComponentEx gutterComponent = gutter instanceof EditorGutterComponentEx ? (EditorGutterComponentEx) gutter : null;
     if (gutterComponent != null) {
       gutterComponent.repaint();
     }
@@ -252,18 +252,18 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
 
   @Override
   public void notifyIdeaJoin(@NotNull VimEditor editor) {
-    notifyIdeaJoin(((IjVimEditor)editor).getEditor().getProject(), editor);
+    notifyIdeaJoin(((IjVimEditor) editor).getEditor().getProject(), editor);
   }
 
   @Override
   public void updateCaretsVisualAttributes(@NotNull VimEditor editor) {
-    Editor ijEditor = ((IjVimEditor)editor).getEditor();
+    Editor ijEditor = ((IjVimEditor) editor).getEditor();
     CaretVisualAttributesHelperKt.updateCaretsVisualAttributes(ijEditor);
   }
 
   @Override
   public void updateCaretsVisualPosition(@NotNull VimEditor editor) {
-    Editor ijEditor = ((IjVimEditor)editor).getEditor();
+    Editor ijEditor = ((IjVimEditor) editor).getEditor();
     CaretVisualAttributesHelperKt.updateCaretsVisualAttributes(ijEditor);
   }
 
@@ -310,21 +310,26 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
 
   @Override
   public @NotNull Collection<VimEditor> getEditorsRaw() {
-    return getLocalEditors().map(IjVimEditor::new).collect(Collectors.toList());
+    return getLocalEditors()
+      .map(IjVimEditor::new)
+      .collect(Collectors.toList());
   }
 
   @Override
   public @NotNull Collection<VimEditor> getEditors() {
-    return getLocalEditors().filter(UserDataManager::getVimInitialised).map(IjVimEditor::new)
+    return getLocalEditors()
+      .filter(UserDataManager::getVimInitialised)
+      .map(IjVimEditor::new)
       .collect(Collectors.toList());
   }
 
   @Override
   public @NotNull Collection<VimEditor> getEditors(@NotNull VimDocument buffer) {
     final Document document = ((IjVimDocument)buffer).getDocument();
-    return getLocalEditors().filter(
-        editor -> UserDataManager.getVimInitialised(editor) && editor.getDocument().equals(document))
-      .map(IjVimEditor::new).collect(Collectors.toList());
+    return getLocalEditors()
+      .filter(editor -> UserDataManager.getVimInitialised(editor) && editor.getDocument().equals(document))
+      .map(IjVimEditor::new)
+      .collect(Collectors.toList());
   }
 
   private Stream<Editor> getLocalEditors() {

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

@@ -32,13 +32,18 @@ import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimFileBase
 import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.group.LastTabService.Companion.getInstance
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.MessageHelper.message
+import com.maddyhome.idea.vim.helper.countWords
+import com.maddyhome.idea.vim.helper.fileSize
 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.*
 
@@ -261,6 +266,92 @@ class FileGroup : VimFileBase() {
     return null
   }
 
+  override fun displayLocationInfo(vimEditor: VimEditor) {
+    val editor = (vimEditor as IjVimEditor).editor
+    val msg = StringBuilder()
+    val doc = editor.document
+
+    if (injector.vimState.mode !is VISUAL) {
+      val lp = editor.caretModel.logicalPosition
+      val col = editor.caretModel.offset - doc.getLineStartOffset(lp.line)
+      var endoff = doc.getLineEndOffset(lp.line)
+      if (endoff < editor.fileSize && doc.charsSequence[endoff] == '\n') {
+        endoff--
+      }
+      val ecol = endoff - doc.getLineStartOffset(lp.line)
+      val elp = editor.offsetToLogicalPosition(endoff)
+
+      msg.append("Col ").append(col + 1)
+      if (col != lp.column) {
+        msg.append("-").append(lp.column + 1)
+      }
+
+      msg.append(" of ").append(ecol + 1)
+      if (ecol != elp.column) {
+        msg.append("-").append(elp.column + 1)
+      }
+
+      val lline = editor.caretModel.logicalPosition.line
+      val total = IjVimEditor(editor).lineCount()
+
+      msg.append("; Line ").append(lline + 1).append(" of ").append(total)
+
+      val cp = countWords(vimEditor)
+
+      msg.append("; Word ").append(cp.position).append(" of ").append(cp.count)
+
+      val offset = editor.caretModel.offset
+      val size = editor.fileSize
+
+      msg.append("; Character ").append(offset + 1).append(" of ").append(size)
+    } else {
+      msg.append("Selected ")
+
+      val vr = TextRange(
+        editor.selectionModel.blockSelectionStarts,
+        editor.selectionModel.blockSelectionEnds
+      )
+      vr.normalize()
+
+      val lines: Int
+      var cp = countWords(vimEditor)
+      val words = cp.count
+      var word = 0
+      if (vr.isMultiple) {
+        lines = vr.size()
+        val cols = vr.maxLength
+
+        msg.append(cols).append(" Cols; ")
+
+        for (i in 0 until vr.size()) {
+          cp = countWords(vimEditor, vr.startOffsets[i], (vr.endOffsets[i] - 1).toLong())
+          word += cp.count
+        }
+      } else {
+        val slp = editor.offsetToLogicalPosition(vr.startOffset)
+        val elp = editor.offsetToLogicalPosition(vr.endOffset)
+
+        lines = elp.line - slp.line + 1
+
+        cp = countWords(vimEditor, vr.startOffset, (vr.endOffset - 1).toLong())
+        word = cp.count
+      }
+
+      val total = IjVimEditor(editor).lineCount()
+
+      msg.append(lines).append(" of ").append(total).append(" Lines")
+
+      msg.append("; ").append(word).append(" of ").append(words).append(" Words")
+
+      val chars = vr.selectionCount
+      val size = editor.fileSize
+
+      msg.append("; ").append(chars).append(" of ").append(size).append(" Characters")
+    }
+
+    VimPlugin.showMessage(msg.toString())
+  }
+
   override fun displayFileInfo(vimEditor: VimEditor, fullPath: Boolean) {
     val editor = (vimEditor as IjVimEditor).editor
     val msg = StringBuilder()

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

@@ -14,10 +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.history.HistoryBlock;
-import com.maddyhome.idea.vim.history.HistoryEntry;
-import com.maddyhome.idea.vim.history.VimHistory;
-import com.maddyhome.idea.vim.history.VimHistoryBase;
+import com.maddyhome.idea.vim.history.*;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -28,7 +25,8 @@ import java.util.List;
 import static com.maddyhome.idea.vim.history.HistoryConstants.*;
 
 @State(name = "VimHistorySettings", storages = {
-  @Storage(value = "$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)})
+  @Storage(value = "$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)
+})
 public class HistoryGroup extends VimHistoryBase implements PersistentStateComponent<Element> {
 
   public void saveData(@NotNull Element element) {
@@ -107,7 +105,7 @@ public class HistoryGroup extends VimHistoryBase implements PersistentStateCompo
       return INPUT;
     }
     if (type instanceof VimHistory.Type.Custom) {
-      return ((Type.Custom)type).getId();
+      return ((Type.Custom) type).getId();
     }
     return "unreachable";
   }

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

@@ -31,8 +31,10 @@ open class GlobalIjOptions(scope: OptionAccessScope) : OptionsPropertiesBase(sco
 
   // Temporary options to control work-in-progress behaviour
   var closenotebooks: Boolean by optionProperty(IjOptions.closenotebooks)
+  var commandOrMotionAnnotation: Boolean by optionProperty(IjOptions.commandOrMotionAnnotation)
   var oldundo: Boolean by optionProperty(IjOptions.oldundo)
   var unifyjumps: Boolean by optionProperty(IjOptions.unifyjumps)
+  var vimscriptFunctionAnnotation: Boolean by optionProperty(IjOptions.vimscriptFunctionAnnotation)
 }
 
 /**
@@ -40,7 +42,7 @@ open class GlobalIjOptions(scope: OptionAccessScope) : OptionsPropertiesBase(sco
  *
  * As a convenience, this class also provides access to the IntelliJ specific global options, via inheritance.
  */
-class EffectiveIjOptions(scope: OptionAccessScope.EFFECTIVE) : GlobalIjOptions(scope) {
+class EffectiveIjOptions(scope: OptionAccessScope.EFFECTIVE): GlobalIjOptions(scope) {
   // Vim options that are implemented purely by existing IntelliJ features and not used by vim-engine
   var breakindent: Boolean by optionProperty(IjOptions.breakindent)
   val colorcolumn: StringListOptionValue by optionProperty(IjOptions.colorcolumn)

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

@@ -35,7 +35,7 @@ object IjOptions {
 
     // We also override the default value of 'clipboard', because IntelliJ supports the 'ideaput' item, which will use
     // IntelliJ's paste processes (e.g. to convert pasted Java to Kotlin)
-    Options.overrideDefaultValue(Options.clipboard, VimString("ideaput,autoselect"))
+    Options.overrideDefaultValue(Options.clipboard, VimString("ideaput,autoselect,exclude:cons\\|linux"))
   }
 
   // Vim options that are implemented purely by existing IntelliJ features and not used by vim-engine
@@ -122,7 +122,6 @@ object IjOptions {
       IjOptionConstants.ideavimsupportValues
     )
   )
-
   @JvmField
   val ideawrite: StringOption = addOption(
     StringOption("ideawrite", GLOBAL, "ideawrite", "all", IjOptionConstants.ideaWriteValues)
@@ -132,17 +131,17 @@ object IjOptions {
       "lookupkeys",
       GLOBAL,
       "lookupkeys",
-      "<Tab>,<Down>,<Up>,<Enter>,<Left>,<Right>,<C-Down>,<C-Up>,<PageUp>,<PageDown>,<C-J>,<C-Q>"
-    )
+      "<Tab>,<Down>,<Up>,<Enter>,<Left>,<Right>,<C-Down>,<C-Up>,<PageUp>,<PageDown>,<C-J>,<C-Q>")
   )
   val trackactionids: ToggleOption = addOption(ToggleOption("trackactionids", GLOBAL, "tai", false))
   val visualdelay: UnsignedNumberOption = addOption(UnsignedNumberOption("visualdelay", GLOBAL, "visualdelay", 100))
 
   // Temporary feature flags during development, not really intended for external use
-  val closenotebooks: ToggleOption =
-    addOption(ToggleOption("closenotebooks", GLOBAL, "closenotebooks", true, isHidden = true))
+  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 unifyjumps: ToggleOption = addOption(ToggleOption("unifyjumps", GLOBAL, "unifyjumps", true, isHidden = true))
+  val vimscriptFunctionAnnotation: ToggleOption = addOption(ToggleOption("vimscriptfunctionannotation", GLOBAL, "vimscriptfunctionannotation", true, isHidden = true))
 
   // This needs to be Option<out VimDataType> so that it can work with derived option types, such as NumberOption, which
   // derives from Option<VimInt>