Set plugin version to chylex-49

Make g0/g^/g$ work with soft wraps
Make gj/gk jump over soft wraps
2026-08-15 12:48:03 +02:00 · 2025-06-10 02:58:25 +02:00 · 2025-06-10 02:58:15 +02:00 · 2025-06-10 01:43:13 +02:00 · 2025-06-10 01:43:13 +02:00 · 2025-06-10 01:43:13 +02:00
874 changed files with 35056 additions and 121891 deletions
@@ -0,0 +1 @@
+* text=auto eol=lf
@@ -20,10 +20,10 @@ jobs:
      - name: Fetch origin repo
        uses: actions/checkout@v3

-      - name: Set up JDK 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -23,10 +23,10 @@ jobs:
          fetch-depth: 300
      - name: Get tags
        run: git fetch --tags origin
-      - name: Set up JDK 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -39,12 +39,18 @@ 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@v2
+      uses: actions/checkout@v4

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +61,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@v2
+      uses: github/codeql-action/autobuild@v3

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -69,4 +75,4 @@ jobs:
    #   make release

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
@@ -18,10 +18,10 @@ jobs:
      - uses: actions/checkout@v2
        with:
          fetch-depth: 300
-      - name: Set up JDK 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -18,10 +18,10 @@ jobs:
      - uses: actions/checkout@v2
        with:
          fetch-depth: 300
-      - name: Set up JDK 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -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 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -13,7 +13,7 @@ jobs:
        uses: actions/setup-java@v4
        with:
          distribution: zulu
-          java-version: 17
+          java-version: 21
      - 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-2024.1.2/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/IC-*/log_runIdeForUiTests idea-sandbox-log
      - name: Save report
        if: always()
        uses: actions/upload-artifact@v4
@@ -13,7 +13,7 @@ jobs:
        uses: actions/setup-java@v4
        with:
          distribution: zulu
-          java-version: 17
+          java-version: 21
      - 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-2024.1.2/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/PC-*/log_runIdeForUiTests idea-sandbox-log
      - name: Save report
        if: always()
        uses: actions/upload-artifact@v4
@@ -0,0 +1,51 @@
+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
@@ -13,7 +13,7 @@ jobs:
        uses: actions/setup-java@v4
        with:
          distribution: zulu
-          java-version: 17
+          java-version: 21
      - 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-2024.1.2/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/IC-*/log_runIdeForUiTests idea-sandbox-log
      - name: Save report
        if: always()
        uses: actions/upload-artifact@v4
@@ -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 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -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 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -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 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v2
        with:
-          java-version: '17'
+          java-version: '21'
          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
@@ -13,6 +13,7 @@
 !/.idea/vcs.xml
 !/.idea/misc.xml
 !/.idea/.name
+!/.idea/gradle.xml

 **/build/
 **/out/
@@ -31,4 +32,6 @@ vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
 # Created by github automation
 settings.xml

-.kotlin
+.kotlin
+
+.claude/settings.local.json
@@ -0,0 +1,27 @@
+<?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>
@@ -18,5 +18,5 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="corretto-21" project-jdk-type="JavaSDK" />
 </project>
@@ -5,12 +5,11 @@ object Constants {
  const val EAP_CHANNEL = "eap"
  const val DEV_CHANNEL = "Dev"

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

-  const val RELEASE_DEV = "2024.2.1"
-  const val RELEASE_EAP = "2024.2.1"
+  const val RELEASE_DEV = "2025.1"
+  const val RELEASE_EAP = "2025.1"
 }
@@ -5,7 +5,6 @@ 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.Releases
@@ -24,8 +23,8 @@ object Project : Project({
  vcsRoot(ReleasesVcsRoot)

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

  buildType(PropertyBased)
@@ -34,8 +33,6 @@ object Project : Project({
  buildType(Nvim)
  buildType(PluginVerifier)
  buildType(Compatibility)
-
-  buildType(Qodana)
 })

 // Common build type for all configurations
@@ -20,7 +20,7 @@ object Compatibility : IdeaVimBuildType({
      name = "Load Verifier"
      scriptContent = """
        mkdir verifier1
-        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"
+        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"
      """.trimIndent()
    }
    script {
@@ -33,16 +33,18 @@ 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-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
+              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
              # Outdated java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}github.zgqq.intellij-enhance' [latest-IU] -team-city
-              # java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.julienphalip.ideavim.peekaboo' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.julienphalip.ideavim.switch' [latest-IU] -team-city
-              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.julienphalip.ideavim.functiontextobj' [latest-IU] -team-city
+              # 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
            """.trimIndent()
    }
  }
@@ -1,72 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package _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"
-    }
-  }
-})
@@ -28,6 +28,7 @@ object LongRunning : IdeaVimBuildType({
      tasks = "clean :tests:long-running-tests:testLongRunning"
      buildFile = ""
      enableStacktrace = true
+      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
    }
  }

@@ -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-linux64/bin/nvim")
+    param("env.ideavim.nvim.path", "./nvim-linux-x86_64/bin/nvim")
  }

  vcs {
@@ -32,9 +32,9 @@ object Nvim : IdeaVimBuildType({
    script {
      name = "Set up NeoVim"
      scriptContent = """
-              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
+              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
              chmod +x nvim
              """.trimIndent()
    }
@@ -42,6 +42,7 @@ object Nvim : IdeaVimBuildType({
      tasks = "clean test -Dnvim"
      buildFile = ""
      enableStacktrace = true
+      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
    }
  }

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

@@ -1,42 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package _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"
-    }
-  }
-})
@@ -24,9 +24,11 @@ object PropertyBased : IdeaVimBuildType({

  steps {
    gradle {
+      clearConditions()
      tasks = "clean :tests:property-tests:testPropertyBased"
      buildFile = ""
      enableStacktrace = true
+      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
    }
  }

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

@@ -1,80 +0,0 @@
-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
-    }
-  }
-})
@@ -47,13 +47,16 @@ 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"
    }
  }

@@ -57,18 +57,22 @@ 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"
@@ -86,6 +90,7 @@ object ReleaseEap : IdeaVimBuildType({
    gradle {
      name = "YouTrack post release actions"
      tasks = "scripts:eapReleaseActions"
+      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
    }
  }

@@ -1,106 +0,0 @@
-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()
-      }
-    }
-  }
-})
@@ -28,7 +28,10 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
  name = "Publish $releaseType release"
  description = "Build and publish IdeaVim plugin"

-  artifactRules = "build/distributions/*"
+  artifactRules = """
+        build/distributions/*
+        build/reports/*
+    """.trimIndent()

  params {
    param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE)
@@ -90,10 +93,12 @@ 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"
@@ -106,6 +111,7 @@ 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"
@@ -114,6 +120,7 @@ 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"
@@ -145,6 +152,7 @@ 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"
@@ -12,7 +12,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

 open class TestingBuildType(
  private val testName: String,
-  private val branch: String,
+  private val branch: String = "<default>",
  private val version: String = testName,
  private val javaVersion: String? = null,
  private val javaPlugin: Boolean = true,
@@ -43,7 +43,7 @@ open class TestingBuildType(
      tasks = "clean test"
      buildFile = ""
      enableStacktrace = true
-      jdkHome = "/usr/lib/jvm/java-17-amazon-corretto"
+      jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
    }
  }

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

@@ -1,11 +1,8 @@
 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
@@ -41,8 +38,4 @@ object Releases : Project({
  buildType(ReleaseEap)
  buildType(ReleaseDev)
  buildType(PublishVimEngine)
-
-  buildType(CreateNewReleaseBranchFromMaster)
-  buildType(PrintReleaseBranch)
-  buildType(ReleaseEapFromBranch)
 })
@@ -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.03"
+version = "2024.12"
 project(_Self.Project)
@@ -26,6 +26,13 @@ Previous maintainers:
  &nbsp;
  Andrey Vlasovskikh

+Previous support members:
+
+* [![icon][mail]](mailto:lejia.chen@jetbrains.com)
+  [![icon][github-off]](#)
+  &nbsp;
+  Lejia Chen
+
 Contributors:

 * [![icon][mail]](mailto:yole@jetbrains.com)
@@ -498,7 +505,7 @@ Contributors:
 * [![icon][mail]](mailto:81118900+lippfi@users.noreply.github.com)
  [![icon][github]](https://github.com/lippfi)
  &nbsp;
-  lippfi, 
+  lippfi
 * [![icon][mail]](mailto:fillipser143@gmail.com)
  [![icon][github]](https://github.com/Parker7123)
  &nbsp;
@@ -514,7 +521,7 @@ Contributors:
 * [![icon][mail]](mailto:77796630+throwaway69420-69420@users.noreply.github.com)
  [![icon][github]](https://github.com/kun-codes)
  &nbsp;
-  Bishwa Saha, 
+  Bishwa Saha
 * [![icon][mail]](mailto:alexfu@fastmail.com)
  [![icon][github]](https://github.com/alexfu)
  &nbsp;
@@ -542,7 +549,7 @@ Contributors:
 * [![icon][mail]](mailto:kirill.karnaukhov@jetbrains.com)
  [![icon][github]](https://github.com/kkarnauk)
  &nbsp;
-  Kirill Karnaukhov, 
+  Kirill Karnaukhov
 * [![icon][mail]](mailto:sander.hestvik@gmail.com)
  [![icon][github]](https://github.com/SanderHestvik)
  &nbsp;
@@ -558,11 +565,55 @@ Contributors:
 * [![icon][mail]](mailto:j.trimailovas@gmail.com)
  [![icon][github]](https://github.com/trimailov)
  &nbsp;
-  Justas Trimailovas, 
+  Justas Trimailovas
 * [![icon][mail]](mailto:justast@wix.com)
  [![icon][github]](https://github.com/justast-wix)
  &nbsp;
  Justas Trimailovas
+* [![icon][mail]](mailto:wangxinhe06@gmail.com)
+  [![icon][github]](https://github.com/wxh06)
+  &nbsp;
+  Xinhe Wang
+* [![icon][mail]](mailto:vladimir.parfinenko@jetbrains.com)
+  [![icon][github]](https://github.com/cypok)
+  &nbsp;
+  Vladimir Parfinenko
+* [![icon][mail]](mailto:sdoerner@google.com)
+  [![icon][github]](https://github.com/sdoerner)
+  &nbsp;
+  Sebastian Dörner
+* [![icon][mail]](mailto:ocordova@pulsarml.com)
+  [![icon][github]](https://github.com/oca159)
+  &nbsp;
+  Osvaldo
+* [![icon][mail]](mailto:nath@squareup.com)
+  [![icon][github]](https://github.com/nath)
+  &nbsp;
+  Nath Tumlin
+* [![icon][mail]](mailto:ilya.usov@jetbrains.com)
+  [![icon][github]](https://github.com/Iliya-usov)
+  &nbsp;
+  Ilya Usov
+* [![icon][mail]](mailto:peterHoburg@users.noreply.github.com)
+  [![icon][github]](https://github.com/peterHoburg)
+  &nbsp;
+  Peter Hoburg
+* [![icon][mail]](mailto:erotourtes@gmail.com)
+  [![icon][github]](https://github.com/erotourtes)
+  &nbsp;
+  Max Siryk
+* [![icon][mail]](mailto:ivan.yarkov@jetbrains.com)
+  [![icon][github]](https://github.com/MToolMakerJB)
+  &nbsp;
+  Ivan Yarkov
+* [![icon][mail]](mailto:mia.vucinic@jetbrains.com)
+  [![icon][github]](https://github.com/vumi19)
+  &nbsp;
+  Mia Vucinic
+* [![icon][mail]](mailto:canava.thomas@gmail.com)
+  [![icon][github]](https://github.com/Malandril)
+  &nbsp;
+  Thomas Canava

 Previous contributors:

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

                        
 If you are a contributor and your name is not listed here, feel free to
@@ -1,26 +1,50 @@
 [![TeamCity Build][teamcity-build-status-svg]][teamcity-build-status]

-IdeaVim is an open source project created by 80+ contributors. Would you like to make it even better? That’s wonderful!
+IdeaVim is an open source project created by 130+ 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!

-: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).
+# 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.
+

 ## Before you begin

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

 - If you come across some IntelliJ Platform code, these links may prove helpful:

-    * [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)
+    * [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/)

 - Having any difficulties?
-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! 
+Ask any questions in [GitHub discussions](https://github.com/JetBrains/ideavim/discussions) or [IntelliJ Platform community space](https://platform.jetbrains.com/).

 OK, ready to do some coding?

@@ -82,7 +106,7 @@ If you are looking for:

 - Common features:
    - State machine. How every particular keystroke is parsed in IdeaVim: `KeyHandler.handleKey()`.
-    - Options (`incsearch`, `iskeyword`, `relativenumber`): `OptionServiceImpl`.
+    - Options (`incsearch`, `iskeyword`, `relativenumber`): `VimOptionGroup`.
    - Plugin startup: `PluginStartup`.
    - Notifications: `NotificationService`.
    - Status bar icon: `StatusBar.kt`.
@@ -110,7 +134,7 @@ Cras id tellus in ex imperdiet egestas.
 carets, dollar motion, etc.
   
 ##### Neovim
-IdeaVim has an experimental integration with neovim in tests. Tests that are performed with `doTest` also executed in
+IdeaVim has an 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.
@@ -136,14 +160,15 @@ We also support proper command mappings (functions are mapped to `<Plug>...`), t
 - Magic is supported as well. See `Magic`.


-## Fleet refactoring
-At the moment, IdeaVim is under an active refactoring aiming to split IdeaVim into two modules: vim-engine and IdeaVim.
+## 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.

 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. Also, we commit to support currently used API at least till the end of 2022.
+the plugins in the marketplace.
 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.


 -----
@@ -166,6 +191,7 @@ 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)
@@ -29,8 +29,8 @@ IdeaVim is a Vim engine for JetBrains IDEs.

 #### Compatibility

-IntelliJ IDEA, PyCharm, CLion, PhpStorm, WebStorm, RubyMine, AppCode, DataGrip, GoLand, Rider, Cursive,
-Android Studio and other IntelliJ platform based IDEs.
+IntelliJ IDEA, PyCharm, GoLand, CLion, PhpStorm, WebStorm, RubyMine, DataGrip, DataSpell, Rider, Cursive,
+Android Studio, and other [JetBrains IDEs](https://www.jetbrains.com/ides/).

 Setup
 ------------
@@ -85,33 +85,16 @@ 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/%22set%22-commands)
+* Some [set commands](https://github.com/JetBrains/ideavim/wiki/set-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):
-
-* vim-easymotion
-* NERDTree
-* vim-surround
-* vim-multiple-cursors
-* vim-commentary
-* argtextobj.vim
-* vim-textobj-entire
-* ReplaceWithRegister
-* vim-exchange
-* vim-highlightedyank
-* vim-paragraph-motion
-* vim-indent-object
-* match.it  
-etc
+* Vim script
+* IdeaVim plugins

 See also:

 * [Top feature requests and bugs](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+sort+by%3A+votes)
-* [Vimscript support roadmap](vimscript-info/VIMSCRIPT_ROADMAP.md)
-* [List of supported in-build functions](vimscript-info/FUNCTIONS_INFO.MD)

 Files
 -----
@@ -265,8 +248,7 @@ IdeaVim can execute custom scripts that are written with Vim Script.
 At the moment we support all language features, but not all of the built-in functions and options are supported.

 Additionally, you may be interested in the
-[Vim Script Discussion](https://github.com/JetBrains/ideavim/discussions/357) or
-[Vim Script Roadmap](https://github.com/JetBrains/ideavim/blob/master/vimscript-info/VIMSCRIPT_ROADMAP.md).
+[Vim Script Discussion](https://github.com/JetBrains/ideavim/discussions/357).


 ### IDE specific options
@@ -309,7 +291,9 @@ endif

 The power of contributing drives IdeaVim :muscle:. Even small contributions matter!

-See [CONTRIBUTING.md](CONTRIBUTING.md) to start bringing your value to the project.
+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.

 Authors
 -------
@@ -324,11 +308,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/%22set%22-commands).
+    - Check out more [ex commands](https://github.com/JetBrains/ideavim/wiki/set-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/%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).
+- 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).

 Some facts about Vim
 -------
@@ -370,6 +354,12 @@ 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
 -------

@@ -8,7 +8,7 @@

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

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

 dependencies {
-  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.1.0-1.0.29")
+  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.1")
  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")
@@ -31,6 +31,7 @@ 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
@@ -45,19 +46,19 @@ buildscript {
  }

  dependencies {
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
    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.1.0.202411261347-r")
+    classpath("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:7.2.1.202505142326-r")
    classpath("org.kohsuke:github-api:1.305")

-    classpath("io.ktor:ktor-client-core:3.0.2")
-    classpath("io.ktor:ktor-client-cio:3.0.2")
-    classpath("io.ktor:ktor-client-auth:3.0.2")
-    classpath("io.ktor:ktor-client-content-negotiation:3.0.2")
-    classpath("io.ktor:ktor-serialization-kotlinx-json:3.0.2")
+    classpath("io.ktor:ktor-client-core: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")

    // This comes from the changelog plugin
 //        classpath("org.jetbrains:markdown:0.3.1")
@@ -66,14 +67,19 @@ buildscript {

 plugins {
  java
-  kotlin("jvm") version "2.0.0"
+  kotlin("jvm") version "2.0.21"
  application
  id("java-test-fixtures")
-  id("org.jetbrains.intellij.platform") version "2.2.0"
+
+  // 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.6.0"
+
  id("org.jetbrains.changelog") version "2.2.1"
  id("org.jetbrains.kotlinx.kover") version "0.6.1"
-  id("com.dorongold.task-tree") version "4.0.0"
-  id("com.google.devtools.ksp") version "2.0.0-1.0.23"
+  id("com.dorongold.task-tree") version "4.0.1"
+  id("com.google.devtools.ksp") version "2.0.21-1.0.25"
 }

 val moduleSources by configurations.registering
@@ -107,12 +113,16 @@ dependencies {
  compileOnly(project(":annotation-processors"))

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

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

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

-    // [VERSION UPDATE] 2024.3+
-    // Dirty hack: in 2024.3+ the json plugin is extracted. So, the tests that use JSON don't work.
-    // If the IdeaVim minimal version is bumped to 2024.3, leave only `bundledPlugins...` line
-    // If we start to support a new version like 2024.2.2 or 2025.1.1, please add it to the correct branch of this when
-    // This check intentionally has a pattern where we explicitly specify if to use the JSON plugin for each
-    //   supported version or not to prevent developers from figuring out what happened with JSON.
-    when (ideaVersion) {
-      "2024.2.1" -> { /* Nothing */ }
-      "LATEST-EAP-SNAPSHOT", "2024.3" -> bundledPlugins("com.intellij.modules.json")
-      else -> error("Unsupported version: $ideaVersion")
-    }
+    bundledPlugins("org.jetbrains.plugins.terminal")
  }

  moduleSources(project(":vim-engine", "sourcesJarArtifacts"))
@@ -161,17 +161,17 @@ dependencies {
  // https://mvnrepository.com/artifact/org.mockito.kotlin/mockito-kotlin
  testImplementation("org.mockito.kotlin:mockito-kotlin:5.4.0")

-  testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.5")
-  testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.5")
-  testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.5")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:5.10.5")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.5")
-  testFixturesImplementation("org.junit.jupiter:junit-jupiter-params:5.10.5")
+  testImplementation("org.junit.jupiter:junit-jupiter-api:5.13.0")
+  testImplementation("org.junit.jupiter:junit-jupiter-engine:5.13.0")
+  testImplementation("org.junit.jupiter:junit-jupiter-params:5.13.0")
+  testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:5.13.0")
+  testFixturesImplementation("org.junit.jupiter:junit-jupiter-engine:5.13.0")
+  testFixturesImplementation("org.junit.jupiter:junit-jupiter-params:5.13.0")

  // Temp workaround suggested in https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#junit5-test-framework-refers-to-junit4
  // Can be removed when IJPL-159134 is fixed
 //  testRuntimeOnly("junit:junit:4.13.2")
-  testImplementation("org.junit.vintage:junit-vintage-engine:5.10.5")
+  testImplementation("org.junit.vintage:junit-vintage-engine:5.13.0")
 //  testFixturesImplementation("org.junit.vintage:junit-vintage-engine:5.10.3")
 }

@@ -181,19 +181,34 @@ 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()

    // Set teamcity env variable locally to run additional tests for leaks.
-    // By default, this test runs on TC only, but this test doesn't take a lot of time,
-    //   so we can turn it on for local development
-    if (environment["TEAMCITY_VERSION"] == null) {
-      println("Set env TEAMCITY_VERSION to X to enable project leak checks from the platform")
-      environment("TEAMCITY_VERSION" to "X")
-    }
+    println("Project leak checks: If you experience project leaks on TeamCity that doesn't reproduce locally")
+    println("Uncomment the following line in build.gradle to enable leak checks (see build.gradle config)")
+//      environment("TEAMCITY_VERSION" to "X")

    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 {
@@ -211,7 +226,7 @@ tasks {
      jvmTarget = javaVersion
      // See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
      // For the list of bundled versions
-      apiVersion = "1.9"
+      apiVersion = "2.0"
      freeCompilerArgs = listOf(
        "-Xjvm-default=all-compatibility",

@@ -225,9 +240,11 @@ tasks {
  }

  compileTestKotlin {
+    enabled = false
+    
    kotlinOptions {
      jvmTarget = javaVersion
-      apiVersion = "1.9"
+      apiVersion = "2.0"

      // Needed to compile the AceJump which uses kotlin beta
      //  Without these two option compilation fails
@@ -240,6 +257,7 @@ 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
@@ -324,9 +342,7 @@ intellijPlatform {
    name = "IdeaVim"
    changeNotes.set(
      """
-        Undo in IdeaVim now works like in Vim<br/>
-        Caret movement is no longer a separate undo step, and full insert is undoable in one step.<br/>
-        <a href="https://youtrack.jetbrains.com/issue/VIM-547/Undo-splits-Insert-mode-edits-into-separate-undo-chunks">Share Feedback</a>
+        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> .
        <br/>
        <br/>
        <a href="https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20Fix%20versions:%20${version.get()}">Changelog</a>
@@ -814,7 +830,9 @@ 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[24]
+  val contributorsSection = tree.children
+    .filter { it is ListCompositeNode }
+    .single { it.getTextInNode(authors).contains("yole") }
  val existingEmails = mutableSetOf<String>()
  for (child in contributorsSection.children) {
    if (child.children.size > 1) {
@@ -837,7 +855,7 @@ fun updateAuthors(uncheckedEmails: Set<String>) {
 }

 fun List<Author>.toMdString(): String {
-  return this.joinToString {
+  return this.joinToString(separator = "") {
    """
          |
          |* [![icon][mail]](mailto:${it.mail})
@@ -16,10 +16,95 @@ in `~/.ideavimrc`. E.g. `set nosurround`.
 Available plugins:

 <details>
-<summary><h2>easymotion</h2></summary>
+<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>
   
 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.
@@ -41,80 +126,176 @@ All commands with the mappings are supported. See the [full list of supported co

 </details>

-
 <details>
-<summary><h2>sneak</h2></summary>
+<summary><h2>exchange: Easy text exchange operator</h2></summary>

-<img src="images/sneakIcon.svg" width="80" height="80" alt="icon"/>  
+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.

-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 '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'`
+- Add the following command to `~/.ideavimrc`: `Plug 'tommcdo/vim-exchange'`
    <details>
      <summary>Alternative syntax</summary>
-      <code>Plugin 'preservim/nerdtree'</code>
+      <code>Plugin 'tommcdo/vim-exchange'</code>
      <br/>
-      <code>Plug 'https://github.com/preservim/nerdtree'</code>
+      <code>Plug 'https://github.com/tommcdo/vim-exchange'</code>
      <br/>
-      <code>Plug 'nerdtree'</code>
+      <code>Plug 'vim-exchange'</code>
      <br/>
-      <code>set NERDTree</code>
+      <code>set exchange</code>
      </details>
-   
+
 ### Instructions
-   
-[See here](NERDTree-support.md).
+
+https://github.com/tommcdo/vim-exchange/blob/master/doc/exchange.txt

 </details>

 <details>
-<summary><h2>surround</h2></summary>
-   
-Original plugin: [vim-surround](https://github.com/tpope/vim-surround).
-   
+<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!
+
 ### Setup:
- Add the following command to `~/.ideavimrc`: `Plug 'tpope/vim-surround'`
+- Add the following command to `~/.ideavimrc`: `Plug 'machakann/vim-highlightedyank'`
    <details>
      <summary>Alternative syntax</summary>
-      <code>Plugin 'tpope/vim-surround'</code>
+      <code>Plugin 'machakann/vim-highlightedyank'</code>
      <br/>
-      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=1697'</code>
+      <code>Plug 'https://github.com/machakann/vim-highlightedyank'</code>
      <br/>
-      <code>Plug 'vim-surround'</code>
+      <code>Plug 'vim-highlightedyank'</code>
      <br/>
-      <code>set surround</code>
+      <code>set highlightedyank</code>
      </details>
-   
+
 ### Instructions
-   
-https://github.com/tpope/vim-surround/blob/master/doc/surround.txt
+
+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

 </details>

 <details>
-<summary><h2>multiple-cursors</h2></summary>
-   
+<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>
+
 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>
@@ -127,7 +308,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...
@@ -153,38 +334,118 @@ xmap <leader>g<C-n> <Plug>AllOccurrences
 </details>

 <details>
-<summary><h2>commentary</h2></summary>
+<summary><h2>NERDTree: Adds NERDTree navigation to the project panel</h2></summary>
+   
+Original plugin: [NERDTree](https://github.com/preservim/nerdtree).

-By [Daniel Leong](https://github.com/dhleong)  
-Original plugin: [commentary.vim](https://github.com/tpope/vim-commentary).
+### Summary:
+Adds NERDTree navigation to the project panel. 
   
 ### Setup:
- Add the following command to `~/.ideavimrc`: `Plug 'tpope/vim-commentary'`
+- Add the following command to `~/.ideavimrc`: `Plug 'preservim/nerdtree'`
    <details>
      <summary>Alternative syntax</summary>
-      <code>Plugin 'tpope/vim-commentary'</code>
+      <code>Plugin 'preservim/nerdtree'</code>
      <br/>
-      <code>Plug 'https://github.com/tpope/vim-commentary'</code>
+      <code>Plug 'https://github.com/preservim/nerdtree'</code>
      <br/>
-      <code>Plug 'vim-commentary'</code>
+      <code>Plug 'nerdtree'</code>
      <br/>
-      <code>Plug 'tcomment_vim'</code>
-      <br/>
-      <code>set commentary</code>
+      <code>set NERDTree</code>
      </details>
   
 ### Instructions
   
-https://github.com/tpope/vim-commentary/blob/master/doc/commentary.txt
+[See here](NERDTree-support.md).

 </details>

 <details>
-<summary><h2>ReplaceWithRegister</h2></summary>
-   
+<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>
+
 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>
@@ -203,78 +464,99 @@ Original plugin: [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWit
      <br/>
      <code>set ReplaceWithRegister</code>
      </details>
-   
+
 ### Instructions
-   
+
 https://github.com/vim-scripts/ReplaceWithRegister/blob/master/doc/ReplaceWithRegister.txt

 </details>

 <details>
-<summary><h2>argtextobj</h2></summary>
+<summary><h2>sneak: Jump to any location specified by two characters</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.

-Original plugin: [argtextobj.vim](https://www.vim.org/scripts/script.php?script_id=2699).
-   
 ### Setup:
- Add the following command to `~/.ideavimrc`: `Plug 'vim-scripts/argtextobj.vim'`
+- 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: [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'`
    <details>
      <summary>Alternative syntax</summary>
-      <code>Plugin 'vim-scripts/argtextobj.vim'</code>
+      <code>Plugin 'tpope/vim-surround'</code>
      <br/>
-      <code>Plug 'https://github.com/vim-scripts/argtextobj.vim'</code>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=1697'</code>
      <br/>
-      <code>Plug 'argtextobj.vim'</code>
+      <code>Plug 'vim-surround'</code>
      <br/>
-      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=2699'</code>
-      <br/>
-      <code>set argtextobj</code>
+      <code>set surround</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
+https://github.com/tpope/vim-surround/blob/master/doc/surround.txt

 </details>
-   

 <details>
-<summary><h2>exchange</h2></summary>
+<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.

-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://github.com/tommcdo/vim-exchange/blob/master/doc/exchange.txt
+
+https://plugins.jetbrains.com/plugin/25899-vim-switch

 </details>
-   
+
 <details>
-<summary><h2>textobj-entire</h2></summary>
+<summary><h2>textobj-entire: Adds mapping for selecting entire contents of file regardless of cursor position</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>
@@ -295,140 +577,13 @@ https://github.com/kana/vim-textobj-entire/blob/master/doc/textobj-entire.txt
 </details>
   
 <details>
-<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)"`
-
-If you want to change text color of highlight you can provide the rgba of the color you want e.g.  
-`let g:highlightedyank_highlight_foreground_color = "rgba(0, 0, 0, 255)"`
-
-https://github.com/machakann/vim-highlightedyank/blob/master/doc/highlightedyank.txt
-
-</details>
-
-<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>
+<summary><h2>Which-Key: Displays available keybindings in popup</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`
@@ -438,50 +593,3 @@ Original plugin: [vim-which-key](https://github.com/liuchengxu/vim-which-key).
 https://github.com/TheBlob42/idea-which-key?tab=readme-ov-file#installation

 </details>
-<details>
-<summary><h2>Vim Peekaboo</h2></summary>
-
-By Julien Phalip  
-Original plugin: [vim-peekaboo](https://github.com/junegunn/vim-peekaboo).
-
-### Setup
-
-Add `set peekaboo` to your `~/.ideavimrc` file, then run `:source ~/.ideavimrc`
-or restart the IDE.
-
-### Instructions
-
-https://plugins.jetbrains.com/plugin/25776-vim-peekaboo
-</details>
-
-<details>
-<summary><h2>FunctionTextObj</h2></summary>
-
-By Julien Phalip  
-
-### Setup
-
-Add `set functiontextobj` to your `~/.ideavimrc` file, then run `:source ~/.ideavimrc`
-or restart the IDE.
-
-### Instructions
-
-https://plugins.jetbrains.com/plugin/25897-vim-functiontextobj
-</details>
-
-<details>
-<summary><h2>Switch</h2></summary>
-
-By Julien Phalip  
-Original plugin: [switch.vim](https://github.com/AndrewRadev/switch.vim).
-
-### Setup
-
-Add `set switch` to your `~/.ideavimrc` file, then run `:source ~/.ideavimrc`
-or restart the IDE.
-
-### Instructions
-
-https://plugins.jetbrains.com/plugin/25899-vim-switch
-
-</details>
@@ -0,0 +1,44 @@
+# 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.
@@ -16,19 +16,19 @@
 # https://data.services.jetbrains.com/products?code=IC
 # Maven releases are here: https://www.jetbrains.com/intellij-repository/releases
 # And snapshots: https://www.jetbrains.com/intellij-repository/snapshots
-ideaVersion=2024.2.1
+ideaVersion=2025.1
 # Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 ideaType=IC
 instrumentPluginCode=true
-version=SNAPSHOT
-javaVersion=17
+version=chylex-49
+javaVersion=21
 remoteRobotVersion=0.11.23
 antlrVersion=4.10.1


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

@@ -41,7 +41,6 @@ youtrackToken=

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

 # Disable warning from gradle-intellij-plugin. Kotlin stdlib is included as compileOnly, so the warning is unnecessary
@@ -49,3 +48,5 @@ 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
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -1,30 +0,0 @@
-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"
@@ -20,17 +20,17 @@ repositories {
 }

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

-  implementation("io.ktor:ktor-client-core:3.0.2")
-  implementation("io.ktor:ktor-client-cio:3.0.2")
-  implementation("io.ktor:ktor-client-content-negotiation:3.0.2")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:3.0.2")
-  implementation("io.ktor:ktor-client-auth:3.0.2")
+  implementation("io.ktor:ktor-client-core: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("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")

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

@@ -107,13 +107,6 @@ 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")
@@ -43,6 +43,8 @@ val knownPlugins = setOf(
  "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() {
@@ -1,49 +0,0 @@
-/*
- * Copyright 2003-2023 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package 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()
-}
@@ -19,3 +19,4 @@ include("tests:long-running-tests")
 include("tests:ui-ij-tests")
 include("tests:ui-py-tests")
 include("tests:ui-fixtures")
+include("tests:ui-rd-tests")
@@ -10,6 +10,7 @@ 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
@@ -21,6 +22,7 @@ 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
@@ -40,22 +42,28 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {
    if (firstInitializationOccurred) return
    firstInitializationOccurred = true

-    if (!VimPlugin.getVimState().wasSubscibedToEAPAutomatically && ApplicationManager.getApplication().isEAP && !JoinEap.eapActive()) {
-      VimPlugin.getVimState().wasSubscibedToEAPAutomatically = true
+    if (!VimPlugin.getVimState().wasSubscribedToEAPAutomatically && ApplicationManager.getApplication().isEAP && !JoinEap.eapActive()) {
+      VimPlugin.getVimState().wasSubscribedToEAPAutomatically = 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) {
-        if (descriptor.pluginId == VimPlugin.getPluginId()) {
-          BrowserUtil.open("https://surveys.jetbrains.com/s3/ideavim-uninstall-feedback")
+        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")
        }
      }
    })
@@ -215,7 +215,8 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable

    if (enabled) {
      VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOn();
-    } else {
+    }
+    else {
      VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOff();
    }

@@ -354,7 +355,12 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
    if (unsubscribe) {
      VimListenerManager.INSTANCE.turnOff();
    }
-    injector.getCommandLine().fullReset();
+    // 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();
+    }

    // Unregister vim actions in command mode
    RegisterActions.unregisterActions();
@@ -370,8 +376,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
    if (isEnabled() && !ApplicationManager.getApplication().isUnitTestMode()) {
      stateUpdated = true;
      if (SystemInfo.isMac) {
-        final MacKeyRepeat keyRepeat = MacKeyRepeat.getInstance();
-        final Boolean enabled = keyRepeat.isEnabled();
+        final Boolean enabled = MacKeyRepeat.INSTANCE.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
@@ -381,7 +386,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
          if (showNotification) {
            if (VimPlugin.getNotifications().enableRepeatingMode() == Messages.YES) {
              getEditor().setKeyRepeat(true);
-              keyRepeat.setEnabled(true);
+              MacKeyRepeat.INSTANCE.setEnabled(true);
            }
            else {
              getEditor().setKeyRepeat(false);
@@ -44,7 +44,12 @@ 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
    }

@@ -83,7 +88,7 @@ class VimTypedActionHandler(origHandler: TypedActionHandler) : TypedActionHandle
        LOG.info("VimTypedAction '$charTyped': $duration ms")
      }
    } catch (e: ProcessCanceledException) {
-      // Nothing
+      throw e
    } catch (e: Throwable) {
      LOG.error(e)
    }
@@ -0,0 +1,52 @@
+package com.maddyhome.idea.vim.action
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread
+import com.intellij.openapi.actionSystem.AnActionEvent
+import com.intellij.openapi.command.UndoConfirmationPolicy
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.fileEditor.TextEditor
+import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
+import com.intellij.openapi.project.DumbAwareAction
+import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
+import com.maddyhome.idea.vim.newapi.vim
+import com.maddyhome.idea.vim.state.mode.Mode
+
+class VimRunLastMacroInOpenFiles : DumbAwareAction() {
+  override fun update(e: AnActionEvent) {
+    val lastRegister = injector.macro.lastRegister
+    val isEnabled = lastRegister != 0.toChar()
+
+    e.presentation.isEnabled = isEnabled
+    e.presentation.text = if (isEnabled) "Run Macro '${lastRegister}' in Open Files" else "Run Last Macro in Open Files"
+  }
+
+  override fun getActionUpdateThread(): ActionUpdateThread {
+    return ActionUpdateThread.EDT
+  }
+
+  override fun actionPerformed(e: AnActionEvent) {
+    val project = e.project ?: return
+    val fileEditorManager = FileEditorManagerEx.getInstanceExIfCreated(project) ?: return
+    val editors = fileEditorManager.allEditors.filterIsInstance<TextEditor>()
+    
+    WriteCommandAction.writeCommandAction(project)
+      .withName(e.presentation.text)
+      .withGlobalUndo()
+      .withUndoConfirmationPolicy(UndoConfirmationPolicy.REQUEST_CONFIRMATION)
+      .run<RuntimeException> {
+        val reg = injector.macro.lastRegister
+        
+        for (editor in editors) {
+          fileEditorManager.openFile(editor.file, true)
+          
+          val vimEditor = editor.editor.vim
+          vimEditor.mode = Mode.NORMAL()
+          KeyHandler.getInstance().reset(vimEditor)
+          
+          injector.macro.playbackRegister(vimEditor, IjEditorExecutionContext(e.dataContext), reg, 1)
+        }
+      }
+  }
+}
@@ -14,13 +14,16 @@ 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
@@ -41,7 +44,6 @@ 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
@@ -57,11 +59,8 @@ import javax.swing.KeyStroke
 *
 *
 * These keys are not passed to [com.maddyhome.idea.vim.VimTypedActionHandler] and should be handled by actions.
- *
- * This class is used in Which-Key plugin, so don't make it internal. Generally, we should provide a proper
- *   way to get ideavim keys for this plugin. See VIM-3085
 */
-class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
+internal class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {

  init {
    initInjector()
@@ -88,11 +87,12 @@ 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 update '$keyStroke': $duration ms")
+          LOG.info("VimShortcut execution '$keyStroke': $duration ms")
        }
-      } catch (ignored: ProcessCanceledException) {
-        // Control-flow exceptions (like ProcessCanceledException) should never be logged
+      } catch (e: ProcessCanceledException) {
+        // Control-flow exceptions (like ProcessCanceledException) should never be logged and should be rethrown
        // See {@link com.intellij.openapi.diagnostic.Logger.checkException}
+        throw e
      } catch (throwable: Throwable) {
        LOG.error(throwable)
      }
@@ -116,115 +116,119 @@ 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)
-    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 (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 editor = getEditor(e) ?: return ActionEnableStatus.no("Can't get Editor", LogLevel.DEBUG)

-      val keyCode = keyStroke.keyCode
+    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() }
-        }
-        return ActionEnableStatus.no("Python notebook is in command mode", LogLevel.INFO)
+    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 (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 (LookupManager.getActiveLookup(editor) != null && !LookupKeys.isEnabledForLookup(keyStroke)) {
-        return ActionEnableStatus.no("Lookup keys are active", LogLevel.INFO)
-      }
+    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_ESCAPE) {
-        return if (isEnabledForEscape(editor)) {
-          ActionEnableStatus.yes("Is enabled for Esc", LogLevel.INFO)
-        } else {
-          ActionEnableStatus.no("Is disabled for Esc", 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)
      }
+    }

-      if (keyCode == KeyEvent.VK_TAB && editor.isTemplateActive()) {
-        return ActionEnableStatus.no("The key is tab and the template is active", LogLevel.INFO)
-      }
+    if (keyStroke in VIM_ONLY_EDITOR_KEYS) {
+      return ActionEnableStatus.yes("Vim only editor keys", LogLevel.INFO)
+    }

-      if ((keyCode == KeyEvent.VK_TAB || keyCode == KeyEvent.VK_ENTER) && editor.appCodeTemplateCaptured()) {
-        return ActionEnableStatus.no("App code template is 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)
      }

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

-      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)
+      else -> {
+        if (isShortcutConflict(keyStroke)) {
+          savedShortcutConflicts[keyStroke] = ShortcutOwnerInfo.allUndefined
        }
+        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
@@ -339,14 +343,6 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {

    private const val ACTION_ID = "VimShortcutKeyAction"

-    private val NON_FILE_EDITOR_KEYS: Set<KeyStroke> = ImmutableSet.builder<KeyStroke>()
-      .addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_UP, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0))
-      .build()
-
    private val LOG = logger<VimShortcutKeyAction>()

    @JvmStatic
@@ -387,4 +383,10 @@ 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
+  }
@@ -37,7 +37,12 @@ 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,
+  motionType: SelectionType,
+): Boolean {
  val func = injector.globalOptions().operatorfunc
  if (func.isEmpty()) {
    VimPlugin.showMessage(MessageHelper.message("E774"))
@@ -61,8 +66,7 @@ private fun doOperatorAction(editor: VimEditor, context: ExecutionContext, textR
        // Get the argument for function('...') or funcref('...') for the error message
        val functionName = if (expression is FunctionCallExpression && expression.arguments.isNotEmpty()) {
          expression.arguments[0].evaluate(editor, context, scriptContext).toString()
-        }
-        else {
+        } else {
          func
        }

@@ -100,7 +104,12 @@ 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 {
+  override fun execute(
+    editor: VimEditor,
+    context: ExecutionContext,
+    cmd: Command,
+    operatorArguments: OperatorArguments,
+  ): Boolean {
    val argument = cmd.argument as? Argument.Motion ?: return false
    if (!editor.inRepeatMode) {
      argumentCaptured = argument
@@ -23,7 +23,12 @@ 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

@@ -38,7 +38,7 @@ 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) {
@@ -67,7 +67,7 @@ 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) {
@@ -85,7 +85,12 @@ 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
  }
@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * 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
@@ -12,12 +12,10 @@ 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
+import org.jetbrains.annotations.ApiStatus

-/**
- * COMPATIBILITY-LAYER: Additional class
- * Please see: https://jb.gg/zo8n0r
- */
@Deprecated("Use `injector.vimState`")
+@ApiStatus.ScheduledForRemoval
 class CommandState(private val machine: VimStateMachine) {

  val mode: Mode
@@ -34,18 +32,21 @@ class CommandState(private val machine: VimStateMachine) {
      }
    }

-  @Deprecated("Use `KeyHandler.keyHandlerState.commandBuilder", ReplaceWith(
-    "KeyHandler.getInstance().keyHandlerState.commandBuilder",
-    "com.maddyhome.idea.vim.KeyHandler"
-  )
+  @get:Deprecated(
+    "Use `KeyHandler.keyHandlerState.commandBuilder", ReplaceWith(
+      "KeyHandler.getInstance().keyHandlerState.commandBuilder",
+      "com.maddyhome.idea.vim.KeyHandler"
+    )
  )
+  @get:ApiStatus.ScheduledForRemoval
  val commandBuilder: CommandBuilder
    get() = KeyHandler.getInstance().keyHandlerState.commandBuilder

-  @Deprecated("Use `KeyHandler.keyHandlerState.mappingState", ReplaceWith(
-    "KeyHandler.getInstance().keyHandlerState.mappingState",
-    "com.maddyhome.idea.vim.KeyHandler"
-  )
+  @Deprecated(
+    "Use `KeyHandler.keyHandlerState.mappingState", ReplaceWith(
+      "KeyHandler.getInstance().keyHandlerState.mappingState",
+      "com.maddyhome.idea.vim.KeyHandler"
+    )
  )
  val mappingState: MappingState
    get() = KeyHandler.getInstance().keyHandlerState.mappingState
@@ -65,6 +66,7 @@ class CommandState(private val machine: VimStateMachine) {
  companion object {
    @JvmStatic
    @Deprecated("Use `injector.vimState`")
+    @ApiStatus.ScheduledForRemoval
    fun getInstance(editor: Editor): CommandState {
      return CommandState(injector.vimState)
    }
@@ -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
@@ -18,8 +18,8 @@ import kotlin.reflect.KProperty
 internal class VimState {
  var isIdeaJoinNotified by StateProperty("idea-join")
  var isIdeaPutNotified by StateProperty("idea-put")
-  var isNewUndoNotified by StateProperty("idea-undo")
-  var wasSubscibedToEAPAutomatically by StateProperty("was-automatically-subscribed-to-eap")
+  var wasSubscribedToEAPAutomatically by StateProperty("was-automatically-subscribed-to-eap")
+  var firstIdeaVimVersion: String? by StringProperty("first-ideavim-version", null)

  fun readData(element: Element) {
    val notifications = element.getChild("notifications")
@@ -28,6 +28,11 @@ 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) {
@@ -39,10 +44,22 @@ 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> {

@@ -56,3 +73,19 @@ 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
+  }
+}
@@ -0,0 +1,27 @@
+/*
+ * 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
+  }
+}
@@ -127,8 +127,7 @@ 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
    }
  }
@@ -40,7 +40,7 @@ public interface VimExtension {
   * 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.
+   * immediately, this variable won't be initialized at the moment of plugin initialization.
   * <p>
   * There is also a tricky case for mappings override:
   * ```
@@ -48,8 +48,8 @@ public interface VimExtension {
   * 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.
+   * `<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();

@@ -69,7 +69,8 @@ object VimExtensionFacade {


  @JvmStatic
-  @Deprecated("Use VimPlugin.getKey().putKeyMapping(modes, fromKeys, pluginOwner, extensionHandler, recursive)",
+  @Deprecated(
+    "Use VimPlugin.getKey().putKeyMapping(modes, fromKeys, pluginOwner, extensionHandler, recursive)",
    ReplaceWith(
      "VimPlugin.getKey().putKeyMapping(modes, fromKeys, pluginOwner, extensionHandler, recursive)",
      "com.maddyhome.idea.vim.VimPlugin"
@@ -145,7 +146,7 @@ object VimExtensionFacade {
  fun executeNormalWithoutMapping(keys: List<KeyStroke>, editor: Editor) {
    val context = injector.executionContextManager.getEditorExecutionContext(editor.vim)
    val keyHandler = KeyHandler.getInstance()
-    keys.forEach { keyHandler.handleKey(editor.vim, it, context, false, false, keyHandler.keyHandlerState) }
+    keys.forEach { keyHandler.handleKey(editor.vim, it, context, false, keyHandler.keyHandlerState) }
  }

  /** Returns a single key stroke from the user input similar to 'getchar()'. */
@@ -186,24 +187,22 @@ object VimExtensionFacade {
    return (injector.commandLine as ExEntryPanelService).inputString(editor.vim, context.vim, prompt, finishOn) ?: ""
  }

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

  @JvmStatic
-  fun getRegisterForCaret(register: Char, caret: VimCaret): List<KeyStroke>? {
-    val reg = caret.registerStorage.getRegister(register) ?: return null
+  fun getRegisterForCaret(
+    editor: VimEditor,
+    context: ExecutionContext,
+    register: Char,
+    caret: VimCaret,
+  ): List<KeyStroke>? {
+    val reg = caret.registerStorage.getRegister(editor, context, register) ?: return null
    return reg.keys
  }

@@ -215,7 +214,13 @@ object VimExtensionFacade {

  /** Set the current contents of the given register */
  @JvmStatic
-  fun setRegisterForCaret(register: Char, caret: ImmutableVimCaret, keys: List<KeyStroke?>?) {
+  fun setRegisterForCaret(
+    editor: VimEditor,
+    context: ExecutionContext,
+    register: Char,
+    caret: ImmutableVimCaret,
+    keys: List<KeyStroke?>?,
+  ) {
    caret.registerStorage.setKeys(register, keys?.filterNotNull() ?: emptyList())
  }

@@ -233,7 +238,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 {
@@ -263,8 +268,7 @@ 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) {
@@ -276,8 +280,7 @@ fun VimExtensionFacade.exportOperatorFunction(name: String, function: OperatorFu

    if (function.apply(editor, context, selectionType)) {
      ExecutionResult.Success
-    }
-    else {
+    } else {
      ExecutionResult.Error
    }
  }
@@ -285,4 +288,4 @@ fun VimExtensionFacade.exportOperatorFunction(name: String, function: OperatorFu

 fun interface ScriptFunction {
  fun execute(editor: VimEditor, context: ExecutionContext, args: Map<String, VimDataType>): ExecutionResult
-}
+}
@@ -12,7 +12,9 @@ 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.*;
+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;
@@ -9,7 +9,6 @@ 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
@@ -65,18 +64,16 @@ internal class CommentaryExtension : VimExtension {
        editor.ij.selectionModel.setSelection(range.startOffset, range.endOffset)
      }

-      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) }
-        actions.any { executeActionWithCallbackOnSuccess(editor, it, project, context, callback) }
+      // 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) }
    }

    private fun executeActionWithCallbackOnSuccess(
@@ -224,14 +221,16 @@ 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) {
-        if (next !is PsiWhiteSpace && !isComment(next)) {
-          return false
+        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
        }
        next = PsiTreeUtil.nextLeaf(next, true)
      }
-
-      return true
+      return hasComment
    }

    private fun isComment(element: PsiElement) =
@@ -8,7 +8,6 @@

 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
@@ -111,12 +110,10 @@ internal class VimExchangeExtension : VimExtension {

  private class VExchangeHandler : ExtensionHandler {
    override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      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)
-      }
+      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)
    }
  }

@@ -226,23 +223,22 @@ internal class VimExchangeExtension : VimExtension {
      val unnRegText = getRegister(editor.vim, '"')
      val startRegText = getRegister(editor.vim, '*')
      val plusRegText = getRegister(editor.vim, '+')
-      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:
+      // 	" 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)
    }

    private fun compareExchanges(x: Exchange, y: Exchange): ExchangeCompareResult {
@@ -21,9 +21,7 @@ import com.intellij.openapi.editor.markup.TextAttributes
 import com.intellij.openapi.util.Disposer
 import com.intellij.util.Alarm
 import com.intellij.util.Alarm.ThreadToUse
-import com.jetbrains.rd.util.first
 import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.api.ImmutableVimCaret
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.ModeChangeListener
@@ -123,9 +121,9 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis
    initialised = false
  }

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

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

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

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

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

      // from vim-highlightedyank docs: A negative number makes the highlight persistent.
@@ -282,4 +277,4 @@ internal class VimHighlightedYank : VimExtension, VimYankListener, ModeChangeLis
      return default
    }
  }
-}
+}
@@ -230,7 +230,7 @@ private object FileTypePatterns {
    } else if (fileTypeName == "CMakeLists.txt" || fileName == "CMakeLists") {
      this.cMakePatterns
    } else {
-      return null
+      this.htmlPatterns
    }
  }

@@ -0,0 +1,290 @@
+/*
+ * 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
+}
@@ -34,7 +34,6 @@ 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
@@ -235,7 +234,7 @@ internal class VimMultipleCursorsExtension : VimExtension {
      val text = if (editor.inVisualMode) {
        primaryCaret.selectedText ?: return
      } else {
-        val range = findWordUnderCursor(editor, primaryCaret) ?: return
+        val range = injector.searchHelper.findWordNearestCursor(editor.vim, primaryCaret.vim) ?: return
        if (range.startOffset > primaryCaret.offset) return
        IjVimEditor(editor).getText(range)
      }
@@ -300,7 +299,8 @@ internal class VimMultipleCursorsExtension : VimExtension {
  }

  private fun selectWordUnderCaret(editor: Editor, caret: Caret): TextRange? {
-    val range = findWordUnderCursor(editor, caret) ?: return null
+    // 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
    if (range.startOffset > caret.offset) return null

    enterVisualMode(editor.vim)
@@ -29,7 +29,6 @@ import com.maddyhome.idea.vim.extension.exportOperatorFunction
 import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.helper.exitVisualMode
 import com.maddyhome.idea.vim.key.OperatorFunction
-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.newapi.vim
@@ -144,7 +143,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(lastRegisterChar) ?: return
+  val savedRegister = caret.registerStorage.getRegister(editor.vim, context.vim, lastRegisterChar) ?: return

  var usedType = savedRegister.type
  var usedText = savedRegister.text
@@ -154,8 +153,7 @@ private fun doReplace(editor: Editor, context: DataContext, caret: ImmutableVimC
    usedType = SelectionType.CHARACTER_WISE
  }

-  val copiedText = IjVimCopiedText(usedText, (savedRegister.copiedText as IjVimCopiedText).transferableData)
-  val textData = PutData.TextData(savedRegister.name, copiedText, usedType)
+  val textData = PutData.TextData(usedText, usedType, savedRegister.transferableData, savedRegister.name)

  val putData = PutData(
    textData,
@@ -0,0 +1,30 @@
+package com.maddyhome.idea.vim.extension.surround
+
+import com.intellij.util.text.CharSequenceSubSequence
+
+internal data class RepeatedCharSequence(val text: CharSequence, val count: Int) : CharSequence {
+  override val length = text.length * count
+
+  override fun get(index: Int): Char {
+    if (index < 0 || index >= length) throw IndexOutOfBoundsException()
+    return text[index % text.length]
+  }
+
+  override fun subSequence(startIndex: Int, endIndex: Int): CharSequence {
+    return CharSequenceSubSequence(this, startIndex, endIndex)
+  }
+
+  override fun toString(): String {
+    return text.repeat(count)
+  }
+  
+  companion object {
+    fun of(text: CharSequence, count: Int): CharSequence {
+      return when (count) {
+        0 -> ""
+        1 -> text
+        else -> RepeatedCharSequence(text, count)
+      }
+    }
+  }
+}
@@ -11,9 +11,11 @@ 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
+import com.maddyhome.idea.vim.api.VimChangeGroup
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.endsWithNewLine
 import com.maddyhome.idea.vim.api.getLeadingCharacterOffset
@@ -36,7 +38,10 @@ import com.maddyhome.idea.vim.extension.VimExtensionFacade.setRegisterForCaret
 import com.maddyhome.idea.vim.extension.exportOperatorFunction
 import com.maddyhome.idea.vim.group.findBlockRange
 import com.maddyhome.idea.vim.helper.exitVisualMode
+import com.maddyhome.idea.vim.helper.runWithEveryCaretAndRestore
 import com.maddyhome.idea.vim.key.OperatorFunction
+import com.maddyhome.idea.vim.newapi.IjVimCaret
+import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.options.helpers.ClipboardOptionHelper
@@ -47,7 +52,6 @@ import com.maddyhome.idea.vim.state.mode.selectionType
 import org.jetbrains.annotations.NonNls
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
-import com.maddyhome.idea.vim.state.mode.returnTo

 /**
 * Port of vim-surround.
@@ -80,7 +84,7 @@ internal class VimSurroundExtension : VimExtension {
      putKeyMappingIfMissing(MappingMode.XO, injector.parser.parseKeys("S"), owner, injector.parser.parseKeys("<Plug>VSurround"), true)
    }

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

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

  private class VSurroundHandler : ExtensionHandler {
    override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      val selectionStart = editor.ij.caretModel.primaryCaret.selectionStart
      // NB: Operator ignores SelectionType anyway
-      if (!Operator().apply(editor, context, editor.mode.selectionType)) {
+      if (!Operator(supportsMultipleCursors = true, count = operatorArguments.count1).apply(editor, context, editor.mode.selectionType)) {
        return
      }
      runWriteAction {
        // Leave visual mode
        editor.exitVisualMode()
-        editor.ij.caretModel.moveToOffset(selectionStart)
+        
+        // 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)
      }
    }
  }
@@ -160,12 +166,16 @@ internal class VimSurroundExtension : VimExtension {

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

        // Delete surrounding's content
@@ -177,10 +187,12 @@ internal class VimSurroundExtension : VimExtension {
          val currentSurrounding = getCurrentSurrounding(it.caret, pick(charFrom))
          if (currentSurrounding != null) {
            it.caret.moveToOffset(currentSurrounding.startOffset)
-            editor.deleteString(currentSurrounding)
+            injector.application.runWriteAction {
+              editor.deleteString(currentSurrounding)
+            }
          }

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

@@ -200,7 +212,7 @@ internal class VimSurroundExtension : VimExtension {
              val trimmedValue = if (newSurround.shouldTrim) innerValue.trim() else innerValue
              it.first + trimmedValue + it.second
            } ?: innerValue
-            val textData = PutData.TextData(null, injector.clipboardManager.dumbCopiedText(text), SelectionType.CHARACTER_WISE)
+            val textData = PutData.TextData(text, SelectionType.CHARACTER_WISE, emptyList(), null)
            val putData = PutData(textData, null, 1, insertTextBeforeCaret = true, rawIndent = true, caretAfterInsertedText = false)

            surrounding.caret to putData
@@ -252,9 +264,16 @@ internal class VimSurroundExtension : VimExtension {
    }
  }

-  private data class SurroundingInfo(val caret: VimCaret, var innerText: List<KeyStroke>?, val oldRegisterContent: List<KeyStroke>?, var isValidSurrounding: Boolean) {
+  private data class SurroundingInfo(
+    val editor: VimEditor,
+    val context: ExecutionContext,
+    val caret: VimCaret,
+    var innerText: List<KeyStroke>?,
+    val oldRegisterContent: List<KeyStroke>?,
+    var isValidSurrounding: Boolean,
+  ) {
    fun restoreRegister() {
-      setRegisterForCaret(REGISTER, caret, oldRegisterContent)
+      setRegisterForCaret(editor, context, REGISTER, caret, oldRegisterContent)
    }
  }

@@ -271,25 +290,46 @@ internal class VimSurroundExtension : VimExtension {
    }
  }

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

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

    private fun getSurroundRange(caret: VimCaret): TextRange? {
      val editor = caret.editor
      if (editor.mode is Mode.CMD_LINE) {
-        editor.mode = (editor.mode as Mode.CMD_LINE).returnTo()
+        editor.mode = editor.mode.returnTo
      }
      return when (editor.mode) {
        is Mode.NORMAL -> injector.markService.getChangeMarks(caret)
@@ -337,7 +377,7 @@ private fun getSurroundPair(c: Char): SurroundPair? = if (c in SURROUND_PAIRS) {
 private fun inputTagPair(editor: Editor, context: DataContext): SurroundPair? {
  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()) {
@@ -356,7 +396,7 @@ private fun inputFunctionName(
 ): SurroundPair? {
  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) {
@@ -385,15 +425,15 @@ private fun getChar(editor: Editor): Char {
  return res
 }

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

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

    change.insertText(editor, caret, range.startOffset, leftSurround)
    change.insertText(editor, caret, range.endOffset + leftSurround.length, rightSurround)
@@ -14,7 +14,9 @@ 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.*;
+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;
@@ -14,7 +14,9 @@ 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.*;
+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;
@@ -7,7 +7,7 @@
 */
 package com.maddyhome.idea.vim.group

-import com.intellij.codeInsight.actions.AsyncActionExecutionService.Companion.getInstance
+import com.intellij.codeInsight.actions.AsyncActionExecutionService
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.application.ApplicationManager
@@ -15,6 +15,7 @@ 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
@@ -33,7 +34,7 @@ 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.Companion.getInstance
+import com.maddyhome.idea.vim.key.KeyHandlerKeeper
 import com.maddyhome.idea.vim.listener.VimInsertListener
 import com.maddyhome.idea.vim.newapi.IjVimCaret
 import com.maddyhome.idea.vim.newapi.IjVimCopiedText
@@ -42,7 +43,6 @@ import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.undo.VimKeyBasedUndoService
 import com.maddyhome.idea.vim.undo.VimTimestampBasedUndoService
-import kotlin.math.min

 /**
 * Provides all the insert/replace related functionality
@@ -62,8 +62,21 @@ 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
@@ -76,8 +89,9 @@ class ChangeGroup : VimChangeGroupBase() {
    }
    CommandProcessor.getInstance().executeCommand(
      editor.project, {
-        ApplicationManager.getApplication()
-          .runWriteAction { getInstance().originalHandler.execute(editor, key, ijContext) }
+        ApplicationManager.getApplication().runWriteAction {
+          action(KeyHandlerKeeper.getInstance().originalHandler)
+        }
      }, "", doc,
      UndoConfirmationPolicy.DEFAULT, doc
    )
@@ -130,7 +144,9 @@ 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)
-    CodeStyleManager.getInstance(project).reformatText(file, listOf(textRange))
+    injector.application.runWriteAction {
+      CodeStyleManager.getInstance(project).reformatText(file, listOf(textRange))
+    }
  }

  override fun autoIndentRange(
@@ -139,6 +155,7 @@ class ChangeGroup : VimChangeGroupBase() {
    context: ExecutionContext,
    range: TextRange,
  ) {
+    val startPos = editor.offsetToBufferPosition(caret.offset)
    val startOffset = editor.getLineStartForOffset(range.startOffset)
    val endOffset = editor.getLineEndForOffset(range.endOffset)
    val ijEditor = (editor as IjVimEditor).editor
@@ -148,7 +165,7 @@ class ChangeGroup : VimChangeGroupBase() {
    var copiedText: IjVimCopiedText? = null
    try {
      if (injector.registerGroup.isPrimaryRegisterSupported()) {
-        copiedText = injector.clipboardManager.getPrimaryContent(editor, context) as IjVimCopiedText
+        copiedText = injector.clipboardManager.getPrimaryContent() as IjVimCopiedText
      }
    } catch (e: Exception) {
      // FIXME: [isPrimaryRegisterSupported()] is not implemented perfectly, so there might be thrown an exception after trying to access the primary selection
@@ -163,15 +180,11 @@ class ChangeGroup : VimChangeGroupBase() {
      }
    }
    val afterAction = {
-      val firstLine = editor.offsetToBufferPosition(
-        min(startOffset.toDouble(), endOffset.toDouble()).toInt()
-      ).line
-      val newOffset = injector.motion.moveCaretToLineStartSkipLeading(editor, firstLine)
-      caret.moveToOffset(newOffset)
+      caret.moveToOffset(injector.motion.moveCaretToLineStartSkipLeading(editor, startPos.line))
      restoreCursor(editor, caret, (caret as IjVimCaret).caret.logicalPosition.line)
    }
    if (project != null) {
-      getInstance(project)
+      AsyncActionExecutionService.getInstance(project)
        .withExecutionAfterAction(IdeActions.ACTION_EDITOR_AUTO_INDENT_LINES, actionExecution, afterAction)
    } else {
      actionExecution.invoke()
@@ -186,12 +199,24 @@ class ChangeGroup : VimChangeGroupBase() {
    }
  }

-  @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)
  }
@@ -23,7 +23,6 @@ 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;
@@ -43,7 +42,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

-import static com.intellij.openapi.editor.EditorSettings.*;
+import static com.intellij.openapi.editor.EditorSettings.LineNumerationType;
 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;
@@ -157,7 +156,8 @@ 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,26 +310,21 @@ 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() {
@@ -32,17 +32,13 @@ 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.mode.Mode.VISUAL
 import java.io.File
 import java.util.*

@@ -265,92 +261,6 @@ 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()
@@ -14,7 +14,10 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.history.*;
+import com.maddyhome.idea.vim.history.HistoryBlock;
+import com.maddyhome.idea.vim.history.HistoryEntry;
+import com.maddyhome.idea.vim.history.VimHistory;
+import com.maddyhome.idea.vim.history.VimHistoryBase;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -25,8 +28,7 @@ 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) {
@@ -105,7 +107,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";
  }
@@ -31,10 +31,8 @@ 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)
 }

 /**
@@ -42,7 +40,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)
@@ -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,exclude:cons\\|linux"))
+    Options.overrideDefaultValue(Options.clipboard, VimString("ideaput,autoselect"))
  }

  // Vim options that are implemented purely by existing IntelliJ features and not used by vim-engine
@@ -122,6 +122,7 @@ object IjOptions {
      IjOptionConstants.ideavimsupportValues
    )
  )
+
  @JvmField
  val ideawrite: StringOption = addOption(
    StringOption("ideawrite", GLOBAL, "ideawrite", "all", IjOptionConstants.ideaWriteValues)
@@ -131,17 +132,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 commandOrMotionAnnotation: ToggleOption = addOption(ToggleOption("commandormotionannotation", GLOBAL, "commandormotionannotation", true, isHidden = true))
-  val oldundo: ToggleOption = addOption(ToggleOption("oldundo", GLOBAL, "oldundo", false, isHidden = true))
+  val closenotebooks: ToggleOption =
+    addOption(ToggleOption("closenotebooks", GLOBAL, "closenotebooks", 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>
@@ -21,7 +21,7 @@ import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim

@Service
-class IjVimPsiService: VimPsiService {
+class IjVimPsiService : VimPsiService {
  override fun getCommentAtPos(editor: VimEditor, pos: Int): Pair<TextRange, Pair<String, String>?>? {
    val psiFile = PsiHelper.getFile(editor.ij) ?: return null
    val psiElement = psiFile.findElementAt(pos) ?: return null
@@ -42,14 +42,14 @@ internal class IjVimStorageService : VimStorageServiceBase() {
  private val ijKeys = mutableMapOf<String, Key<out Any?>>()

  @Suppress("UNCHECKED_CAST")
-  private val <T> com.maddyhome.idea.vim.api.Key<T>.ij : Key<T>
+  private val <T> com.maddyhome.idea.vim.api.Key<T>.ij: Key<T>
    get(): Key<T> {
-    val storedIjKey = ijKeys[this.name]
-    if (storedIjKey != null) {
-      return storedIjKey as Key<T>
+      val storedIjKey = ijKeys[this.name]
+      if (storedIjKey != null) {
+        return storedIjKey as Key<T>
+      }
+      val newKey = Key<T>(this.name)
+      ijKeys[this.name] = newKey
+      return newKey
    }
-    val newKey = Key<T>(this.name)
-    ijKeys[this.name] = newKey
-    return newKey
-  }
 }
@@ -39,8 +39,8 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.KeyEvent;
-import java.util.List;
 import java.util.*;
+import java.util.List;

 import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
 import static java.util.stream.Collectors.toList;
@@ -49,7 +49,7 @@ import static java.util.stream.Collectors.toList;
 * @author vlan
 */
@State(name = "VimKeySettings", storages = {@Storage(value = "$APP_CONFIG$/vim_settings.xml")})
-public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponent<Element>{
+public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponent<Element> {
  public static final @NonNls String SHORTCUT_CONFLICTS_ELEMENT = "shortcut-conflicts";
  private static final @NonNls String SHORTCUT_CONFLICT_ELEMENT = "shortcut-conflict";
  private static final @NonNls String OWNER_ATTRIBUTE = "owner";
@@ -58,7 +58,7 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
  public void registerRequiredShortcutKeys(@NotNull VimEditor editor) {
    EventFacade.getInstance()
      .registerCustomShortcutSet(VimShortcutKeyAction.getInstance(), toShortcutSet(getRequiredShortcutKeys()),
-                                 ((IjVimEditor)editor).getEditor().getComponent());
+                                 ((IjVimEditor)editor).getEditor().getContentComponent());
  }

  public void registerShortcutsForLookup(@NotNull LookupImpl lookup) {
@@ -69,7 +69,7 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen

  void unregisterShortcutKeys(@NotNull VimEditor editor) {
    EventFacade.getInstance().unregisterCustomShortcutSet(VimShortcutKeyAction.getInstance(),
-                                                          ((IjVimEditor)editor).getEditor().getComponent());
+                                                          ((IjVimEditor)editor).getEditor().getContentComponent());
  }

  @Override
@@ -303,8 +303,8 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen

  @Override
  public @NotNull List<NativeAction> getActions(@NotNull VimEditor editor, @NotNull KeyStroke keyStroke) {
-    return getActions(((IjVimEditor)editor).getEditor().getComponent(), keyStroke).stream()
-      .map(IjNativeAction::new).collect(toList());
+    return getActions(((IjVimEditor)editor).getEditor().getComponent(), keyStroke).stream().map(IjNativeAction::new)
+      .collect(toList());
  }

  private static @NotNull List<AnAction> getLocalActions(@NotNull Component component, @NotNull KeyStroke keyStroke) {
@@ -314,7 +314,7 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
      if (c instanceof JComponent) {
        final List<AnAction> actions = ActionUtil.getActions((JComponent)c);
        for (AnAction action : actions) {
-          if (action instanceof VimShortcutKeyAction) {
+          if (action instanceof VimShortcutKeyAction || action == VimShortcutKeyAction.getInstance()) {
            continue;
          }
          final Shortcut[] shortcuts = action.getShortcutSet().getShortcuts();
@@ -334,7 +334,11 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
    final Keymap keymap = KeymapManager.getInstance().getActiveKeymap();
    for (String id : keymap.getActionIds(keyStroke)) {
      final AnAction action = ActionManager.getInstance().getAction(id);
-      if (action != null) {
+
+      // EmptyAction is used to reserve a shortcut, but can't be executed. Code can ask for an action by ID and
+      // use its shortcut(s) to dynamically register a new action on a component in the UI hierarchy. It's not
+      // useful for our needs here - we'll pick up the real action when we get local actions.
+      if (action != null && !(action instanceof EmptyAction)) {
        results.add(action);
      }
    }
@@ -355,21 +359,26 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
  }

  @Override
-  public boolean showKeyMappings(@NotNull Set<? extends MappingMode> modes, @NotNull List<? extends KeyStroke> prefix, @NotNull VimEditor editor) {
+  public boolean showKeyMappings(@NotNull Set<? extends MappingMode> modes,
+                                 @NotNull List<? extends KeyStroke> prefix,
+                                 @NotNull VimEditor editor) {
    List<Pair<Set<MappingMode>, MappingInfo>> rows = getKeyMappingRows(modes, prefix);

    final StringBuilder builder = new StringBuilder();
    for (Pair<Set<MappingMode>, MappingInfo> row : rows) {
      MappingInfo mappingInfo = row.getSecond();
      builder.append(StringsKt.padEnd(getModesStringCode(row.getFirst()), 3, ' '));
-      builder.append(StringsKt.padEnd(VimInjectorKt.getInjector().getParser().toKeyNotation(mappingInfo.getFromKeys()) + " ", 12, ' '));
+      builder.append(
+        StringsKt.padEnd(VimInjectorKt.getInjector().getParser().toKeyNotation(mappingInfo.getFromKeys()) + " ", 12,
+                         ' '));
      builder.append(mappingInfo.isRecursive() ? " " : "*");  // Or `&` if script-local mappings being recursive
      builder.append(" ");  // Should be `@` if it's a buffer-local mapping
      builder.append(mappingInfo.getPresentableString());
      builder.append("\n");
    }

-    VimOutputPanel outputPanel = injector.getOutputPanel().getOrCreate(editor, injector.getExecutionContextManager().getEditorExecutionContext(editor));
+    VimOutputPanel outputPanel = injector.getOutputPanel()
+      .getOrCreate(editor, injector.getExecutionContextManager().getEditorExecutionContext(editor));
    outputPanel.addText(builder.toString(), true);
    outputPanel.show();
    return true;
@@ -0,0 +1,68 @@
+package com.maddyhome.idea.vim.group
+
+import com.intellij.codeInsight.daemon.ReferenceImporter
+import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.ReadAction
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.progress.ProgressIndicator
+import com.intellij.openapi.progress.ProgressManager
+import com.intellij.openapi.progress.Task
+import com.intellij.psi.PsiDocumentManager
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiRecursiveElementWalkingVisitor
+import java.util.function.BooleanSupplier
+
+internal object MacroAutoImport {
+  fun run(editor: Editor, dataContext: DataContext) {
+    val project = CommonDataKeys.PROJECT.getData(dataContext) ?: return
+    val file = PsiDocumentManager.getInstance(project).getPsiFile(editor.document) ?: return
+
+    if (!FileDocumentManager.getInstance().requestWriting(editor.document, project)) {
+      return
+    }
+
+    val importers = ReferenceImporter.EP_NAME.extensionList
+    if (importers.isEmpty()) {
+      return
+    }
+
+    ProgressManager.getInstance().run(object : Task.Backgroundable(project, "Auto import", true) {
+      override fun run(indicator: ProgressIndicator) {
+        val fixes = ReadAction.nonBlocking<List<BooleanSupplier>> {
+          val fixes = mutableListOf<BooleanSupplier>()
+
+          file.accept(object : PsiRecursiveElementWalkingVisitor() {
+            override fun visitElement(element: PsiElement) {
+              for (reference in element.references) {
+                if (reference.resolve() != null) {
+                  continue
+                }
+                for (importer in importers) {
+                  importer.computeAutoImportAtOffset(editor, file, element.textRange.startOffset, true)
+                    ?.let(fixes::add)
+                }
+              }
+              super.visitElement(element)
+            }
+          })
+
+          return@nonBlocking fixes
+        }.executeSynchronously()
+
+        ApplicationManager.getApplication().invokeAndWait {
+          WriteCommandAction.writeCommandAction(project)
+            .withName("Auto Import")
+            .withGroupId("IdeaVimAutoImportAfterMacro")
+            .shouldRecordActionForActiveDocument(true)
+            .run<RuntimeException> {
+              fixes.forEach { it.asBoolean }
+            }
+        }
+      }
+    })
+  }
+}
@@ -9,7 +9,6 @@ package com.maddyhome.idea.vim.group

 import com.intellij.codeInsight.completion.CompletionPhase
 import com.intellij.codeInsight.completion.impl.CompletionServiceImpl
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.progress.ProcessCanceledException
@@ -22,6 +21,7 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.MessageHelper.message
 import com.maddyhome.idea.vim.macro.VimMacroBase
 import com.maddyhome.idea.vim.newapi.IjVimEditor
+import com.maddyhome.idea.vim.newapi.ij

 /**
 * Used to handle playback of macros
@@ -40,9 +40,6 @@ internal class MacroGroup : VimMacroBase() {
    context: ExecutionContext,
    total: Int,
  ) {
-    // This is to make sure that we don't access potemkin progress from different threads
-    ApplicationManager.getApplication().assertWriteAccessAllowed()
-
    val project = (editor as IjVimEditor).editor.project
    val keyStack = getInstance().keyStack
    if (!keyStack.hasStroke()) {
@@ -93,6 +90,9 @@ internal class MacroGroup : VimMacroBase() {
        } finally {
          keyStack.removeFirst()
        }
+        if (!isInternalMacro) {
+          MacroAutoImport.run(editor.ij, context.ij)
+        }
      }

      if (isInternalMacro) {
@@ -19,7 +19,6 @@ import com.intellij.openapi.fileEditor.impl.EditorWindow
 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.VimCaret
 import com.maddyhome.idea.vim.api.VimChangeGroupBase
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimMotionGroupBase
@@ -48,13 +47,10 @@ import com.maddyhome.idea.vim.helper.getNormalizedSideScrollOffset
 import com.maddyhome.idea.vim.helper.isEndAllowed
 import com.maddyhome.idea.vim.helper.vimLastColumn
 import com.maddyhome.idea.vim.impl.state.VimStateMachineImpl
-import com.maddyhome.idea.vim.listener.AppCodeTemplates
 import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.Mode
-import com.maddyhome.idea.vim.state.mode.ReturnTo
-import com.maddyhome.idea.vim.state.mode.returnTo
 import org.jetbrains.annotations.Range
 import kotlin.math.max
 import kotlin.math.min
@@ -64,10 +60,6 @@ import kotlin.math.min
 */
@Service
 internal class MotionGroup : VimMotionGroupBase() {
-  override fun onAppCodeMovement(editor: VimEditor, caret: VimCaret, offset: Int, oldOffset: Int) {
-    AppCodeTemplates.onMovement(editor.ij, caret.ij, oldOffset < offset)
-  }
-
  override fun moveCaretToFirstDisplayLine(
    editor: VimEditor,
    caret: ImmutableVimCaret,
@@ -97,6 +89,9 @@ internal class MotionGroup : VimMotionGroupBase() {
  }

  override fun moveCaretToCurrentDisplayLineStart(editor: VimEditor, caret: ImmutableVimCaret): Motion {
+    if (editor.ij.softWrapModel.isSoftWrappingEnabled) {
+      return AbsoluteOffset(caret.ij.visualLineStart)
+    }
    val col = EditorHelper.getVisualColumnAtLeftOfDisplay(editor.ij, caret.getVisualPosition().line)
    return moveCaretToColumn(editor, caret, col, false)
  }
@@ -105,6 +100,15 @@ internal class MotionGroup : VimMotionGroupBase() {
    editor: VimEditor,
    caret: ImmutableVimCaret,
  ): @Range(from = 0, to = Int.MAX_VALUE.toLong()) Int {
+    if (editor.ij.softWrapModel.isSoftWrappingEnabled) {
+      val offset = caret.ij.visualLineStart
+      val line = editor.offsetToBufferPosition(offset).line
+      return if (offset == editor.getLineStartOffset(line)) {
+        editor.getLeadingCharacterOffset(line, 0)
+      } else {
+        offset
+      }
+    }
    val col = EditorHelper.getVisualColumnAtLeftOfDisplay(editor.ij, caret.getVisualPosition().line)
    val bufferLine = caret.getLine()
    return editor.getLeadingCharacterOffset(bufferLine, col)
@@ -115,6 +119,9 @@ internal class MotionGroup : VimMotionGroupBase() {
    caret: ImmutableVimCaret,
    allowEnd: Boolean,
  ): Motion {
+    if (editor.ij.softWrapModel.isSoftWrappingEnabled) {
+      return AbsoluteOffset(caret.ij.visualLineEnd - 1)
+    }
    val col = EditorHelper.getVisualColumnAtRightOfDisplay(editor.ij, caret.getVisualPosition().line)
    return moveCaretToColumn(editor, caret, col, allowEnd)
  }
@@ -320,11 +327,13 @@ internal class MotionGroup : VimMotionGroupBase() {
                vimEditor.exitVisualMode()
                KeyHandler.getInstance().reset(vimEditor)
              }
+
              is Mode.CMD_LINE -> {
                val commandLine = injector.commandLine.getActiveCommandLine() ?: return
                commandLine.close(refocusOwningEditor = false, resetCaret = false)
                injector.outputPanel.getCurrentOutputPanel()?.close()
              }
+
              else -> {}
            }
          }
@@ -332,12 +341,7 @@ internal class MotionGroup : VimMotionGroupBase() {
      } else {
        val state = injector.vimState as VimStateMachineImpl
        if (state.mode is Mode.VISUAL) {
-          val returnTo = state.mode.returnTo
-          when (returnTo) {
-            ReturnTo.INSERT -> state.mode = Mode.INSERT
-            ReturnTo.REPLACE -> state.mode = Mode.REPLACE
-            null -> state.mode = Mode.NORMAL()
-          }
+          state.mode = state.mode.returnTo
        }
        val keyHandler = KeyHandler.getInstance()
        KeyHandler.getInstance().reset(keyHandler.keyHandlerState, state.mode)
@@ -12,7 +12,6 @@ import com.intellij.icons.AllIcons
 import com.intellij.ide.BrowserUtil
 import com.intellij.ide.actions.OpenFileAction
 import com.intellij.ide.actions.RevealFileAction
-import com.intellij.notification.ActionCenter
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationGroup
 import com.intellij.notification.NotificationGroupManager
@@ -34,15 +33,13 @@ import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.util.SystemInfo
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.handler.KeyMapIssue
 import com.maddyhome.idea.vim.helper.MessageHelper
+import com.maddyhome.idea.vim.icons.VimIcons
 import com.maddyhome.idea.vim.key.ShortcutOwner
 import com.maddyhome.idea.vim.key.ShortcutOwnerInfo
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.ijOptions
-import com.maddyhome.idea.vim.options.OptionConstants
 import com.maddyhome.idea.vim.statistic.ActionTracker
 import com.maddyhome.idea.vim.ui.VimEmulationConfigurable
 import com.maddyhome.idea.vim.vimscript.services.VimRcService
@@ -62,74 +59,11 @@ internal class NotificationService(private val project: Project?) {
  @Suppress("unused")
  constructor() : this(null)

-  fun notifyAboutNewUndo() {
-    val notification = Notification(
-      IDEAVIM_NOTIFICATION_ID,
-      "Undo in IdeaVim now works like in Vim",
-      """
-        Caret movement is no longer a separate undo step, and full insert is undoable in one step.
-      """.trimIndent(),
-      NotificationType.INFORMATION,
-    )
+  fun notifyAboutNewUndo() {}

-    notification.addAction(object : DumbAwareAction("Share Feedback") {
-      override fun actionPerformed(p0: AnActionEvent) {
-        BrowserUtil.browse("https://youtrack.jetbrains.com/issue/VIM-547/Undo-splits-Insert-mode-edits-into-separate-undo-chunks")
-      }
-    })
+  fun notifyAboutIdeaPut() {}

-    notification.notify(project)
-  }
-
-  fun notifyAboutIdeaPut() {
-    val notification = Notification(
-      IDEAVIM_NOTIFICATION_ID,
-      IDEAVIM_NOTIFICATION_TITLE,
-      """Add <code>ideaput</code> to <code>clipboard</code> option to perform a put via the IDE<br/><b><code>set clipboard+=ideaput</code></b>""",
-      NotificationType.INFORMATION,
-    )
-
-    notification.addAction(OpenIdeaVimRcAction(notification))
-
-    notification.addAction(
-      AppendToIdeaVimRcAction(
-        notification,
-        "set clipboard^=ideaput",
-        "ideaput",
-      ) {
-        // Technically, we're supposed to prepend values to clipboard so that it's not added to the "exclude" item.
-        // Since we don't handle exclude, it's safe to append. But let's be clean.
-        injector.globalOptions().clipboard.prependValue(OptionConstants.clipboard_ideaput)
-      },
-    )
-
-    notification.notify(project)
-  }
-
-  fun notifyAboutIdeaJoin(editor: VimEditor) {
-    val notification = Notification(
-      IDEAVIM_NOTIFICATION_ID,
-      IDEAVIM_NOTIFICATION_TITLE,
-      """Put <b><code>set ideajoin</code></b> into your <code>~/.ideavimrc</code> to perform a join via the IDE""",
-      NotificationType.INFORMATION,
-    )
-
-    notification.addAction(OpenIdeaVimRcAction(notification))
-
-    notification.addAction(
-      AppendToIdeaVimRcAction(
-        notification,
-        "set ideajoin",
-        "ideajoin"
-      ) {
-        // This is a global-local option. Setting it will always set the global value
-        injector.ijOptions(editor).ideajoin = true
-      },
-    )
-
-    notification.addAction(HelpLink(ideajoinExamplesUrl))
-    notification.notify(project)
-  }
+  fun notifyAboutIdeaJoin(editor: VimEditor) {}

  fun enableRepeatingMode() = Messages.showYesNoDialog(
    "Do you want to enable repeating keys in macOS on press and hold?\n\n" +
@@ -201,8 +135,30 @@ internal class NotificationService(private val project: Project?) {
    ).notify(project)
  }

-  fun notifyActionId(id: String?, candidates: List<String>? = null) {
-    ActionIdNotifier.notifyActionId(id, project, candidates)
+  /**
+   * Shows a notification that the user can reenable IdeaVim by clicking on the IdeaVim icon in the status bar.
+   */
+  fun showReenableNotification(project: Project) {
+    val notification = Notification(
+      IDEAVIM_NOTIFICATION_ID,
+      IDEAVIM_NOTIFICATION_TITLE,
+      "IdeaVim has been disabled. You can reenable it by clicking on the gray IdeaVim icon in the status bar.",
+      NotificationType.INFORMATION,
+    )
+    notification.icon = VimIcons.IDEAVIM_DISABLED
+
+    notification.addAction(object : DumbAwareAction("Reenable IdeaVim") {
+      override fun actionPerformed(e: AnActionEvent) {
+        VimPlugin.setEnabled(true)
+        notification.expire()
+      }
+    })
+
+    notification.notify(project)
+  }
+
+  fun notifyActionId(id: String?, candidates: List<String>? = null, intentionName: String?) {
+    ActionIdNotifier.notifyActionId(id, project, candidates, intentionName)
  }

  fun notifyKeymapIssues(issues: ArrayList<KeyMapIssue>) {
@@ -215,6 +171,7 @@ internal class NotificationService(private val project: Project?) {
          is KeyMapIssue.AddShortcut -> {
            appendLine("- ${it.key} key is not assigned to the ${it.action} action.<br/>")
          }
+          
          is KeyMapIssue.RemoveShortcut -> {
            appendLine("- ${it.shortcut} key is incorrectly assigned to the ${it.action} action.<br/>")
          }
@@ -279,12 +236,15 @@ internal class NotificationService(private val project: Project?) {
  object ActionIdNotifier {
    private var notification: Notification? = null

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

      val possibleIDs = candidates?.distinct()?.sorted()
      val content = when {
        id != null -> "Action ID: <code>$id</code><br><br>"
+        possibleIDs.isNullOrEmpty() && !intentionName.isNullOrEmpty() -> {
+          "Intention \"$intentionName\" does not have an action ID.<br><br>"
+        }
        possibleIDs.isNullOrEmpty() -> "<i>Cannot detect action ID</i><br><br>"
        possibleIDs.size == 1 -> "Possible action ID: <code>${possibleIDs[0]}</code><br><br>"
        else -> {
@@ -294,9 +254,10 @@ internal class NotificationService(private val project: Project?) {
            append("</ul></p>")
          }
        }
-      } + "<small>See the ${ActionCenter.getToolwindowName()} tool window for previous IDs</small>"
+      } + "<small>See the Notifications tool window for previous IDs</small>"

-      notification = Notification(IDEAVIM_NOTIFICATION_ID, IDEAVIM_NOTIFICATION_TITLE, content, NotificationType.INFORMATION).also {
+      notification =
+        Notification(IDEAVIM_NOTIFICATION_ID, IDEAVIM_NOTIFICATION_TITLE, content, NotificationType.INFORMATION).also {
        it.whenExpired { notification = null }
        it.addAction(StopTracking())

@@ -312,7 +273,8 @@ internal class NotificationService(private val project: Project?) {
      }
    }

-    class CopyActionId(val id: String?, val project: Project?) : DumbAwareAction(MessageHelper.message("action.copy.action.id.text")) {
+    class CopyActionId(val id: String?, val project: Project?) :
+      DumbAwareAction(MessageHelper.message("action.copy.action.id.text")) {
      override fun actionPerformed(e: AnActionEvent) {
        CopyPasteManager.getInstance().setContents(StringSelection(id ?: ""))
        if (id != null) {
@@ -66,7 +66,7 @@ import java.nio.charset.Charset
 import java.nio.charset.StandardCharsets
 import java.util.*

-internal interface IjVimOptionGroup: VimOptionGroup {
+internal interface IjVimOptionGroup : VimOptionGroup {
  /**
   * Return an accessor for options that only have a global value
   */
@@ -151,7 +151,7 @@ internal class OptionGroup : VimOptionGroupBase(), IjVimOptionGroup, InternalOpt
  override fun <T : VimDataType> setOptionValueInternal(
    option: Option<T>,
    scope: OptionAccessScope,
-    value: OptionValue<T>
+    value: OptionValue<T>,
  ) {
    super.setOptionValueInternal(option, scope, value)
  }
@@ -391,7 +391,6 @@ private abstract class GlobalLocalOptionToGlobalLocalIdeaSettingMapper<T : VimDa
 }


-
 /**
 * Maps the `'bomb'` local-to-buffer Vim option to the file's current byte order mark
 *
@@ -425,7 +424,8 @@ private class BombOptionMapper : LocalOptionValueOverride<VimInt> {
    // Use IntelliJ's own actions to modify the BOM. This will change the BOM stored in the virtual file, update the
    // file contents and save it
    val actionId = if (hasBom) "RemoveBom" else "AddBom"
-    val action = injector.actionExecutor.getAction(actionId) ?: throw ExException("Cannot find native action: $actionId")
+    val action =
+      injector.actionExecutor.getAction(actionId) ?: throw ExException("Cannot find native action: $actionId")
    val context = injector.executionContextManager.getEditorExecutionContext(editor)
    injector.actionExecutor.executeAction(editor, action, context)
    return true
@@ -463,8 +463,8 @@ private class BreakIndentOptionMapper(
 *
 * TODO: This is a code style setting - how can we react to changes?
 */
-private class ColorColumnOptionValueProvider(private val colorColumnOption: StringListOption)
-  : LocalOptionToGlobalLocalExternalSettingMapper<VimString>(colorColumnOption) {
+private class ColorColumnOptionValueProvider(private val colorColumnOption: StringListOption) :
+  LocalOptionToGlobalLocalExternalSettingMapper<VimString>(colorColumnOption) {

  // The IntelliJ setting is in practice global, from the user's perspective
  override val canUserModifyExternalLocalValue: Boolean = false
@@ -510,8 +510,7 @@ private class ColorColumnOptionValueProvider(private val colorColumnOption: Stri
    // Given an empty string, hide the margin.
    if (value == VimString.EMPTY) {
      editor.ij.settings.isRightMarginShown = false
-    }
-    else {
+    } else {
      editor.ij.settings.isRightMarginShown = true

      val softMargins = mutableListOf<Int>()
@@ -524,8 +523,7 @@ private class ColorColumnOptionValueProvider(private val colorColumnOption: Stri
          // We could perhaps add a property change listener from editor settings state?
          // (editor.ij as EditorImpl).state.addPropertyChangeListener(...)
          // (editor.ij.settings as SettingsImpl).getState().addPropertyChangeListener(...)
-        }
-        else {
+        } else {
          it.toIntOrNull()?.let(softMargins::add)
        }
      }
@@ -559,8 +557,8 @@ private class ColorColumnOptionValueProvider(private val colorColumnOption: Stri
 *
 * Note that there isn't a global IntelliJ setting for this option.
 */
-private class CursorLineOptionMapper(cursorLineOption: ToggleOption)
-  : LocalOptionToGlobalLocalExternalSettingMapper<VimInt>(cursorLineOption) {
+private class CursorLineOptionMapper(cursorLineOption: ToggleOption) :
+  LocalOptionToGlobalLocalExternalSettingMapper<VimInt>(cursorLineOption) {

  // The IntelliJ setting is in practice global, from the user's perspective
  override val canUserModifyExternalLocalValue: Boolean = false
@@ -667,7 +665,12 @@ private class FileEncodingOptionMapper : LocalOptionValueOverride<VimString> {
    }
  }

-  private fun isSafeToReloadIn(virtualFile: VirtualFile, text: CharSequence, bytes: ByteArray, charset: Charset): Magic8 {
+  private fun isSafeToReloadIn(
+    virtualFile: VirtualFile,
+    text: CharSequence,
+    bytes: ByteArray,
+    charset: Charset,
+  ): Magic8 {
    val bom = virtualFile.bom
    if (bom != null && !CharsetToolkit.canHaveBom(charset, bom)) return Magic8.NO_WAY

@@ -680,11 +683,9 @@ private class FileEncodingOptionMapper : LocalOptionValueOverride<VimString> {

    var bytesToSave = try {
      StringUtil.convertLineSeparators(loaded, separator).toByteArray(charset)
-    }
-    catch (e: UnsupportedOperationException) {
+    } catch (e: UnsupportedOperationException) {
      return Magic8.NO_WAY
-    }
-    catch (e: NullPointerException) {
+    } catch (e: NullPointerException) {
      return Magic8.NO_WAY
    }
    if (bom != null && !ArrayUtil.startsWith(bytesToSave, bom)) {
@@ -718,12 +719,14 @@ private class FileFormatOptionMapper : LocalOptionValueOverride<VimString> {
    // We should have a virtual file for most scenarios, e.g., scratch files, commit message dialog, etc.
    // The fallback window (TextComponentEditorImpl) does not have a virtual file
    val separator = editor.ij.virtualFile?.let { LoadTextUtil.detectLineSeparator(it, false) }
-    val value = VimString(when (separator) {
-      LineSeparator.LF.separatorString -> "unix"
-      LineSeparator.CR.separatorString -> "mac"
-      LineSeparator.CRLF.separatorString -> "dos"
-      else -> if (injector.systemInfoService.isWindows) "dos" else "unix"
-    })
+    val value = VimString(
+      when (separator) {
+        LineSeparator.LF.separatorString -> "unix"
+        LineSeparator.CR.separatorString -> "mac"
+        LineSeparator.CRLF.separatorString -> "dos"
+        else -> if (injector.systemInfoService.isWindows) "dos" else "unix"
+      }
+    )

    // There is no difference between user/external/default - the file is always just one format
    return OptionValue.User(value)
@@ -762,8 +765,8 @@ private class FileFormatOptionMapper : LocalOptionValueOverride<VimString> {
 /**
 * Maps the `'list'` local-to-window Vim option to the IntelliJ global-local whitespace setting
 */
-private class ListOptionMapper(listOption: ToggleOption, internalOptionValueAccessor: InternalOptionValueAccessor)
-  : LocalOptionToGlobalLocalIdeaSettingMapper<VimInt>(listOption, internalOptionValueAccessor) {
+private class ListOptionMapper(listOption: ToggleOption, internalOptionValueAccessor: InternalOptionValueAccessor) :
+  LocalOptionToGlobalLocalIdeaSettingMapper<VimInt>(listOption, internalOptionValueAccessor) {

  override val ideaPropertyName: String = EditorSettingsExternalizable.PropNames.PROP_IS_WHITESPACES_SHOWN

@@ -787,8 +790,8 @@ private class ListOptionMapper(listOption: ToggleOption, internalOptionValueAcce
 *
 * Note that this must work with `'relativenumber'` to correctly handle the hybrid modes.
 */
-private class NumberOptionMapper(numberOption: ToggleOption, internalOptionValueAccessor: InternalOptionValueAccessor)
-  : LocalOptionToGlobalLocalIdeaSettingMapper<VimInt>(numberOption, internalOptionValueAccessor) {
+private class NumberOptionMapper(numberOption: ToggleOption, internalOptionValueAccessor: InternalOptionValueAccessor) :
+  LocalOptionToGlobalLocalIdeaSettingMapper<VimInt>(numberOption, internalOptionValueAccessor) {

  // This is a global-local setting, and can be modified by the user via _View | Active Editor | Show Line Numbers_
  override val canUserModifyExternalLocalValue: Boolean = true
@@ -808,13 +811,11 @@ private class NumberOptionMapper(numberOption: ToggleOption, internalOptionValue
        if (isShowingRelativeLineNumbers(editor.ij.settings.lineNumerationType)) {
          editor.ij.settings.lineNumerationType = LineNumerationType.HYBRID
        }
-      }
-      else {
+      } else {
        editor.ij.settings.isLineNumbersShown = true
        editor.ij.settings.lineNumerationType = LineNumerationType.ABSOLUTE
      }
-    }
-    else {
+    } else {
      // Turn off 'number'. Hide lines if 'relativenumber' is not set, else switch to relative
      if (editor.ij.settings.isLineNumbersShown) {
        if (isShowingRelativeLineNumbers(editor.ij.settings.lineNumerationType)) {
@@ -828,7 +829,8 @@ private class NumberOptionMapper(numberOption: ToggleOption, internalOptionValue

  override fun onGlobalIdeaValueChanged(propertyName: String) {
    if (propertyName == EditorSettingsExternalizable.PropNames.PROP_ARE_LINE_NUMBERS_SHOWN
-      || propertyName == EditorSettingsExternalizable.PropNames.PROP_LINE_NUMERATION) {
+      || propertyName == EditorSettingsExternalizable.PropNames.PROP_LINE_NUMERATION
+    ) {
      doOnGlobalIdeaValueChanged()
    }
  }
@@ -863,13 +865,11 @@ private class RelativeNumberOptionMapper(
        if (isShowingAbsoluteLineNumbers(editor.ij.settings.lineNumerationType)) {
          editor.ij.settings.lineNumerationType = LineNumerationType.HYBRID
        }
-      }
-      else {
+      } else {
        editor.ij.settings.isLineNumbersShown = true
        editor.ij.settings.lineNumerationType = LineNumerationType.RELATIVE
      }
-    }
-    else {
+    } else {
      // Turn off 'relativenumber'. Hide lines if 'number' is not set, else switch to relative
      if (editor.ij.settings.isLineNumbersShown) {
        if (isShowingAbsoluteLineNumbers(editor.ij.settings.lineNumerationType)) {
@@ -883,7 +883,8 @@ private class RelativeNumberOptionMapper(

  override fun onGlobalIdeaValueChanged(propertyName: String) {
    if (propertyName == EditorSettingsExternalizable.PropNames.PROP_ARE_LINE_NUMBERS_SHOWN
-      || propertyName == EditorSettingsExternalizable.PropNames.PROP_LINE_NUMERATION) {
+      || propertyName == EditorSettingsExternalizable.PropNames.PROP_LINE_NUMERATION
+    ) {
      doOnGlobalIdeaValueChanged()
    }
  }
@@ -914,8 +915,8 @@ private fun isShowingRelativeLineNumbers(lineNumerationType: LineNumerationType)
 * We can also clear the overridden IDE setting value by setting it to `-1`. So when the user resets the Vim option to
 * defaults, it will again map to the global IDE value. It's a shame not all IDE settings do this.
 */
-private class ScrollJumpOptionMapper(option: NumberOption, internalOptionValueAccessor: InternalOptionValueAccessor)
-  : GlobalOptionToGlobalLocalIdeaSettingMapper<VimInt>(option, internalOptionValueAccessor) {
+private class ScrollJumpOptionMapper(option: NumberOption, internalOptionValueAccessor: InternalOptionValueAccessor) :
+  GlobalOptionToGlobalLocalIdeaSettingMapper<VimInt>(option, internalOptionValueAccessor) {

  override val ideaPropertyName: String = EditorSettingsExternalizable.PropNames.PROP_VERTICAL_SCROLL_JUMP

@@ -949,8 +950,8 @@ private class ScrollJumpOptionMapper(option: NumberOption, internalOptionValueAc
 * We can also clear the overridden IDE setting value by setting it to `-1`. So when the user resets the Vim option to
 * defaults, it will again map to the global IDE value. It's a shame not all IDE settings do this.
 */
-private class SideScrollOptionMapper(option: NumberOption, internalOptionValueAccessor: InternalOptionValueAccessor)
-  : GlobalOptionToGlobalLocalIdeaSettingMapper<VimInt>(option, internalOptionValueAccessor) {
+private class SideScrollOptionMapper(option: NumberOption, internalOptionValueAccessor: InternalOptionValueAccessor) :
+  GlobalOptionToGlobalLocalIdeaSettingMapper<VimInt>(option, internalOptionValueAccessor) {

  override val ideaPropertyName: String = EditorSettingsExternalizable.PropNames.PROP_HORIZONTAL_SCROLL_JUMP

@@ -1140,8 +1141,8 @@ private abstract class OneWayGlobalLocalOptionToGlobalLocalIdeaSettingMapper<T :
 * (window) overrides. The [LocalOptionToGlobalLocalExternalSettingMapper] base class will handle this by calling
 * [setLocalExternalValue] for all open editors for the changed buffer.
 */
-private class TextWidthOptionMapper(textWidthOption: NumberOption)
-  : LocalOptionToGlobalLocalExternalSettingMapper<VimInt>(textWidthOption) {
+private class TextWidthOptionMapper(textWidthOption: NumberOption) :
+  LocalOptionToGlobalLocalExternalSettingMapper<VimInt>(textWidthOption) {

  // The IntelliJ setting is in practice global, from the user's perspective
  override val canUserModifyExternalLocalValue: Boolean = false
@@ -1168,8 +1169,7 @@ private class TextWidthOptionMapper(textWidthOption: NumberOption)
    val project = ijEditor.project ?: ProjectManager.getInstance().defaultProject
    return if (ijEditor.settings.isWrapWhenTypingReachesRightMargin(project)) {
      ijEditor.settings.getRightMargin(ijEditor.project).asVimInt()
-    }
-    else {
+    } else {
      VimInt.ZERO
    }
  }
@@ -1215,8 +1215,8 @@ private class TextWidthOptionMapper(textWidthOption: NumberOption)
 /**
 * Maps the `'wrap'` Vim option to the IntelliJ soft wrap settings
 */
-private class WrapOptionMapper(wrapOption: ToggleOption, internalOptionValueAccessor: InternalOptionValueAccessor)
-  : LocalOptionToGlobalLocalIdeaSettingMapper<VimInt>(wrapOption, internalOptionValueAccessor) {
+private class WrapOptionMapper(wrapOption: ToggleOption, internalOptionValueAccessor: InternalOptionValueAccessor) :
+  LocalOptionToGlobalLocalIdeaSettingMapper<VimInt>(wrapOption, internalOptionValueAccessor) {

  // This is a global-local setting, and can be modified by the user via _View | Active Editor | Soft-Wrap_
  override val canUserModifyExternalLocalValue: Boolean = true
@@ -1245,7 +1245,9 @@ private class WrapOptionMapper(wrapOption: ToggleOption, internalOptionValueAcce
    fun editorKindToSoftWrapAppliancesPlace(kind: EditorKind) = when (kind) {
      EditorKind.UNTYPED,
      EditorKind.DIFF,
-      EditorKind.MAIN_EDITOR -> SoftWrapAppliancePlaces.MAIN_EDITOR
+      EditorKind.MAIN_EDITOR,
+        -> SoftWrapAppliancePlaces.MAIN_EDITOR
+
      EditorKind.CONSOLE -> SoftWrapAppliancePlaces.CONSOLE
      // Treat PREVIEW as a kind of MAIN_EDITOR instead of SWAP.PREVIEW. There are fewer noticeable differences
      EditorKind.PREVIEW -> SoftWrapAppliancePlaces.MAIN_EDITOR
@@ -1261,7 +1263,9 @@ private class WrapOptionMapper(wrapOption: ToggleOption, internalOptionValueAcce
    val softWrapAppliancePlace = when (editor.ij.editorKind) {
      EditorKind.UNTYPED,
      EditorKind.DIFF,
-      EditorKind.MAIN_EDITOR -> SoftWrapAppliancePlaces.MAIN_EDITOR
+      EditorKind.MAIN_EDITOR,
+        -> SoftWrapAppliancePlaces.MAIN_EDITOR
+
      EditorKind.CONSOLE -> SoftWrapAppliancePlaces.CONSOLE
      EditorKind.PREVIEW -> SoftWrapAppliancePlaces.PREVIEW
    }
@@ -1304,7 +1308,8 @@ private class WrapOptionMapper(wrapOption: ToggleOption, internalOptionValueAcce

  override fun onGlobalIdeaValueChanged(propertyName: String) {
    if (propertyName == EditorSettingsExternalizable.PropNames.PROP_USE_SOFT_WRAPS
-      || propertyName == EditorSettingsExternalizable.PropNames.PROP_SOFT_WRAP_FILE_MASKS) {
+      || propertyName == EditorSettingsExternalizable.PropNames.PROP_SOFT_WRAP_FILE_MASKS
+    ) {
      doOnGlobalIdeaValueChanged()
    }
  }
@@ -1331,8 +1336,10 @@ class IjOptionConstants {
    const val ideawrite_file: String = "file"

    val ideaStatusIconValues: Set<String> = setOf(ideastatusicon_enabled, ideastatusicon_gray, ideastatusicon_disabled)
-    val ideaRefactorModeValues: Set<String> = setOf(idearefactormode_keep, idearefactormode_select, idearefactormode_visual)
+    val ideaRefactorModeValues: Set<String> =
+      setOf(idearefactormode_keep, idearefactormode_select, idearefactormode_visual)
    val ideaWriteValues: Set<String> = setOf(ideawrite_all, ideawrite_file)
-    val ideavimsupportValues: Set<String> = setOf(ideavimsupport_dialog, ideavimsupport_singleline, ideavimsupport_dialoglegacy)
+    val ideavimsupportValues: Set<String> =
+      setOf(ideavimsupport_dialog, ideavimsupport_singleline, ideavimsupport_dialoglegacy)
  }
 }
@@ -37,7 +37,7 @@ class ProcessGroup : VimProcessGroupBase() {
    editor: VimEditor,
    command: String,
    input: CharSequence?,
-    currentDirectoryPath: String?
+    currentDirectoryPath: String?,
  ): String? {
    // This is a much simplified version of how Vim does this. We're using stdin/stdout directly, while Vim will
    // redirect to temp files ('shellredir' and 'shelltemp') or use pipes. We don't support 'shellquote', because we're
@@ -14,7 +14,6 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.maddyhome.idea.vim.VimPlugin;
-import com.maddyhome.idea.vim.api.VimInjectorKt;
 import com.maddyhome.idea.vim.newapi.IjVimInjectorKt;
 import com.maddyhome.idea.vim.register.Register;
 import com.maddyhome.idea.vim.register.VimRegisterGroupBase;
@@ -29,14 +28,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

-import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
-
 /**
 * This group works with command associated with copying and pasting text
 */
@State(name = "VimRegisterSettings", 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 RegisterGroup extends VimRegisterGroupBase implements PersistentStateComponent<Element> {

  static {
@@ -131,7 +127,7 @@ public class RegisterGroup extends VimRegisterGroupBase implements PersistentSta
          final String text = VimPlugin.getXML().getSafeXmlText(textElement);
          if (text != null) {
            logger.trace("Register data parsed");
-            register = new Register(key, injector.getClipboardManager().dumbCopiedText(text), type);
+            register = new Register(key, type, text, Collections.emptyList());
          }
          else {
            logger.trace("Cannot parse register data");
@@ -148,9 +144,8 @@ public class RegisterGroup extends VimRegisterGroupBase implements PersistentSta
            final int modifiers = Integer.parseInt(keyElement.getAttributeValue("mods"));
            final char c = (char)Integer.parseInt(keyElement.getAttributeValue("char"));
            //noinspection MagicConstant
-            strokes.add(c == KeyEvent.CHAR_UNDEFINED ?
-                        KeyStroke.getKeyStroke(code, modifiers) :
-                        KeyStroke.getKeyStroke(c));
+            strokes.add(
+              c == KeyEvent.CHAR_UNDEFINED ? KeyStroke.getKeyStroke(code, modifiers) : KeyStroke.getKeyStroke(c));
          }
          register = new Register(key, type, strokes);
        }
@@ -44,7 +44,7 @@ internal class SystemMarks {

 internal fun Project.createLineBookmark(editor: Editor, line: Int, mnemonic: Char): LineBookmark? {
  val bookmarksManager = BookmarksManager.getInstance(this) ?: return null
-  val lineBookmarkProvider = LineBookmarkProvider.find(this) ?: return null
+  val lineBookmarkProvider = LineBookmarkProvider.Util.find(this) ?: return null
  val bookmark = lineBookmarkProvider.createBookmark(editor, line) as LineBookmark? ?: return null
  val type = BookmarkType.get(mnemonic)
  if (type == BookmarkType.DEFAULT) return null
@@ -28,11 +28,15 @@ import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.initInjector
 import org.jdom.Element

-@State(name = "VimJumpsSettings", storages = [Storage(value = "\$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)])
+@State(
+  name = "VimJumpsSettings",
+  storages = [Storage(value = "\$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)]
+)
 internal class VimJumpServiceImpl : VimJumpServiceBase(), PersistentStateComponent<Element?> {
  companion object {
    private val logger = vimLogger<VimJumpServiceImpl>()
  }
+
  override var lastJumpTimeStamp: Long = 0

  override fun includeCurrentCommandAsNavigation(editor: VimEditor) {
@@ -93,7 +97,7 @@ internal class JumpsListener(val project: Project) : RecentPlacesListener {
  override fun recentPlaceAdded(changePlace: PlaceInfo, isChanged: Boolean) {
    initInjector()
    if (!injector.globalIjOptions().unifyjumps) return
-    
+
    val jumpService = injector.jumpService
    if (!isChanged) {
      if (changePlace.timeStamp < jumpService.lastJumpTimeStamp) return // this listener is notified asynchronously, and
@@ -105,7 +109,7 @@ internal class JumpsListener(val project: Project) : RecentPlacesListener {

  override fun recentPlaceRemoved(changePlace: PlaceInfo, isChanged: Boolean) {
    if (!injector.globalIjOptions().unifyjumps) return
-    
+
    val jumpService = injector.jumpService
    if (!isChanged) {
      if (changePlace.timeStamp < jumpService.lastJumpTimeStamp) return // this listener is notified asynchronously, and
@@ -45,7 +45,10 @@ import java.util.*
 // todo sync vim jumps with ide jumps

 // todo exception after moving to global mark after deleting it via IDE (impossible to receive markChar)
-@State(name = "VimMarksSettings", storages = [Storage(value = "\$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)])
+@State(
+  name = "VimMarksSettings",
+  storages = [Storage(value = "\$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)]
+)
 internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateComponent<Element?> {
  private fun createOrGetSystemMark(ch: Char, line: Int, col: Int, editor: VimEditor): Mark? {
    val ijEditor = (editor as IjVimEditor).editor
@@ -71,7 +74,8 @@ internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateCompone
    }
    element.addContent(globalMarksElement)
    val localMarksElement = Element("localmarks")
-    var files: List<LocalMarks<Char, Mark>> = filepathToLocalMarks.values.sortedWith(Comparator.comparing(LocalMarks<Char, Mark>::myTimestamp))
+    var files: List<LocalMarks<Char, Mark>> =
+      filepathToLocalMarks.values.sortedWith(Comparator.comparing(LocalMarks<Char, Mark>::myTimestamp))
    if (files.size > SAVE_MARK_COUNT) {
      files = files.subList(files.size - SAVE_MARK_COUNT, files.size)
    }
@@ -85,7 +89,12 @@ internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateCompone
        fileMarkElem.setAttribute("name", file)
        fileMarkElem.setAttribute("timestamp", java.lang.Long.toString(marks.myTimestamp.time))
        for (mark in marks.values) {
-          if (!Character.isUpperCase(mark.key) && injector.markService.isValidMark(mark.key, VimMarkService.Operation.SAVE, true)) {
+          if (!Character.isUpperCase(mark.key) && injector.markService.isValidMark(
+              mark.key,
+              VimMarkService.Operation.SAVE,
+              true
+            )
+          ) {
            val markElem = Element("mark")
            markElem.setAttribute("key", mark.key.toString())
            markElem.setAttribute("line", mark.line.toString())
@@ -31,8 +31,8 @@ import org.jetbrains.annotations.Nullable;

 import javax.swing.*;
 import java.awt.*;
-import java.util.List;
 import java.util.*;
+import java.util.List;

 public class WindowGroup extends WindowGroupBase {
  @Override
@@ -56,7 +56,7 @@ public class WindowGroup extends WindowGroupBase {
  }

  public void closeAll(@NotNull ExecutionContext context) {
-    getFileEditorManager(((IjEditorExecutionContext) context).getContext()).closeAllFiles();
+    getFileEditorManager(((IjEditorExecutionContext)context).getContext()).closeAllFiles();
  }

  @Override
@@ -105,10 +105,13 @@ public class WindowGroup extends WindowGroupBase {
  @Override
  @RWLockLabel.Readonly
  @RequiresReadLock
-  public void selectWindowInRow(@NotNull VimCaret caret, @NotNull ExecutionContext context, int relativePosition, boolean vertical) {
-    final Caret ijCaret = ((IjVimCaret) caret).getCaret();
+  public void selectWindowInRow(@NotNull VimCaret caret,
+                                @NotNull ExecutionContext context,
+                                int relativePosition,
+                                boolean vertical) {
+    final Caret ijCaret = ((IjVimCaret)caret).getCaret();
    final FileEditorManagerEx fileEditorManager = getFileEditorManager(((DataContext)context.getContext()));
-    final EditorWindow currentWindow =  fileEditorManager.getCurrentWindow();
+    final EditorWindow currentWindow = fileEditorManager.getCurrentWindow();
    if (currentWindow != null) {
      final EditorWindow[] windows = fileEditorManager.getWindows();
      final List<EditorWindow> row = findWindowsInRow(ijCaret, currentWindow, Arrays.asList(windows), vertical);
@@ -116,7 +119,8 @@ public class WindowGroup extends WindowGroupBase {
    }
  }

-  private void selectWindow(@NotNull EditorWindow currentWindow, @NotNull List<EditorWindow> windows,
+  private void selectWindow(@NotNull EditorWindow currentWindow,
+                            @NotNull List<EditorWindow> windows,
                            int relativePosition) {
    final int pos = windows.indexOf(currentWindow);
    final int selected = pos + relativePosition;
@@ -126,7 +130,8 @@ public class WindowGroup extends WindowGroupBase {

  private static @NotNull List<EditorWindow> findWindowsInRow(@NotNull Caret caret,
                                                              @NotNull EditorWindow editorWindow,
-                                                              @NotNull List<EditorWindow> windows, final boolean vertical) {
+                                                              @NotNull List<EditorWindow> windows,
+                                                              final boolean vertical) {
    final Point anchorPoint = getCaretPoint(caret);
    if (anchorPoint != null) {
      final List<EditorWindow> result = new ArrayList<>();
@@ -34,9 +34,9 @@ import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.RWLockLabel
 import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
 import com.maddyhome.idea.vim.ide.isClionNova
+import com.maddyhome.idea.vim.ide.isRider
 import com.maddyhome.idea.vim.mark.VimMarkConstants.MARK_CHANGE_POS
 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.newapi.vim
@@ -80,7 +80,7 @@ internal class PutGroup : VimPutBase() {
    vimEditor: VimEditor,
    vimContext: ExecutionContext,
    text: ProcessedTextData,
-    subMode: SelectionType,
+    selectionType: SelectionType,
    data: PutData,
    additionalData: Map<String, Any>,
  ) {
@@ -127,7 +127,7 @@ internal class PutGroup : VimPutBase() {
      point.dispose()
      if (!caret.isValid) return@forEach

-      val caretPossibleEndOffset = lastPastedRegion?.endOffset ?: (startOffset + text.copiedText.text.length)
+      val caretPossibleEndOffset = lastPastedRegion?.endOffset ?: (startOffset + text.text.length)
      val endOffset = if (data.indent) {
        doIndent(
          vimEditor,
@@ -148,7 +148,7 @@ internal class PutGroup : VimPutBase() {
        startOffset,
        endOffset,
        text.typeInRegister,
-        subMode,
+        selectionType,
        data.caretAfterInsertedText,
      )
    }
@@ -179,9 +179,12 @@ internal class PutGroup : VimPutBase() {
    val allContentsBefore = CopyPasteManager.getInstance().allContents
    val sizeBeforeInsert = allContentsBefore.size
    val firstItemBefore = allContentsBefore.firstOrNull()
-    logger.debug { "Copied text: ${text.copiedText}" }
-    val (textContent, transferableData) = text.copiedText as IjVimCopiedText
-    val origContent: TextBlockTransferable = injector.clipboardManager.setClipboardText(textContent, textContent, transferableData) as TextBlockTransferable
+    logger.debug { "Transferable classes: ${text.transferableData.joinToString { it.javaClass.name }}" }
+    val origContent: TextBlockTransferable =
+      injector.clipboardManager.setClipboardText(
+      text.text,
+      transferableData = text.transferableData,
+    ) as TextBlockTransferable
    val allContentsAfter = CopyPasteManager.getInstance().allContents
    val sizeAfterInsert = allContentsAfter.size
    try {
@@ -189,7 +192,7 @@ internal class PutGroup : VimPutBase() {
    } finally {
      val textInClipboard = (firstItemBefore as? TextBlockTransferable)
        ?.getTransferData(DataFlavor.stringFlavor) as? String
-      val textOnTop = textInClipboard != null && textInClipboard != text.copiedText.text
+      val textOnTop = textInClipboard != null && textInClipboard != text.text
      if (sizeBeforeInsert != sizeAfterInsert || textOnTop) {
        // Sometimes an inserted text replaces an existing one. E.g. on insert with + or * register
        (CopyPasteManager.getInstance() as? CopyPasteManagerEx)?.run { removeContent(origContent) }
@@ -204,8 +207,9 @@ internal class PutGroup : VimPutBase() {
    startOffset: Int,
    endOffset: Int,
  ): Int {
-    // Temp fix for VIM-2808. Should be removed after rider will fix it's issues
-    if (PlatformUtils.isRider() || isClionNova()) return endOffset
+    // Temp fix for VIM-2808 for Rider and Clion. Should be removed after rider will fix it's issues
+    // Disable for client due to VIM-3857
+    if (isRider() || isClionNova() || PlatformUtils.isJetBrainsClient()) return endOffset

    val startLine = editor.offsetToBufferPosition(startOffset).line
    val endLine = editor.offsetToBufferPosition(endOffset - 1).line
--- a/Show More
+++ b/Show More