Set plugin version to chylex-24

Fixes multiple cursors with vim-surround commands `cs, ds, S` (but not `ys`).

.github/workflows/mergePr.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
 
-    if: false
+    if: github.event.pull_request.merged == true && github.repository == 'JetBrains/ideavim'
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/runUiOctopusTests.yml

@@ -1,85 +0,0 @@
-name: Run Non Octopus UI 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: 17
-      - name: Setup FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v3
-        with:
-          # Not strictly necessary, but it may prevent rate limit
-          # errors especially on GitHub-hosted macos machines.
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - 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 runIdeForUiTests -Doctopus.handler=false > 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: 20
-          retry-delay: 10s
-      - name: Tests
-        run: gradle :tests:ui-ij-tests:testUi
-      - name: Move video
-        if: always()
-        run: mv tests/ui-ij-tests/video build/reports
-      - name: Move sandbox logs
-        if: always()
-        run: mv build/idea-sandbox/system/log sandbox-idea-log
-      - name: Save report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-test-fails-report-mac
-          path: |
-            build/reports
-            tests/ui-ij-tests/build/reports
-            sandbox-idea-log
-#  build-for-ui-test-linux:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Setup Java
-#        uses: actions/setup-java@v2.1.0
-#        with:
-#          distribution: zulu
-#          java-version: 11
-#      - name: Build Plugin
-#        run: gradle :buildPlugin
-#      - name: Run Idea
-#        run: |
-#          export DISPLAY=:99.0
-#          Xvfb -ac :99 -screen 0 1920x1080x16 &
-#          mkdir -p build/reports
-#          gradle :runIdeForUiTests #> build/reports/idea.log
-#      - name: Wait for Idea started
-#        uses: jtalk/url-health-check-action@1.5
-#        with:
-#          url: http://127.0.0.1:8082
-#          max-attempts: 15
-#          retry-delay: 30s
-#      - name: Tests
-#        run: gradle :testUi
-#      - name: Save fails report
-#        if: ${{ failure() }}
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: ui-test-fails-report-linux
-#          path: |
-#            ui-test-example/build/reports

.github/workflows/runUiPyTests.yml

@@ -1,56 +0,0 @@
-name: Run UI PyCharm 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: 17
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - name: Setup FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v3
-        with:
-          # Not strictly necessary, but it may prevent rate limit
-          # errors especially on GitHub-hosted macos machines.
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - 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 :runIdeForUiTests -PideaType=PC > 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: 20
-          retry-delay: 10s
-      - name: Tests
-        run: gradle :tests:ui-py-tests:testUi
-      - name: Move video
-        if: always()
-        run: mv tests/ui-py-tests/video build/reports
-      - name: Move sandbox logs
-        if: always()
-        run: mv build/idea-sandbox/system/log sandbox-idea-log
-      - name: Save report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-test-fails-report-mac
-          path: |
-            build/reports
-            tests/ui-py-tests/build/reports
-            sandbox-idea-log

.github/workflows/runUiTests.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 11
       - name: Setup FFmpeg
         uses: FedericoCarboni/setup-ffmpeg@v3
         with:
@@ -27,7 +27,7 @@ jobs:
       - name: Run Idea
         run: |
           mkdir -p build/reports
-          gradle runIdeForUiTests > build/reports/idea.log &
+          gradle :runIdeForUiTests > build/reports/idea.log &
       - name: Wait for Idea started
         uses: jtalk/url-health-check-action@v3
         with:
@@ -35,10 +35,10 @@ jobs:
           max-attempts: 20
           retry-delay: 10s
       - name: Tests
-        run: gradle :tests:ui-ij-tests:testUi
+        run: gradle :testUi
       - name: Move video
         if: always()
-        run: mv tests/ui-ij-tests/video build/reports
+        run: mv video build/reports
       - name: Move sandbox logs
         if: always()
         run: mv build/idea-sandbox/system/log sandbox-idea-log
@@ -49,7 +49,6 @@ jobs:
           name: ui-test-fails-report-mac
           path: |
             build/reports
-            tests/ui-ij-tests/build/reports
             sandbox-idea-log
 #  build-for-ui-test-linux:
 #    runs-on: ubuntu-latest

.github/workflows/updateChangelog.yml

@@ -7,12 +7,15 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 10 * * *'
+# Workflow run on push is disabled to avoid conflicts when merging PR
+#  push:
+#    branches: [ master ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
-    if: false
+    if: github.repository == 'JetBrains/ideavim'
 
     steps:
       - uses: actions/checkout@v3

.gitignore

@@ -23,7 +23,6 @@
 
 # Generated by gradle task "generateGrammarSource"
 src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated
-vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
 # Generated JSONs for lazy classloading
 /vim-engine/src/main/resources/ksp-generated
 /src/main/resources/ksp-generated

.teamcity/_Self/Project.kt

@@ -15,7 +15,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
 object Project : Project({
-  description = "Vim engine for JetBrains IDEs"
+  description = "Vim engine for IDEs based on the IntelliJ platform"
 
   subProjects(Releases, OldTests, GitHub)
 

.teamcity/_Self/buildTypes/Compatibility.kt

@@ -34,6 +34,7 @@ object Compatibility : IdeaVimBuildType({
               
               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 '${'$'}io.github.mishkun.ideavimsneak' [latest-IU] -team-city
               java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
               java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}IdeaVimExtension' [latest-IU] -team-city
               # Outdated java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}github.zgqq.intellij-enhance' [latest-IU] -team-city

.teamcity/_Self/buildTypes/LongRunning.kt

@@ -25,7 +25,7 @@ object LongRunning : IdeaVimBuildType({
 
   steps {
     gradle {
-      tasks = "clean :tests:long-running-tests:testLongRunning"
+      tasks = "clean testLongRunning"
       buildFile = ""
       enableStacktrace = true
     }

.teamcity/_Self/buildTypes/Nvim.kt

@@ -39,7 +39,7 @@ object Nvim : IdeaVimBuildType({
               """.trimIndent()
     }
     gradle {
-      tasks = "clean test -Dnvim"
+      tasks = "clean testWithNeovim"
       buildFile = ""
       enableStacktrace = true
     }

.teamcity/_Self/buildTypes/PropertyBased.kt

@@ -24,7 +24,7 @@ object PropertyBased : IdeaVimBuildType({
 
   steps {
     gradle {
-      tasks = "clean :tests:property-tests:testPropertyBased"
+      tasks = "clean testPropertyBased"
       buildFile = ""
       enableStacktrace = true
     }

.teamcity/_Self/buildTypes/PublishVimEngine.kt

@@ -20,8 +20,8 @@ object PublishVimEngine : IdeaVimBuildType({
   params {
     param("env.ORG_GRADLE_PROJECT_engineVersion", "%build.number%")
     param("env.ORG_GRADLE_PROJECT_uploadUrl", "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies")
-    password("env.ORG_GRADLE_PROJECT_spacePassword", "credentialsJSON:5ea56f8c-efe7-4e1e-83de-0c02bcc39d0b", display = ParameterDisplay.HIDDEN)
+    password("env.ORG_GRADLE_PROJECT_spacePassword", "credentialsJSON:790b4e43-ee83-4184-b81b-678afab60409", display = ParameterDisplay.HIDDEN)
-    param("env.ORG_GRADLE_PROJECT_spaceUsername", "a121c67e-39ac-40e6-bf82-649855ec27b6")
+    param("env.ORG_GRADLE_PROJECT_spaceUsername", "Aleksei.Plate")
   }
 
   vcs {

.teamcity/_Self/buildTypes/Qodana.kt

@@ -46,8 +46,8 @@ object Qodana : IdeaVimBuildType({
         version = Qodana.JVMVersion.LATEST
       }
       reportAsTests = true
+      additionalDockerArguments = "-e QODANA_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb24iOiIzUFZrQSIsInByb2plY3QiOiIzN1FlQSIsInRva2VuIjoiM0t2bXoifQ.uohp81tM7iAfvvB6k8faarfpV-OjusAaEbWQ8iNrOgs"
       additionalQodanaArguments = "--baseline qodana.sarif.json"
-      cloudToken = "credentialsJSON:6b79412e-9198-4862-9223-c5019488f903"
     }
   }
 
@@ -63,6 +63,7 @@ object Qodana : IdeaVimBuildType({
         timezone = "SERVER"
       }
       param("dayOfWeek", "Sunday")
+      enabled = false
     }
   }
 

.teamcity/_Self/buildTypes/ReleaseEap.kt

@@ -5,7 +5,6 @@ import _Self.Constants.RELEASE_EAP
 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.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
@@ -31,11 +30,6 @@ object ReleaseEap : IdeaVimBuildType({
       "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
       label = "Slack Token"
     )
-    password(
-      "env.YOUTRACK_TOKEN",
-      "credentialsJSON:2479995b-7b60-4fbb-b095-f0bafae7f622",
-      display = ParameterDisplay.HIDDEN
-    )
   }
 
   vcs {
@@ -67,26 +61,26 @@ object ReleaseEap : IdeaVimBuildType({
       tasks = "scripts:addReleaseTag"
     }
     gradle {
-      name = "Publish plugin"
       tasks = "publishPlugin"
     }
+    // Same as the script below. However, jgit can't find ssh keys on TeamCity
+//    gradle {
+//      name = "Push changes to the repo"
+//      tasks = "scripts:pushChanges"
+//    }
     script {
       name = "Push changes to the repo"
       scriptContent = """
-      branch=$(git branch --show-current)
+      branch=$(git branch --show-current)  
       echo current branch is ${'$'}branch
       if [ "master" != "${'$'}branch" ];
       then
         exit 1
       fi
-
+      
       git push origin %build.number%
       """.trimIndent()
     }
-    gradle {
-      name = "YouTrack post release actions"
-      tasks = "scripts:eapReleaseActions"
-    }
   }
 
   features {

.teamcity/_Self/buildTypes/ReleasePlugin.kt

@@ -45,11 +45,7 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
       label = "Slack Token"
     )
-    password(
+    password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:3cd3e867-282c-451f-b958-bc95d56a8450", display = ParameterDisplay.HIDDEN)
-      "env.ORG_GRADLE_PROJECT_youtrackToken",
-      "credentialsJSON:7bc0eb3a-b86a-4ebd-b622-d4ef12d7e1d3",
-      display = ParameterDisplay.HIDDEN
-    )
     param("env.ORG_GRADLE_PROJECT_releaseType", releaseType)
   }
 
@@ -69,25 +65,9 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       name = "Pull git history"
       scriptContent = "git fetch --unshallow"
     }
-    script {
+    gradle {
-      name = "Reset release branch"
+      name = "Select branch"
-      scriptContent = """
+      tasks = "scripts:selectBranch"
-        if [ "major" = "$releaseType" ] || [ "minor" = "$releaseType" ]
-        then
-          echo Resetting the release branch because the release type is $releaseType
-          git checkout master
-          latest_eap=${'$'}(git describe --tags --match="[0-9].[0-9]*.[0-9]-eap.[0-9]*" --abbrev=0 HEAD)
-          echo Latest EAP: ${'$'}latest_eap
-          commit_of_latest_eap=${'$'}(git rev-list -n 1 ${'$'}latest_eap)
-          echo Commit of latest EAP: ${'$'}commit_of_latest_eap
-          git checkout release
-          git reset --hard ${'$'}commit_of_latest_eap
-        else
-          git checkout release
-          echo Do not reset the release branch because the release type is $releaseType
-        fi
-        echo Checked out release branch
-      """.trimIndent()
     }
     gradle {
       name = "Calculate new version"
@@ -97,50 +77,53 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       name = "Set TeamCity build number"
       tasks = "scripts:setTeamCityBuildNumber"
     }
-//    gradle {
+    gradle {
-//      name = "Update change log"
+      name = "Update change log"
-//      tasks = "scripts:changelogUpdateUnreleased"
+      tasks = "scripts:changelogUpdateUnreleased"
-//    }
+    }
-//    gradle {
+    gradle {
-//      name = "Commit preparation changes"
+      name = "Commit preparation changes"
-//      tasks = "scripts:commitChanges"
+      tasks = "scripts:commitChanges"
-//    }
+    }
     gradle {
       name = "Add release tag"
       tasks = "scripts:addReleaseTag"
     }
-    script {
+    gradle {
-      name = "Run tests"
+      name = "Reset release branch"
-      scriptContent = "./gradlew test"
+      tasks = "scripts:resetReleaseBranch"
     }
     gradle {
       name = "Publish release"
       tasks = "publishPlugin"
     }
-//    script {
-//      name = "Checkout master branch"
-//      scriptContent = """
-//        echo Checkout master
-//        git checkout master
-//      """.trimIndent()
-//    }
 //    gradle {
-//      name = "Update change log in master"
+//      name = "Push changes to the repo"
-//      tasks = "scripts:changelogUpdateUnreleased"
+//      tasks = "scripts:pushChangesWithReleaseBranch"
-//    }
-//    gradle {
-//      name = "Commit preparation changes in master"
-//      tasks = "scripts:commitChanges"
 //    }
     script {
       name = "Push changes to the repo"
       scriptContent = """
-      git checkout release
+      branch=$(git branch --show-current)  
-      echo checkout release branch
+      echo current branch is ${'$'}branch
-      git branch --set-upstream-to=origin/release release
+      if [ "master" != "${'$'}branch" ];
-      git push origin --force
+      then
-      # Push tag
+        git checkout master
-      git push origin %build.number%
+      fi
+      
+      git push origin --tags
+      git push origin
+      
+      if [ "patch" != $releaseType  ];
+      then
+        git checkout release
+        echo checkout release branch
+        git branch --set-upstream-to=origin/release release
+        git push --tags
+        git push origin --force
+      fi
+      
+      git checkout ${'$'}branch
       """.trimIndent()
     }
     gradle {

.teamcity/patches/buildTypes/IdeaVimTests_Latest_EAP.kts

@@ -1,9 +1,11 @@
 package patches.buildTypes
 
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.RelativeId
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.GradleBuildStep
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.changeBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.expectSteps
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.update
 
 /*
 This patch script was generated by TeamCity on settings change in UI.
@@ -11,18 +13,6 @@ To apply the patch, change the buildType with id = 'IdeaVimTests_Latest_EAP'
 accordingly, and delete the patch script.
 */
 changeBuildType(RelativeId("IdeaVimTests_Latest_EAP")) {
-    check(artifactRules == """
-        +:build/reports => build/reports
-        +:/mnt/agent/temp/buildTmp/ => /mnt/agent/temp/buildTmp/
-    """.trimIndent()) {
-        "Unexpected option value: artifactRules = $artifactRules"
-    }
-    artifactRules = """
-        +:build/reports => build/reports
-        +:/mnt/agent/temp/buildTmp/ => /mnt/agent/temp/buildTmp/
-        +:tests/java-tests/build/reports => tests/java-tests/build/reports
-    """.trimIndent()
-
     expectSteps {
         gradle {
             tasks = "clean test"

.teamcity/patches/buildTypes/PublishVimEngine.kts

@@ -1,19 +0,0 @@
-package patches.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, change the buildType with id = 'PublishVimEngine'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("PublishVimEngine")) {
-    vcs {
-
-        check(branchFilter == "+:<default>") {
-            "Unexpected option value: branchFilter = $branchFilter"
-        }
-        branchFilter = "+:fleet"
-    }
-}

.teamcity/patches/buildTypes/ReleaseMinor.kts

@@ -0,0 +1,20 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ReleaseMinor'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ReleaseMinor")) {
+    params {
+        expect {
+            password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:3cd3e867-282c-451f-b958-bc95d56a8450", display = ParameterDisplay.HIDDEN)
+        }
+        update {
+            password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:7bc0eb3a-b86a-4ebd-b622-d4ef12d7e1d3", display = ParameterDisplay.HIDDEN)
+        }
+    }
+}

.teamcity/patches/buildTypes/ReleasePatch.kts

@@ -0,0 +1,20 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ReleasePatch'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ReleasePatch")) {
+    params {
+        expect {
+            password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:3cd3e867-282c-451f-b958-bc95d56a8450", display = ParameterDisplay.HIDDEN)
+        }
+        update {
+            password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:7bc0eb3a-b86a-4ebd-b622-d4ef12d7e1d3", display = ParameterDisplay.HIDDEN)
+        }
+    }
+}

.teamcity/patches/projects/_Self.kts

@@ -0,0 +1,17 @@
+package patches.projects
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the root project
+accordingly, and delete the patch script.
+*/
+changeProject(DslContext.projectId) {
+    check(description == "Vim engine for IDEs based on the IntelliJ platform") {
+        "Unexpected description: '$description'"
+    }
+    description = "Vim engine for JetBrains IDEs"
+}

.teamcity/settings.kts

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

AUTHORS.md

@@ -491,18 +491,6 @@ Contributors:
   [![icon][github]](https://github.com/Infonautica)
    
   Leonid Danilov
-* [![icon][mail]](mailto:emanuel-367@hotmail.com)
-  [![icon][github]](https://github.com/emanuelgestosa)
-   
-  Emanuel Gestosa
-* [![icon][mail]](mailto:81118900+lippfi@users.noreply.github.com)
-  [![icon][github]](https://github.com/lippfi)
-   
-  lippfi, 
-* [![icon][mail]](mailto:fillipser143@gmail.com)
-  [![icon][github]](https://github.com/Parker7123)
-   
-  FilipParker
 
 Previous contributors:
 

CHANGES.md

@@ -23,22 +23,7 @@ It is important to distinguish EAP from traditional pre-release software.
 Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
-## End of changelog file maintenance
+## To Be Released
-
-Since version 2.9.0, the changelog can be found on YouTrack
-
-To Be Released: https://youtrack.jetbrains.com/issues/VIM?q=%23%7BReady%20To%20Release%7D%20
-Latest Fixes: https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20sort%20by:%20updated%20
-
-## 2.9.0, 2024-02-20
-
-### Fixes:
-* [VIM-3055](https://youtrack.jetbrains.com/issue/VIM-3055) Fix the issue with double deleting after dot
-
-### Merged PRs:
-* [805](https://github.com/JetBrains/ideavim/pull/805) by [chylex](https://github.com/chylex): VIM-3238 Fix recording a macro that replays another macro
-
-## 2.8.0, 2024-01-30
 
 ### Fixes:
 * [VIM-3130](https://youtrack.jetbrains.com/issue/VIM-3130) Change the build version to 2023.1.2
@@ -59,8 +44,6 @@ Latest Fixes: https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20sort%
 * [VIM-3206](https://youtrack.jetbrains.com/issue/VIM-3206) Disable both copilot suggestion and insert mode on a single escape
 * [VIM-3090](https://youtrack.jetbrains.com/issue/VIM-3090) Cmd line mode saves the visual mode
 * [VIM-3085](https://youtrack.jetbrains.com/issue/VIM-3085) Open access to VimTypedActionHandler and VimShortcutKeyAction
-* [VIM-3260](https://youtrack.jetbrains.com/issue/VIM-3260) Processing the offsets at the file end
-* [VIM-3183](https://youtrack.jetbrains.com/issue/VIM-3183) Execute .ideavimrc on pooled thread
 
 ### Merged PRs:
 * [763](https://github.com/JetBrains/ideavim/pull/763) by [Sam Ng](https://github.com/samabcde): Fix(VIM-3176) add test for restore selection after pasting in/below s…

ThirdPartyLicenses.md

@@ -84,8 +84,3 @@ IV)  It is not allowed to remove this license from the distribution of the Vim
      license for previous Vim releases instead of the license that they came
      with, at your option.
 ```
-
----
-
-File [sneakIcon.png](doc/images/sneakIcon.svg), which is originally an icon of the ideavim-sneak plugin,
-is merged icons of IdeaVim plugin and a random sneaker by FreePic from flaticon.com.

annotation-processors/build.gradle.kts

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

doc/IdeaVim Plugins.md

@@ -44,21 +44,16 @@ All commands with the mappings are supported. See the [full list of supported co
 
 <details>
 <summary><h2>sneak</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).
    
 ### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'justinmk/vim-sneak'`
+- Install [IdeaVim-sneak](https://plugins.jetbrains.com/plugin/15348-ideavim-sneak) plugin.
+- Add the following command to `~/.ideavimrc`: `set sneak`
    
 ### Instructions
-
+   
-* Type `s` and two chars to start sneaking in forward direction
+See the [docs](https://github.com/Mishkun/ideavim-sneak#usage)
-* 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>
 

doc/images/sneakIcon.svg

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg viewBox="386.498 234 32 32" xmlns="http://www.w3.org/2000/svg">
-  <defs>
-    <linearGradient id="ideavim_plugin-a" x1="-6.748%" x2="47.286%" y1="33.61%" y2="85.907%">
-      <stop offset="0" stop-color="#3BEA62"/>
-      <stop offset="1" stop-color="#087CFA"/>
-    </linearGradient>
-  </defs>
-  <g transform="matrix(1.238978, 0.90017, -0.90017, 1.238978, 131.776901, -422.953003)" style="">
-    <path d="M 399.962 247.648 C 399.207 246.894 399.147 246.318 399.692 245.453 C 400.237 244.588 401.955 245.886 401.955 245.886 L 401.955 250.737" style="fill: rgb(248, 245, 231);"/>
-    <path d="M 413.846 253.602 C 413.846 255.077 411.827 256.134 409.392 256.134 L 396.381 256.134 C 395.211 256.134 394.232 256.003 393.433 255.817 C 391.496 255.367 390.613 254.596 390.613 254.596 L 391.478 252.513 L 393.607 252.617 Z M 413.846 253.602" fill="#cce6f6" style=""/>
-    <path d="M 413.846 253.602 C 413.846 253.602 411.475 254.468 408.27 254.468 C 405.94 254.468 398.116 253.433 394.023 252.869 C 392.488 252.658 391.478 252.512 391.478 252.512 C 390.864 251.662 392.078 248.741 392.758 247.263 C 393.118 246.484 393.85 245.929 394.703 245.83 C 394.782 245.82 394.861 245.815 394.939 245.815 C 395.369 245.815 395.645 246.532 396.059 247.225 C 396.446 247.877 396.955 248.507 397.823 248.507 C 399.617 248.507 401.955 245.886 401.955 245.886 C 406.544 249.03 410.097 250.43 410.097 250.43 C 410.097 250.43 413.061 250.446 413.782 251.167 C 414.503 251.888 414.422 253.218 413.846 253.602 Z M 413.846 253.602" style="fill: rgb(8, 124, 250);"/>
-    <path d="M 394.023 252.869 L 393.433 255.817 C 391.496 255.367 390.613 254.596 390.613 254.596 L 391.478 252.513 L 393.607 252.617 Z M 394.023 252.869" fill="#9dcae0" style=""/>
-    <path d="M 396.059 247.225 C 395.073 245.986 393.193 250.255 394.023 252.869 C 392.488 252.658 391.478 252.513 391.478 252.513 C 390.864 251.662 392.078 248.741 392.758 247.263 C 393.118 246.484 393.85 245.929 394.703 245.83 C 394.782 245.82 394.861 245.815 394.939 245.815 C 395.369 245.815 395.645 246.532 396.059 247.225 Z M 396.059 247.225" style="fill: rgb(14, 112, 142);"/>
-    <path d="M 403.527 246.924 L 399.174 251.768 C 397.7 250.892 395.578 250.174 394.016 249.717 C 392.843 249.372 391.985 249.174 391.959 249.168 C 392.108 248.769 392.268 248.379 392.421 248.022 L 394.341 248.65 L 394.884 248.827 C 395.509 249.031 396.192 248.95 396.753 248.608 L 397.153 248.363 C 397.35 248.454 397.572 248.507 397.823 248.507 C 399.617 248.507 401.955 245.886 401.955 245.886 C 402.494 246.256 403.02 246.601 403.527 246.924 Z M 403.527 246.924" style="fill: rgb(59, 234, 98);"/>
-    <path d="M 413.847 253.602 C 413.847 253.602 411.475 254.468 408.27 254.468 C 407.586 254.468 406.426 254.378 405.025 254.238 L 405.025 254.237 C 405.025 253.495 406.924 251.743 408.366 251.616 C 408.623 252.865 410.097 252.512 411.219 252.128 C 412.341 251.743 413.783 251.167 413.783 251.167 C 414.503 251.888 414.422 253.218 413.847 253.602 Z M 413.847 253.602" style="fill: rgb(8, 124, 250);"/>
-    <path d="M 394.341 248.65 C 394.214 248.978 394.103 249.339 394.016 249.717 C 392.843 249.372 391.985 249.174 391.959 249.168 C 392.108 248.769 392.268 248.379 392.421 248.022 Z M 394.341 248.65" style="fill: rgb(37, 187, 163);"/>
-    <path d="M 408.366 251.616 C 406.924 251.743 405.025 253.495 405.025 254.237 L 405.025 254.238 C 403.784 254.113 402.355 253.948 400.899 253.77 C 400.899 253.051 400.191 252.372 399.174 251.768 L 399.174 251.768 L 403.528 246.924 C 407.331 249.34 410.097 250.43 410.097 250.43 C 410.77 251.102 409.809 251.487 408.366 251.616 Z M 408.366 251.616" style="fill: rgb(248, 245, 231);"/>
-    <polygon fill="url(#ideavim_plugin-a)" fill-rule="evenodd" points="406.356 248.463 403.261 252.616 402.183 248.212 400.984 249.899 401.999 254.236 403.927 254.176 407.639 249.062" style="" transform="matrix(0.994522, 0.104529, -0.104529, 0.994522, 28.475005, -40.88594)"/>
-    <g fill="#fb6572" transform="matrix(0.046265, 0, 0, 0.046265, 390.612823, 245.155533)" style="">
-      <path d="m288.839844 72.65625c-2.007813 0-4.011719-.761719-5.542969-2.292969-3.058594-3.0625-3.058594-8.023437 0-11.082031l20.089844-20.089844c3.0625-3.058594 8.023437-3.058594 11.082031 0 3.058594 3.0625 3.0625 8.023438 0 11.082032l-20.089844 20.089843c-1.527344 1.53125-3.535156 2.292969-5.539062 2.292969zm0 0" style="fill: rgb(56, 228, 105);"/>
-      <path d="m314.589844 87.082031c-2.007813 0-4.011719-.765625-5.542969-2.296875-3.0625-3.058594-3.0625-8.019531 0-11.082031l20.089844-20.085937c3.0625-3.058594 8.023437-3.058594 11.082031 0 3.058594 3.0625 3.058594 8.023437 0 11.082031l-20.089844 20.085937c-1.527344 1.53125-3.535156 2.296875-5.539062 2.296875zm0 0" style="fill: rgb(59, 233, 100);"/>
-      <path d="m340.339844 101.507812c-2.007813 0-4.011719-.765624-5.542969-2.296874-3.058594-3.058594-3.058594-8.023438 0-11.082032l20.089844-20.085937c3.0625-3.0625 8.023437-3.0625 11.082031 0 3.058594 3.058593 3.0625 8.023437 0 11.082031l-20.089844 20.085938c-1.527344 1.53125-3.535156 2.296874-5.539062 2.296874zm0 0" style="fill: rgb(59, 233, 100);"/>
-      <path d="m366.089844 115.929688c-2.003906 0-4.011719-.761719-5.539063-2.292969-3.0625-3.0625-3.0625-8.023438 0-11.082031l20.085938-20.089844c3.0625-3.058594 8.023437-3.058594 11.082031 0 3.0625 3.0625 3.0625 8.023437 0 11.082031l-20.085938 20.089844c-1.53125 1.53125-3.535156 2.292969-5.542968 2.292969zm0 0" style="fill: rgb(59, 233, 100);"/>
-    </g>
-    <path d="M 401.925 247.748 C 401.761 247.748 401.611 247.629 401.573 247.469 C 401.536 247.312 401.611 247.144 401.753 247.067 C 402 246.933 402.318 247.147 402.286 247.426 C 402.265 247.606 402.107 247.748 401.925 247.748 Z M 401.925 247.748" fill="#1e2628" style=""/>
-  </g>
-</svg>

gradle.properties

@@ -8,28 +8,25 @@
 
 # suppress inspection "UnusedProperty" for whole file
 
-#ideaVersion=LATEST-EAP-SNAPSHOT
+ideaVersion=2023.3.2
-ideaVersion=2023.3.3
-# Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
-ideaType=IC
 downloadIdeaSources=true
 instrumentPluginCode=true
-version=chylex-30
+version=chylex-24
 javaVersion=17
-remoteRobotVersion=0.11.22
+remoteRobotVersion=0.11.21
 antlrVersion=4.10.1
 
 kotlin.incremental.useClasspathSnapshot=false
 
 # Please don't forget to update kotlin version in buildscript section
 # Also update kotlinxSerializationVersion version
-kotlinVersion=1.9.22
+kotlinVersion=1.8.21
 publishToken=token
 publishChannels=eap
 
 # Kotlinx serialization also uses some version of kotlin stdlib under the hood. However,
 #   we exclude this version from the dependency and use our own version of kotlin that is specified above
-kotlinxSerializationVersion=1.6.2
+kotlinxSerializationVersion=1.5.1
 
 slackUrl=
 youtrackToken=
@@ -42,4 +39,3 @@ kotlin.stdlib.default.dependency=false
 
 # Disable incremental annotation processing
 ksp.incremental=false
-

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -130,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.

qodana.yaml

@@ -21,9 +21,6 @@ exclude:
       - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/SimpleText.kt
       - src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated
       - src/main/java/com/maddyhome/idea/vim/package-info.java
-      - vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
-      - src/main/java/com/maddyhome/idea/vim/group/SearchGroup.java
-      - tests/ui-fixtures
 dependencyIgnores:
   - name: "acejump"
   - name: "icu4j"

scripts/build.gradle.kts

@@ -20,17 +20,17 @@ repositories {
 }
 
 dependencies {
-  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.23")
+  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
 
-  implementation("io.ktor:ktor-client-core:2.3.9")
+  implementation("io.ktor:ktor-client-core:2.3.7")
-  implementation("io.ktor:ktor-client-cio:2.3.9")
+  implementation("io.ktor:ktor-client-cio:2.3.7")
-  implementation("io.ktor:ktor-client-content-negotiation:2.3.9")
+  implementation("io.ktor:ktor-client-content-negotiation:2.3.7")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.9")
+  implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.7")
-  implementation("io.ktor:ktor-client-auth:2.3.9")
+  implementation("io.ktor:ktor-client-auth:2.3.7")
   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:6.9.0.202403050737-r")
+  implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.8.0.202311291450-r")
   implementation("com.vdurmont:semver4j:3.1.0")
 }
 
@@ -93,16 +93,28 @@ tasks.register("addReleaseTag", JavaExec::class) {
   args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
 }
 
-tasks.register("selectBranch", JavaExec::class) {
+tasks.register("resetReleaseBranch", JavaExec::class) {
   group = "release"
-  mainClass.set("scripts.release.SelectBranchKt")
+  mainClass.set("scripts.release.ResetReleaseBranchKt")
   classpath = sourceSets["main"].runtimeClasspath
   args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
 }
 
-tasks.register("eapReleaseActions", JavaExec::class) {
+tasks.register("pushChanges", JavaExec::class) {
+  mainClass.set("scripts.PushChangesKt")
+  classpath = sourceSets["main"].runtimeClasspath
+  args = listOf(rootProject.rootDir.toString())
+}
+
+tasks.register("pushChangesWithReleaseBranch", JavaExec::class) {
+  mainClass.set("scripts.PushChangesWithReleaseBranchKt")
+  classpath = sourceSets["main"].runtimeClasspath
+  args = listOf(rootProject.rootDir.toString(), releaseType ?: "")
+}
+
+tasks.register("selectBranch", JavaExec::class) {
   group = "release"
-  mainClass.set("scripts.releaseEap.EapReleaseActionsKt")
+  mainClass.set("scripts.release.SelectBranchKt")
   classpath = sourceSets["main"].runtimeClasspath
   args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
 }

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

@@ -22,7 +22,7 @@ import kotlinx.serialization.json.jsonPrimitive
  */
 
 @Suppress("SpellCheckingInspection")
-val knownPlugins = setOf(
+val knownPlugins = listOf(
   "IdeaVimExtension",
   "github.zgqq.intellij-enhance",
   "org.jetbrains.IdeaVim-EasyMotion",
@@ -31,13 +31,7 @@ val knownPlugins = setOf(
   "com.github.copilot",
   "com.github.dankinsoid.multicursor",
   "com.joshestein.ideavim-quickscope",
-
   "ca.alexgirard.HarpoonIJ",
-  "me.kyren223.harpoonforjb", // https://plugins.jetbrains.com/plugin/23771-harpoonforjb
-  "com.github.erotourtes.harpoon", // https://plugins.jetbrains.com/plugin/21796-harpooner
-  "me.kyren223.trident", // https://plugins.jetbrains.com/plugin/23818-trident
-
-  "com.protoseo.input-source-auto-converter",
 
 //   "cc.implicated.intellij.plugins.bunny", // I don't want to include this plugin in the list of IdeaVim plugins as I don't understand what this is for
 )
@@ -47,7 +41,7 @@ suspend fun main() {
     parameter("dependency", "IdeaVIM")
     parameter("includeOptional", true)
   }
-  val output = response.body<List<String>>().toSet()
+  val output = response.body<List<String>>()
   println(output)
   if (knownPlugins != output) {
     val newPlugins = (output - knownPlugins).map { it to (getPluginLinkByXmlId(it) ?: "Can't find plugin link") }

scripts/src/main/kotlin/scripts/ktor.kt

@@ -32,7 +32,7 @@ fun httpClient(): HttpClient {
     install(Auth) {
       bearer {
         loadTokens {
-          val accessToken = System.getenv("YOUTRACK_TOKEN") ?: error("Missing YOUTRACK_TOKEN")
+          val accessToken = System.getenv("YOUTRACK_TOKEN")!!
           BearerTokens(accessToken, "")
         }
       }

scripts/src/main/kotlin/scripts/pushChanges.kt

@@ -0,0 +1,37 @@
+/*
+ * 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
+
+import scripts.release.checkoutBranch
+import scripts.release.withGit
+import scripts.release.withRepo
+
+fun main(args: Array<String>) {
+  val rootDir = args[0]
+  println("root dir: $rootDir")
+
+  val currentBranch = withRepo(rootDir) { it.branch }
+  println("Current branch is $currentBranch")
+
+
+  withGit(rootDir) { git ->
+    if (currentBranch != "master") {
+      git.checkoutBranch("master")
+      println("Check out master branch")
+    }
+
+    git.push()
+      .setPushTags()
+      .call()
+    println("Master pushed with tags")
+
+    git.checkoutBranch(currentBranch)
+    println("Checked out $currentBranch branch")
+  }
+}

scripts/src/main/kotlin/scripts/pushChangesWithReleaseBranch.kt

@@ -0,0 +1,54 @@
+/*
+ * 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
+
+import scripts.release.checkoutBranch
+import scripts.release.withGit
+import scripts.release.withRepo
+
+fun main(args: Array<String>) {
+  val rootDir = args[0]
+  val releaseType = args[1]
+  println("root dir: $rootDir")
+  println("releaseType: $releaseType")
+
+  val currentBranch = withRepo(rootDir) { it.branch }
+  println("Current branch is $currentBranch")
+
+
+  withGit(rootDir) { git ->
+    if (currentBranch != "master") {
+      git.checkoutBranch("master")
+      println("Check out master branch")
+    }
+
+    git.push()
+      .setPushTags()
+      .call()
+    println("Master pushed with tags")
+
+    if (releaseType != "patch") {
+      git.checkoutBranch("release")
+      println("Checked out release")
+
+      git
+        .push()
+        .setForce(true)
+        .setPushTags()
+        .call()
+      println("Pushed release branch with tags")
+    }
+    else {
+      println("Do not push release branch because type of release is $releaseType")
+    }
+
+    git.checkoutBranch(currentBranch)
+    println("Checked out $currentBranch branch")
+  }
+}

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

@@ -8,12 +8,6 @@
 
 package scripts.release
 
-import org.eclipse.jgit.lib.ObjectId
-import org.eclipse.jgit.revwalk.RevCommit
-import org.eclipse.jgit.revwalk.RevWalk
-import org.eclipse.jgit.revwalk.filter.RevFilter
-
-
 fun main(args: Array<String>) {
   println("HI!")
   val projectDir = args[0]
@@ -25,12 +19,10 @@ fun main(args: Array<String>) {
   check(branch == "master") {
     "We should be on master branch"
   }
-  val mergeBaseCommit = getMergeBaseWithMaster(projectDir, objectId)
-  println("Base commit $mergeBaseCommit")
   withGit(projectDir) { git ->
     val log = git.log().setMaxCount(500).call().toList()
     println("First commit hash in log: " + log.first().name + " log size: ${log.size}")
-    val logDiff = log.takeWhile { it.id.name != mergeBaseCommit }
+    val logDiff = log.takeWhile { it.id.name != objectId.name }
     val numCommits = logDiff.size
     println("Log diff size is $numCommits")
     check(numCommits < 450) {
@@ -43,18 +35,3 @@ fun main(args: Array<String>) {
     println("##teamcity[setParameter name='env.ORG_GRADLE_PROJECT_version' value='$nextVersion']")
   }
 }
-
-private fun getMergeBaseWithMaster(projectDir: String, tag: ObjectId): String {
-  withRepo(projectDir) { repo ->
-    val master = repo.resolve("master")
-    RevWalk(repo).use { walk ->
-      val tagRevCommit = walk.parseCommit(tag)
-      val masterRevCommit = walk.parseCommit(master)
-      walk.setRevFilter(RevFilter.MERGE_BASE)
-      walk.markStart(tagRevCommit)
-      walk.markStart(masterRevCommit)
-      val mergeBase: RevCommit = walk.next()
-      return mergeBase.name
-    }
-  }
-}

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

@@ -8,45 +8,28 @@
 
 package scripts.release
 
-import com.vdurmont.semver4j.Semver
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import kotlin.io.path.Path
 import kotlin.io.path.readText
 import kotlin.io.path.writeText
 
-private const val toBeReleased = "## To Be Released"
-
 fun main(args: Array<String>) {
   println("Start updating unreleased section")
   val (newVersion, rootDir, releaseType) = readArgs(args)
 
   checkReleaseType(releaseType)
 
+  if (releaseType == "patch") {
+    println("Skip updating the changelog because release type is 'patch'")
+    return
+  }
+
   val currentDate = LocalDate.now().format(DateTimeFormatter.ISO_LOCAL_DATE)
   val newItem = "## $newVersion, $currentDate"
 
   val changelogPath = Path("$rootDir/CHANGES.md")
   val changelog = changelogPath.readText()
-  val newChangelog = if (releaseType == "patch") {
+  val newChangelog = changelog.replace("## To Be Released", newItem)
-    val decreasedVersion = Semver(newVersion).withIncPatch(-1)
-    val firstEntry = changelog.indexOf("## $decreasedVersion")
-    if (firstEntry != -1) {
-      val newLog = StringBuilder(changelog)
-      newLog.insert(firstEntry, newItem + "\n")
-      newLog.toString()
-    } else {
-      changelog
-    }
-  } else {
-    if (toBeReleased in changelog) {
-      changelog.replace(toBeReleased, newItem)
-    } else {
-      val firstEntry = changelog.indexOf("##")
-      val newLog = StringBuilder(changelog)
-      newLog.insert(firstEntry, newItem + "\n")
-      newLog.toString()
-    }
-  }
   changelogPath.writeText(newChangelog)
 }

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

@@ -13,20 +13,21 @@ fun main(args: Array<String>) {
 
   checkReleaseType(releaseType)
 
-  withGit(rootDir) { git ->
+  if (releaseType == "patch") {
-    if (git.diff().call().isNotEmpty()) {
+    println("Skip committing changes because release type is 'patch'")
-      git
+    return
-        .commit()
+  }
-        .setAll(true)
-        .setAuthor("IdeaVim Bot", "maintainers@ideavim.dev")
-        .setMessage("Preparation to $newVersion release")
-        .setSign(false)
-        .call()
 
-      val lastGitMessage = git.log().call().first().shortMessage
+  withGit(rootDir) { git ->
-      println("Changes committed. Last gitlog message: $lastGitMessage")
+    git
-    } else {
+      .commit()
-      println("No Changes")
+      .setAll(true)
-    }
+      .setAuthor("IdeaVim Bot", "maintainers@ideavim.dev")
+      .setMessage("Preparation to $newVersion release")
+      .setSign(false)
+      .call()
+
+    val lastGitMessage = git.log().call().first().shortMessage
+    println("Changes committed. Last gitlog message: $lastGitMessage")
   }
 }

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

@@ -0,0 +1,38 @@
+/*
+ * 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 (_, rootDir, releaseType) = readArgs(args)
+
+  checkReleaseType(releaseType)
+
+  checkBranch(rootDir, releaseType)
+
+  if (releaseType == "patch") {
+    println("Skip release branch reset because release type is 'patch'")
+    return
+  }
+
+  withGit(rootDir) { git ->
+    val currentCommit = git.log().setMaxCount(1).call().first()
+    println("Current commit id: ${currentCommit.id.name}")
+
+    git.checkoutBranch("release")
+    println("Checked out release branch")
+
+    git.reset()
+      .setRef(currentCommit.id.name)
+      .call()
+    println("release branch reset")
+
+    git.checkoutBranch("master")
+    println("Checked out master branch")
+  }
+}

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

@@ -15,7 +15,8 @@ fun main(args: Array<String>) {
 
   withGit(rootDir) { git ->
     val branchName = when (releaseType) {
-      "major", "minor", "patch" -> "release"
+      "major", "minor" -> "master"
+      "patch" -> "release"
       else -> error("Unsupported release type: $releaseType")
     }
 

scripts/src/main/kotlin/scripts/releaseEap/eapReleaseActions.kt

@@ -1,36 +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 scripts.releaseEap
-
-import kotlinx.coroutines.runBlocking
-import scripts.addComment
-import scripts.getYoutrackTicketsByQuery
-import scripts.release.readArgs
-import scripts.releasedInEapTagId
-import scripts.setTag
-
-fun main(args: Array<String>) {
-  runBlocking {
-    val (newVersion, _, _) = readArgs(args)
-
-    // Search for Ready to release, but without "IdeaVim Released In EAP" tag
-    val ticketsToUpdate =
-      getYoutrackTicketsByQuery("%23%7BReady%20To%20Release%7D%20tag:%20-%7BIdeaVim%20Released%20In%20EAP%7D%20")
-    println("Have to update the following tickets: $ticketsToUpdate")
-
-    ticketsToUpdate.forEach { ticketId ->
-      setTag(ticketId, releasedInEapTagId)
-      addComment(
-        ticketId, """
-        The fix is available in the IdeaVim $newVersion. See https://jb.gg/ideavim-eap for the instructions on how to get EAP builds as updates within the IDE. You can also wait till the next stable release with this fix, you’ll get it automatically.
-      """.trimIndent()
-      )
-    }
-  }
-}

scripts/src/main/kotlin/scripts/youtrack.kt

@@ -11,8 +11,6 @@ package scripts
 import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.ktor.http.*
-import kotlinx.coroutines.runBlocking
-import kotlinx.serialization.json.JsonArray
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.addJsonObject
 import kotlinx.serialization.json.buildJsonObject
@@ -23,10 +21,6 @@ import kotlinx.serialization.json.put
 import kotlinx.serialization.json.putJsonArray
 import kotlinx.serialization.json.putJsonObject
 
-
-// YouTrack tag "IdeaVim Released In EAP"
-const val releasedInEapTagId = "68-385032"
-
 suspend fun setYoutrackStatus(tickets: Collection<String>, status: String) {
   val client = httpClient()
 
@@ -65,59 +59,3 @@ suspend fun setYoutrackStatus(tickets: Collection<String>, status: String) {
     }
   }
 }
-
-fun getYoutrackTicketsByQuery(query: String): Set<String> {
-  val client = httpClient()
-
-  return runBlocking {
-    val response = client.get("https://youtrack.jetbrains.com/api/issues/?fields=idReadable&query=project:VIM+$query")
-    response.body<JsonArray>().mapTo(HashSet()) { it.jsonObject.getValue("idReadable").jsonPrimitive.content }
-  }
-}
-
-/**
- * 68-385032
- * [issueHumanId] is like VIM-123
- * [tagId] is like "145-23"
- */
-suspend fun setTag(issueHumanId: String, tagId: String) {
-  val client = httpClient()
-
-  println("Try to add tag $tagId to $issueHumanId")
-  val response =
-    // I've updated default url in client, so this may be broken now
-    client.post("https://youtrack.jetbrains.com/api/issues/$issueHumanId/tags?fields=customFields(id,name,value(id,name))") {
-      contentType(ContentType.Application.Json)
-      accept(ContentType.Application.Json)
-      val request = buildJsonObject {
-        put("id", tagId)
-      }
-      setBody(request)
-    }
-  println(response)
-  println(response.body<String>())
-  if (!response.status.isSuccess()) {
-    error("Request failed. $issueHumanId, ${response.body<String>()}")
-  }
-}
-
-suspend fun addComment(issueHumanId: String, text: String) {
-  val client = httpClient()
-
-  println("Try to add comment to $issueHumanId")
-  val response =
-    // I've updated default url in client, so this may be broken now
-    client.post("https://youtrack.jetbrains.com/api/issues/$issueHumanId/comments?fields=customFields(id,name,value(id,name))") {
-      contentType(ContentType.Application.Json)
-      accept(ContentType.Application.Json)
-      val request = buildJsonObject {
-        put("text", text)
-      }
-      setBody(request)
-    }
-  println(response)
-  println(response.body<String>())
-  if (!response.status.isSuccess()) {
-    error("Request failed. $issueHumanId, ${response.body<String>()}")
-  }
-}

settings.gradle

@@ -12,9 +12,4 @@ rootProject.name = 'IdeaVIM'
 include 'vim-engine'
 include 'scripts'
 include 'annotation-processors'
-include 'tests:java-tests'
+
-include 'tests:property-tests'
-include 'tests:long-running-tests'
-include 'tests:ui-ij-tests'
-include 'tests:ui-py-tests'
-include 'tests:ui-fixtures'

src/main/java/com/maddyhome/idea/vim/EventFacade.java

@@ -11,6 +11,7 @@ package com.maddyhome.idea.vim;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.ShortcutSet;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.actionSystem.TypedAction;
@@ -79,6 +80,14 @@ public class EventFacade {
     action.unregisterCustomShortcutSet(component);
   }
 
+  public void addDocumentListener(@NotNull Document document, @NotNull DocumentListener listener) {
+    document.addDocumentListener(listener);
+  }
+
+  public void removeDocumentListener(@NotNull Document document, @NotNull DocumentListener listener) {
+    document.removeDocumentListener(listener);
+  }
+
   public void addEditorFactoryListener(@NotNull EditorFactoryListener listener, @NotNull Disposable parentDisposable) {
     EditorFactory.getInstance().addEditorFactoryListener(listener, parentDisposable);
   }
@@ -89,12 +98,20 @@ public class EventFacade {
     editor.getCaretModel().addCaretListener(listener, disposable);
   }
 
+  public void removeCaretListener(@NotNull Editor editor, @NotNull CaretListener listener) {
+    editor.getCaretModel().removeCaretListener(listener);
+  }
+
   public void addEditorMouseListener(@NotNull Editor editor,
                                      @NotNull EditorMouseListener listener,
                                      @NotNull Disposable disposable) {
     editor.addEditorMouseListener(listener, disposable);
   }
 
+  public void removeEditorMouseListener(@NotNull Editor editor, @NotNull EditorMouseListener listener) {
+    editor.removeEditorMouseListener(listener);
+  }
+
   public void addComponentMouseListener(@NotNull Component component,
                                         @NotNull MouseListener mouseListener,
                                         @NotNull Disposable disposable) {
@@ -102,18 +119,30 @@ public class EventFacade {
     Disposer.register(disposable, () -> component.removeMouseListener(mouseListener));
   }
 
+  public void removeComponentMouseListener(@NotNull Component component, @NotNull MouseListener mouseListener) {
+    component.removeMouseListener(mouseListener);
+  }
+
   public void addEditorMouseMotionListener(@NotNull Editor editor,
                                            @NotNull EditorMouseMotionListener listener,
                                            @NotNull Disposable disposable) {
     editor.addEditorMouseMotionListener(listener, disposable);
   }
 
+  public void removeEditorMouseMotionListener(@NotNull Editor editor, @NotNull EditorMouseMotionListener listener) {
+    editor.removeEditorMouseMotionListener(listener);
+  }
+
   public void addEditorSelectionListener(@NotNull Editor editor,
                                          @NotNull SelectionListener listener,
                                          @NotNull Disposable disposable) {
     editor.getSelectionModel().addSelectionListener(listener, disposable);
   }
 
+  public void removeEditorSelectionListener(@NotNull Editor editor, @NotNull SelectionListener listener) {
+    editor.getSelectionModel().removeSelectionListener(listener);
+  }
+
   private @NotNull TypedAction getTypedAction() {
     return TypedAction.getInstance();
   }

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

@@ -14,7 +14,7 @@ import com.intellij.openapi.project.ProjectManagerListener
 import com.intellij.openapi.startup.ProjectActivity
 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.helper.localEditors
 import com.maddyhome.idea.vim.newapi.globalIjOptions
 
 /**
@@ -36,10 +36,8 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {
 // This is a temporal workaround for VIM-2487
 internal class PyNotebooksCloseWorkaround : ProjectManagerListener {
   override fun projectClosingBeforeSave(project: Project) {
-    // TODO: Confirm context in CWM scenario
     if (injector.globalIjOptions().closenotebooks) {
-      injector.editorGroup.getEditors().forEach { vimEditor ->
+      localEditors().forEach { editor ->
-        val editor = (vimEditor as IjVimEditor).editor
         val virtualFile = EditorHelper.getVirtualFile(editor)
         if (virtualFile?.extension == "ipynb") {
           val fileEditorManager = FileEditorManagerEx.getInstanceEx(project)

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

@@ -7,27 +7,56 @@
  */
 package com.maddyhome.idea.vim
 
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.extensions.ExtensionPointName
 import com.maddyhome.idea.vim.action.EngineCommandProvider
 import com.maddyhome.idea.vim.action.IntellijCommandProvider
+import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.handler.ActionBeanClass
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase
 import com.maddyhome.idea.vim.key.MappingOwner
+import com.maddyhome.idea.vim.newapi.IjVimActionsInitiator
+import com.maddyhome.idea.vim.newapi.globalIjOptions
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
 public object RegisterActions {
+  @Deprecated("Please use @CommandOrMotion annotation instead")
+  internal val VIM_ACTIONS_EP: ExtensionPointName<ActionBeanClass> = ExtensionPointName.create("IdeaVIM.vimAction")
+
   /**
    * Register all the key/action mappings for the plugin.
    */
   @JvmStatic
   public fun registerActions() {
     registerVimCommandActions()
-    registerShortcutsWithoutActions()
+    if (!injector.globalIjOptions().commandOrMotionAnnotation) {
+      registerEmptyShortcuts()
+      registerEpListener()
+    }
+  }
+
+  @Deprecated("Moving to annotations approach instead of xml")
+  private fun registerEpListener() {
+    // IdeaVim doesn't support contribution to VIM_ACTIONS_EP extension point, so technically we can skip this update,
+    //   but let's support dynamic plugins in a more classic way and reload actions on every EP change.
+    VIM_ACTIONS_EP.addChangeListener({
+      unregisterActions()
+      registerActions()
+    }, VimPlugin.getInstance())
   }
 
   public fun findAction(id: String): EditorActionHandlerBase? {
-    val commandBean = EngineCommandProvider.getCommands().firstOrNull { it.actionId == id }
+    if (injector.globalIjOptions().commandOrMotionAnnotation) {
-      ?: IntellijCommandProvider.getCommands().firstOrNull { it.actionId == id } ?: return null
+      val commandBean = EngineCommandProvider.getCommands().firstOrNull { it.actionId == id }
-    return commandBean.instance
+        ?: IntellijCommandProvider.getCommands().firstOrNull { it.actionId == id } ?: return null
+      return commandBean.instance
+    } else {
+      return VIM_ACTIONS_EP.getExtensionList(ApplicationManager.getApplication()).stream()
+        .filter { vimActionBean: ActionBeanClass -> vimActionBean.actionId == id }
+        .findFirst().map { obj: ActionBeanClass -> obj.instance }
+        .orElse(null)
+    }
   }
 
   public fun findActionOrDie(id: String): EditorActionHandlerBase {
@@ -42,15 +71,30 @@ public object RegisterActions {
 
   private fun registerVimCommandActions() {
     val parser = VimPlugin.getKey()
-    EngineCommandProvider.getCommands().forEach { parser.registerCommandAction(it) }
+    if (injector.globalIjOptions().commandOrMotionAnnotation) {
-    IntellijCommandProvider.getCommands().forEach { parser.registerCommandAction(it) }
+      EngineCommandProvider.getCommands().forEach { parser.registerCommandAction(it) }
+      IntellijCommandProvider.getCommands().forEach { parser.registerCommandAction(it) }
+    } else {
+      VIM_ACTIONS_EP.getExtensionList(ApplicationManager.getApplication()).stream().map { bean: ActionBeanClass? ->
+        IjVimActionsInitiator(
+          bean!!
+        )
+      }
+        .forEach { actionHolder: IjVimActionsInitiator? ->
+          parser.registerCommandAction(
+            actionHolder!!
+          )
+        }
+    }
   }
 
-  private fun registerShortcutsWithoutActions() {
+  // todo do we really need this?
+  private fun registerEmptyShortcuts() {
     val parser = VimPlugin.getKey()
 
     // The {char1} <BS> {char2} shortcut is handled directly by KeyHandler#handleKey, so doesn't have an action. But we
     // still need to register the shortcut, to make sure the editor doesn't swallow it.
-    parser.registerShortcutWithoutAction(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), MappingOwner.IdeaVim.System)
+    parser
+      .registerShortcutWithoutAction(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), MappingOwner.IdeaVim.System)
   }
 }

src/main/java/com/maddyhome/idea/vim/VimPlugin.java

@@ -39,9 +39,11 @@ import com.maddyhome.idea.vim.listener.VimListenerManager;
 import com.maddyhome.idea.vim.newapi.IjVimInjector;
 import com.maddyhome.idea.vim.ui.StatusBarIconFactory;
 import com.maddyhome.idea.vim.ui.ex.ExEntryPanel;
+import com.maddyhome.idea.vim.vimscript.services.OptionService;
 import com.maddyhome.idea.vim.vimscript.services.VariableService;
 import com.maddyhome.idea.vim.yank.YankGroupBase;
 import org.jdom.Element;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -115,6 +117,12 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     return ApplicationManager.getApplication().getService(CommandGroup.class);
   }
 
+  @Deprecated // "Please use `injector.markService` instead"
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.3")
+  public static @NotNull MarkGroup getMark() {
+    return ApplicationManager.getApplication().getService(MarkGroup.class);
+  }
+
   public static @NotNull RegisterGroup getRegister() {
     return ((RegisterGroup)VimInjectorKt.getInjector().getRegisterGroup());
   }
@@ -187,6 +195,13 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     return VimInjectorKt.getInjector().getOptionGroup();
   }
 
+  /** Deprecated: Use getOptionGroup */
+  @Deprecated
+  // Used by which-key 0.8.0, IdeaVimExtension 1.6.5 + 1.6.8
+  public static @NotNull OptionService getOptionService() {
+    return VimInjectorKt.getInjector().getOptionService();
+  }
+
   private static @NotNull NotificationService getNotifications() {
     return getNotifications(null);
   }
@@ -211,22 +226,22 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   public static void setEnabled(final boolean enabled) {
     if (isEnabled() == enabled) return;
 
+    if (!enabled) {
+      getInstance().turnOffPlugin(true);
+    }
+
     getInstance().enabled = enabled;
 
+    if (enabled) {
+      getInstance().turnOnPlugin();
+    }
+
     if (enabled) {
       VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOn();
     } else {
       VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOff();
     }
 
-    if (!enabled) {
-      getInstance().turnOffPlugin(true);
-    }
-
-    if (enabled) {
-      getInstance().turnOnPlugin();
-    }
-
     StatusBarIconFactory.Util.INSTANCE.updateIcon();
   }
 
@@ -353,7 +368,6 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
 
     if (onOffDisposable != null) {
       Disposer.dispose(onOffDisposable);
-      onOffDisposable = null;
     }
   }
 

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

@@ -14,7 +14,7 @@ import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.maddyhome.idea.vim.group.EditorHolderService
 
-@Service(Service.Level.PROJECT)
+@Service
 internal class VimProjectService(val project: Project) : Disposable {
   override fun dispose() {
     // Not sure if this is a best solution

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

@@ -77,7 +77,7 @@ public class VimTypedActionHandler(origHandler: TypedActionHandler) : TypedActio
       val modifiers = if (charTyped == ' ' && VimKeyListener.isSpaceShift) KeyEvent.SHIFT_DOWN_MASK else 0
       val keyStroke = KeyStroke.getKeyStroke(charTyped, modifiers)
       val startTime = if (traceTime) System.currentTimeMillis() else null
-      handler.handleKey(editor.vim, keyStroke, injector.executionContextManager.onEditor(editor.vim, context.vim), handler.keyHandlerState)
+      handler.handleKey(editor.vim, keyStroke, injector.executionContextManager.onEditor(editor.vim, context.vim))
       if (startTime != null) {
         val duration = System.currentTimeMillis() - startTime
         LOG.info("VimTypedAction '$charTyped': $duration ms")

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

@@ -28,7 +28,6 @@ import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.group.IjOptionConstants
 import com.maddyhome.idea.vim.group.IjOptions
-import com.maddyhome.idea.vim.handler.enableOctopus
 import com.maddyhome.idea.vim.handler.isOctopusEnabled
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.HandlerInjector
@@ -44,6 +43,7 @@ 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.vim
+import com.maddyhome.idea.vim.state.mode.mode
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString
 import java.awt.event.InputEvent
 import java.awt.event.KeyEvent
@@ -78,12 +78,10 @@ public class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible
       // Should we use HelperKt.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
       try {
         val start = if (traceTime) System.currentTimeMillis() else null
-        val keyHandler = KeyHandler.getInstance()
+        KeyHandler.getInstance().handleKey(
-        keyHandler.handleKey(
           editor.vim,
           keyStroke,
           injector.executionContextManager.onEditor(editor.vim, e.dataContext.vim),
-          keyHandler.keyHandlerState,
         )
         if (start != null) {
           val duration = System.currentTimeMillis() - start
@@ -118,13 +116,11 @@ public class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible
     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)) {
-        if (isOctopusEnabled(keyStroke, editor)) {
+        return ActionEnableStatus.no(
-          return ActionEnableStatus.no(
+          "Processing VimShortcutKeyAction for the key that is used in the octopus handler",
-            "Processing VimShortcutKeyAction for the key that is used in the octopus handler",
+          LogLevel.ERROR
-            LogLevel.ERROR
+        )
-          )
-        }
       }
       if (editor.isIdeaVimDisabledHere) {
         return ActionEnableStatus.no("IdeaVim is disabled in this place", LogLevel.INFO)

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

@@ -14,7 +14,6 @@ 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.VimEditor
-import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.setChangeMarks
 import com.maddyhome.idea.vim.command.Argument
@@ -22,7 +21,6 @@ import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.common.argumentCaptured
-import com.maddyhome.idea.vim.ex.ExException
 import com.maddyhome.idea.vim.group.MotionGroup
 import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.handler.VimActionHandler
@@ -31,67 +29,21 @@ import com.maddyhome.idea.vim.helper.MessageHelper
 import com.maddyhome.idea.vim.helper.vimStateMachine
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.state.mode.SelectionType
-import com.maddyhome.idea.vim.vimscript.model.CommandLineVimLContext
-import com.maddyhome.idea.vim.vimscript.model.datatypes.VimFuncref
-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, selectionType: SelectionType): Boolean {
-  val func = injector.globalOptions().operatorfunc
+  val operatorFunction = injector.keyGroup.operatorFunction
-  if (func.isEmpty()) {
+  if (operatorFunction == null) {
     VimPlugin.showMessage(MessageHelper.message("E774"))
     return false
   }
 
-  val scriptContext = CommandLineVimLContext
-
-  // The option value is either a function name, which should have a handler, or it might be a lambda expression, or a
-  // `function` or `funcref` call expression, all of which will return a funcref (with a handler)
-  var handler = injector.functionService.getFunctionHandlerOrNull(null, func, scriptContext)
-  if (handler == null) {
-    val expression = injector.vimscriptParser.parseExpression(func)
-    if (expression != null) {
-      try {
-        val value = expression.evaluate(editor, context, scriptContext)
-        if (value is VimFuncref) {
-          handler = value.handler
-        }
-      } catch (ex: ExException) {
-        // Get the argument for function('...') or funcref('...') for the error message
-        val functionName = if (expression is FunctionCallExpression && expression.arguments.size > 0) {
-          expression.arguments[0].evaluate(editor, context, scriptContext).toString()
-        }
-        else {
-          func
-        }
-
-        VimPlugin.showMessage("E117: Unknown function: $functionName")
-        return false
-      }
-    }
-  }
-
-  if (handler == null) {
-    VimPlugin.showMessage("E117: Unknown function: $func")
-    return false
-  }
-
-  val arg = when (selectionType) {
-    SelectionType.LINE_WISE -> "line"
-    SelectionType.CHARACTER_WISE -> "char"
-    SelectionType.BLOCK_WISE -> "block"
-  }
-
   val saveRepeatHandler = VimRepeater.repeatHandler
   injector.markService.setChangeMarks(editor.primaryCaret(), textRange)
   KeyHandler.getInstance().reset(editor)
-
+  val result = operatorFunction.apply(editor, context, selectionType)
-  val arguments = listOf(SimpleExpression(arg))
-  handler.executeFunction(arguments, editor, context, scriptContext)
-
   VimRepeater.repeatHandler = saveRepeatHandler
-  return true
+  return result
 }
 
 @CommandOrMotion(keys = ["g@"], modes = [Mode.NORMAL])

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

@@ -7,9 +7,9 @@
  */
 package com.maddyhome.idea.vim.action.change
 
-import com.intellij.openapi.command.CommandProcessor
 import com.intellij.vim.annotations.CommandOrMotion
 import com.intellij.vim.annotations.Mode
+import com.intellij.openapi.command.CommandProcessor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor

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

@@ -8,9 +8,10 @@
 
 package com.maddyhome.idea.vim.action.editor
 
-import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.vim.annotations.CommandOrMotion
 import com.intellij.vim.annotations.Mode
+import com.intellij.openapi.actionSystem.IdeActions
+import com.maddyhome.idea.vim.action.ComplicatedKeysAction
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
@@ -20,32 +21,54 @@ import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.handler.IdeActionHandler
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
+import java.awt.event.KeyEvent
 import java.util.*
+import javax.swing.KeyStroke
 
 @CommandOrMotion(keys = ["<C-H>", "<BS>"], modes = [Mode.INSERT])
-internal class VimEditorBackSpace : IdeActionHandler(IdeActions.ACTION_EDITOR_BACKSPACE) {
+internal class VimEditorBackSpace : IdeActionHandler(IdeActions.ACTION_EDITOR_BACKSPACE), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0)),
+  )
   override val type: Command.Type = Command.Type.DELETE
 }
 
 @CommandOrMotion(keys = ["<Del>"], modes = [Mode.INSERT])
-internal class VimEditorDelete : IdeActionHandler(IdeActions.ACTION_EDITOR_DELETE) {
+internal class VimEditorDelete : IdeActionHandler(IdeActions.ACTION_EDITOR_DELETE), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)),
+  )
   override val type: Command.Type = Command.Type.DELETE
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_STROKE)
 }
 
 @CommandOrMotion(keys = ["<Down>", "<kDown>"], modes = [Mode.INSERT])
-internal class VimEditorDown : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN) {
+internal class VimEditorDown : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_KP_DOWN, 0)),
+  )
   override val type: Command.Type = Command.Type.MOTION
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_CLEAR_STROKES)
 }
 
 @CommandOrMotion(keys = ["<Tab>", "<C-I>"], modes = [Mode.INSERT])
-internal class VimEditorTab : IdeActionHandler(IdeActions.ACTION_EDITOR_TAB) {
+internal class VimEditorTab : IdeActionHandler(IdeActions.ACTION_EDITOR_TAB), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_I, KeyEvent.CTRL_DOWN_MASK)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0)),
+  )
   override val type: Command.Type = Command.Type.INSERT
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_STROKE)
 }
 
 @CommandOrMotion(keys = ["<Up>", "<kUp>"], modes = [Mode.INSERT])
-internal class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_UP) {
+internal class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_UP), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_KP_UP, 0)),
+  )
   override val type: Command.Type = Command.Type.MOTION
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_CLEAR_STROKES)
 }

src/main/java/com/maddyhome/idea/vim/action/ex/ProcessExEntryAction.kt

@@ -10,6 +10,7 @@ package com.maddyhome.idea.vim.action.ex
 import com.intellij.vim.annotations.CommandOrMotion
 import com.intellij.vim.annotations.Mode
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.action.ComplicatedKeysAction
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.command.Command
@@ -17,6 +18,7 @@ import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import java.util.*
+import javax.swing.KeyStroke
 
 /**
  * Called by KeyHandler to process the contents of the ex entry panel
@@ -24,7 +26,10 @@ import java.util.*
  * The mapping for this action means that the ex command is executed as a write action
  */
 @CommandOrMotion(keys = ["<CR>", "<C-M>", "<C-J>"], modes = [Mode.CMD_LINE])
-public class ProcessExEntryAction : VimActionHandler.SingleExecution() {
+public class ProcessExEntryAction : VimActionHandler.SingleExecution(), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> =
+    parseKeysSet("<CR>", "<C-M>", 0x0a.toChar().toString(), 0x0d.toChar().toString())
+
   override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
 
   override val flags: EnumSet<CommandFlags> = EnumSet.of(CommandFlags.FLAG_COMPLETE_EX)

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

@@ -21,19 +21,19 @@ import com.maddyhome.idea.vim.state.mode.SelectionType
 public class CommandState(private val machine: VimStateMachine) {
 
   public val isOperatorPending: Boolean
-    get() = machine.isOperatorPending(machine.mode)
+    get() = machine.isOperatorPending
 
-  public val mode: Mode
+  public val mode: CommandState.Mode
     get() {
       val myMode = machine.mode
       return when (myMode) {
-        is com.maddyhome.idea.vim.state.mode.Mode.CMD_LINE -> Mode.CMD_LINE
+        is com.maddyhome.idea.vim.state.mode.Mode.CMD_LINE -> CommandState.Mode.CMD_LINE
-        com.maddyhome.idea.vim.state.mode.Mode.INSERT -> Mode.INSERT
+        com.maddyhome.idea.vim.state.mode.Mode.INSERT -> CommandState.Mode.INSERT
-        is com.maddyhome.idea.vim.state.mode.Mode.NORMAL -> Mode.COMMAND
+        is com.maddyhome.idea.vim.state.mode.Mode.NORMAL -> CommandState.Mode.COMMAND
-        is com.maddyhome.idea.vim.state.mode.Mode.OP_PENDING -> Mode.OP_PENDING
+        is com.maddyhome.idea.vim.state.mode.Mode.OP_PENDING -> CommandState.Mode.OP_PENDING
-        com.maddyhome.idea.vim.state.mode.Mode.REPLACE -> Mode.REPLACE
+        com.maddyhome.idea.vim.state.mode.Mode.REPLACE -> CommandState.Mode.REPLACE
-        is com.maddyhome.idea.vim.state.mode.Mode.SELECT -> Mode.SELECT
+        is com.maddyhome.idea.vim.state.mode.Mode.SELECT -> CommandState.Mode.SELECT
-        is com.maddyhome.idea.vim.state.mode.Mode.VISUAL -> Mode.VISUAL
+        is com.maddyhome.idea.vim.state.mode.Mode.VISUAL -> CommandState.Mode.VISUAL
       }
     }
 

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

@@ -14,34 +14,21 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.action.change.Extension
-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.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.MappingMode
 import com.maddyhome.idea.vim.common.CommandAlias
 import com.maddyhome.idea.vim.common.CommandAliasHandler
-import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.helper.CommandLineHelper
 import com.maddyhome.idea.vim.helper.TestInputModel
-import com.maddyhome.idea.vim.helper.noneOfEnum
 import com.maddyhome.idea.vim.helper.vimStateMachine
 import com.maddyhome.idea.vim.key.MappingOwner
 import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.ui.ModalEntry
-import com.maddyhome.idea.vim.vimscript.model.Executable
-import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
-import com.maddyhome.idea.vim.vimscript.model.VimLContext
-import com.maddyhome.idea.vim.vimscript.model.datatypes.VimDataType
-import com.maddyhome.idea.vim.vimscript.model.expressions.Expression
-import com.maddyhome.idea.vim.vimscript.model.expressions.Scope
-import com.maddyhome.idea.vim.vimscript.model.statements.FunctionDeclaration
-import com.maddyhome.idea.vim.vimscript.model.statements.FunctionFlag
 import java.awt.event.KeyEvent
-import java.util.*
 import javax.swing.KeyStroke
 
 /**
@@ -133,6 +120,12 @@ public object VimExtensionFacade {
       .setAlias(name, CommandAlias.Call(minimumNumberOfArguments, maximumNumberOfArguments, name, handler))
   }
 
+  /** Sets the value of 'operatorfunc' to be used as the operator function in 'g@'. */
+  @JvmStatic
+  public fun setOperatorFunction(function: OperatorFunction) {
+    VimPlugin.getKey().operatorFunction = function
+  }
+
   /**
    * Runs normal mode commands similar to ':normal! {commands}'.
    * Mappings doesn't work with this function
@@ -143,8 +136,7 @@ public object VimExtensionFacade {
   @JvmStatic
   public fun executeNormalWithoutMapping(keys: List<KeyStroke>, editor: Editor) {
     val context = injector.executionContextManager.onEditor(editor.vim)
-    val keyHandler = KeyHandler.getInstance()
+    keys.forEach { KeyHandler.getInstance().handleKey(editor.vim, it, context, false, false) }
-    keys.forEach { keyHandler.handleKey(editor.vim, it, context, false, false, keyHandler.keyHandlerState) }
   }
 
   /** Returns a single key stroke from the user input similar to 'getchar()'. */
@@ -160,7 +152,7 @@ public object VimExtensionFacade {
       LOG.trace("Unit test mode is active")
       val mappingStack = KeyHandler.getInstance().keyStack
       mappingStack.feedSomeStroke() ?: TestInputModel.getInstance(editor).nextKeyStroke()?.also {
-        if (injector.registerGroup.isRecording) {
+        if (editor.vim.vimStateMachine.isRecording) {
           KeyHandler.getInstance().modalEntryKeys += it
         }
       }
@@ -215,65 +207,4 @@ public object VimExtensionFacade {
   public fun setRegister(register: Char, keys: List<KeyStroke?>?, type: SelectionType) {
     VimPlugin.getRegister().setKeys(register, keys?.filterNotNull() ?: emptyList(), type)
   }
-
-  @JvmStatic
-  public fun exportScriptFunction(
-    scope: Scope?,
-    name: String,
-    args: List<String>,
-    defaultArgs: List<Pair<String, Expression>>,
-    hasOptionalArguments: Boolean,
-    flags: EnumSet<FunctionFlag>,
-    function: ScriptFunction
-  ) {
-    var functionDeclaration: FunctionDeclaration? = null
-    val body = listOf(object : Executable {
-      // This context is set to the function declaration during initialisation and then set to the function execution
-      // context during execution
-      override lateinit var vimContext: VimLContext
-      override var rangeInScript: TextRange = TextRange(0, 0)
-
-      override fun execute(editor: VimEditor, context: ExecutionContext): ExecutionResult {
-        return function.execute(editor, context, functionDeclaration!!.functionVariables)
-      }
-    })
-    functionDeclaration = FunctionDeclaration(
-      scope,
-      name,
-      args,
-      defaultArgs,
-      body,
-      replaceExisting = true,
-      flags,
-      hasOptionalArguments
-    )
-    functionDeclaration.rangeInScript = TextRange(0, 0)
-    body.forEach { it.vimContext = functionDeclaration }
-    injector.functionService.storeFunction(functionDeclaration)
-  }
 }
-
-public fun VimExtensionFacade.exportOperatorFunction(name: String, function: OperatorFunction) {
-  exportScriptFunction(null, name, listOf("type"), emptyList(), false, noneOfEnum()) {
-    editor, context, args ->
-
-    val type = args["type"]?.asString()
-    val selectionType = when (type) {
-      "line" -> SelectionType.LINE_WISE
-      "block" -> SelectionType.BLOCK_WISE
-      "char" -> SelectionType.CHARACTER_WISE
-      else -> return@exportScriptFunction ExecutionResult.Error
-    }
-
-    if (function.apply(editor, context, selectionType)) {
-      ExecutionResult.Success
-    }
-    else {
-      ExecutionResult.Error
-    }
-  }
-}
-
-public fun interface ScriptFunction {
-  public fun execute(editor: VimEditor, context: ExecutionContext, args: Map<String, VimDataType>): ExecutionResult
-}

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

@@ -53,11 +53,6 @@ internal object VimExtensionRegistrar : VimExtensionRegistrator {
   @Synchronized
   private fun registerExtension(extensionBean: ExtensionBeanClass) {
     val name = extensionBean.name ?: extensionBean.instance.name
-    if (name == "sneak" && extensionBean.name == null) {
-      // Filter out the old ideavim-sneak extension that used to be a separate plugin
-      // https://github.com/Mishkun/ideavim-sneak
-      return
-    }
     if (name in registeredExtensions) return
 
     registeredExtensions.add(name)
@@ -67,7 +62,7 @@ internal object VimExtensionRegistrar : VimExtensionRegistrator {
     VimPlugin.getOptionGroup().addGlobalOptionChangeListener(option) {
       if (injector.optionGroup.getOptionValue(option, OptionAccessScope.GLOBAL(null)).asBoolean()) {
         initExtension(extensionBean, name)
-        PluginState.Util.enabledExtensions.add(name)
+        PluginState.enabledExtensions.add(name)
       } else {
         extensionBean.instance.dispose()
       }

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

@@ -251,7 +251,7 @@ public class VimArgTextObjExtension implements VimExtension {
 
       final ArgumentTextObjectHandler textObjectHandler = new ArgumentTextObjectHandler(isInner);
       //noinspection DuplicatedCode
-      if (!vimStateMachine.isOperatorPending(editor.getMode())) {
+      if (!vimStateMachine.isOperatorPending()) {
         editor.nativeCarets().forEach((VimCaret caret) -> {
           final TextRange range = textObjectHandler.getRange(editor, caret, context, count, 0);
           if (range != null) {

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

@@ -22,26 +22,26 @@ 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.getLineEndOffset
-import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.MappingMode
+import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.command.TextObjectVisualType
 import com.maddyhome.idea.vim.common.CommandAliasHandler
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.ex.ranges.Ranges
 import com.maddyhome.idea.vim.extension.ExtensionHandler
 import com.maddyhome.idea.vim.extension.VimExtension
-import com.maddyhome.idea.vim.extension.VimExtensionFacade
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.addCommand
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.executeNormalWithoutMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putExtensionHandlerMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissing
-import com.maddyhome.idea.vim.extension.exportOperatorFunction
+import com.maddyhome.idea.vim.extension.VimExtensionFacade.setOperatorFunction
 import com.maddyhome.idea.vim.handler.TextObjectActionHandler
 import com.maddyhome.idea.vim.helper.PsiHelper
 import com.maddyhome.idea.vim.helper.vimStateMachine
@@ -49,19 +49,17 @@ import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.Mode
-import com.maddyhome.idea.vim.state.mode.SelectionType
 import java.util.*
 
 internal class CommentaryExtension : VimExtension {
 
-  object Util {
+  companion object {
     fun doCommentary(
       editor: VimEditor,
       context: ExecutionContext,
       range: TextRange,
       selectionType: SelectionType,
-      resetCaret: Boolean = true,
+      resetCaret: Boolean,
     ): Boolean {
       val mode = editor.vimStateMachine.mode
       if (mode !is Mode.VISUAL) {
@@ -69,7 +67,8 @@ internal class CommentaryExtension : VimExtension {
       }
 
       return runWriteAction {
-        // Treat block- and character-wise selections as block comments. Fall back if the first action isn't available
+        // Treat block- and character-wise selections as block comments. Be ready to fall back to if the first action
+        // isn't available
         val actions = if (selectionType === SelectionType.LINE_WISE) {
           listOf(IdeActions.ACTION_COMMENT_LINE, IdeActions.ACTION_COMMENT_BLOCK)
         } else {
@@ -114,17 +113,12 @@ internal class CommentaryExtension : VimExtension {
       // first non-whitespace character, then the caret is in the right place. If it's inserted at the first column,
       // then the caret is now in a bit of a weird place. We can't detect this scenario, so we just have to accept
       // the difference
-      // TODO: If we don't move the caret to the start offset, we should maintain the current logical position
       if (resetCaret) {
         editor.primaryCaret().moveToOffset(range.startOffset)
       }
     }
   }
 
-  companion object {
-    private const val OPERATOR_FUNC = "CommentaryOperatorFunc"
-  }
-
   override fun getName() = "commentary"
 
   override fun init() {
@@ -151,16 +145,6 @@ internal class CommentaryExtension : VimExtension {
     putKeyMapping(MappingMode.N, injector.parser.parseKeys("<Plug>(CommentLine)"), owner, plugCommentaryLineKeys, true)
 
     addCommand("Commentary", CommentaryCommandAliasHandler())
-
-    VimExtensionFacade.exportOperatorFunction(OPERATOR_FUNC, CommentaryOperatorFunction())
- }
-
-  private class CommentaryOperatorFunction : OperatorFunction {
-    // todo make it multicaret
-    override fun apply(editor: VimEditor, context: ExecutionContext, selectionType: SelectionType?): Boolean {
-      val range = injector.markService.getChangeMarks(editor.primaryCaret()) ?: return false
-      return Util.doCommentary(editor, context, range, selectionType ?: SelectionType.CHARACTER_WISE, true)
-    }
   }
 
   /**
@@ -169,13 +153,19 @@ internal class CommentaryExtension : VimExtension {
    * E.g. handles the `gc` in `gc_`, by setting the operator function, then invoking `g@` to receive the `_` motion to
    * invoke the operator. This object is both the mapping handler and the operator function.
    */
-  private class CommentaryOperatorHandler : ExtensionHandler {
+  private class CommentaryOperatorHandler : OperatorFunction, ExtensionHandler {
     override val isRepeatable = true
 
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      injector.globalOptions().operatorfunc = OPERATOR_FUNC
+      setOperatorFunction(this)
       executeNormalWithoutMapping(injector.parser.parseKeys("g@"), editor.ij)
     }
+
+    // todo make it multicaret
+    override fun apply(editor: VimEditor, context: ExecutionContext, selectionType: SelectionType?): Boolean {
+      val range = injector.markService.getChangeMarks(editor.primaryCaret()) ?: return false
+      return doCommentary(editor, context, range, selectionType ?: SelectionType.CHARACTER_WISE, true)
+    }
   }
 
   private class CommentaryMappingHandler : ExtensionHandler {
@@ -249,7 +239,7 @@ internal class CommentaryExtension : VimExtension {
    */
   private class CommentaryCommandAliasHandler : CommandAliasHandler {
     override fun execute(command: String, ranges: Ranges, editor: VimEditor, context: ExecutionContext) {
-      Util.doCommentary(editor, context, ranges.getTextRange(editor, -1), SelectionType.LINE_WISE, false)
+      doCommentary(editor, context, ranges.getTextRange(editor, -1), SelectionType.LINE_WISE, false)
     }
   }
 }

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

@@ -19,22 +19,24 @@ import com.intellij.openapi.util.Key
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.getOffset
-import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.setChangeMarks
 import com.maddyhome.idea.vim.command.MappingMode
 import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.state.mode.SelectionType
+import com.maddyhome.idea.vim.state.mode.SelectionType.CHARACTER_WISE
+import com.maddyhome.idea.vim.state.mode.selectionType
 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
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.executeNormalWithoutMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.getRegister
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putExtensionHandlerMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissing
+import com.maddyhome.idea.vim.extension.VimExtensionFacade.setOperatorFunction
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.setRegister
-import com.maddyhome.idea.vim.extension.exportOperatorFunction
 import com.maddyhome.idea.vim.helper.fileSize
+import com.maddyhome.idea.vim.state.mode.mode
 import com.maddyhome.idea.vim.helper.moveToInlayAwareLogicalPosition
 import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
 import com.maddyhome.idea.vim.key.OperatorFunction
@@ -43,8 +45,6 @@ import com.maddyhome.idea.vim.mark.VimMarkConstants
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.SelectionType
-import com.maddyhome.idea.vim.state.mode.selectionType
 import org.jetbrains.annotations.NonNls
 
 /**
@@ -72,13 +72,30 @@ internal class VimExchangeExtension : VimExtension {
     putKeyMappingIfMissing(MappingMode.X, injector.parser.parseKeys("X"), owner, injector.parser.parseKeys(EXCHANGE_CMD), true)
     putKeyMappingIfMissing(MappingMode.N, injector.parser.parseKeys("cxc"), owner, injector.parser.parseKeys(EXCHANGE_CLEAR_CMD), true)
     putKeyMappingIfMissing(MappingMode.N, injector.parser.parseKeys("cxx"), owner, injector.parser.parseKeys(EXCHANGE_LINE_CMD), true)
-
-    VimExtensionFacade.exportOperatorFunction(OPERATOR_FUNC, Operator())
   }
 
-  object Util {
+  companion object {
+    @NonNls
+    const val EXCHANGE_CMD = "<Plug>(Exchange)"
+
+    @NonNls
+    const val EXCHANGE_CLEAR_CMD = "<Plug>(ExchangeClear)"
+
+    @NonNls
+    const val EXCHANGE_LINE_CMD = "<Plug>(ExchangeLine)"
+
     val EXCHANGE_KEY = Key<Exchange>("exchange")
 
+    // End mark has always greater of eq offset than start mark
+    class Exchange(val type: SelectionType, val start: Mark, val end: Mark, val text: String) {
+      private var myHighlighter: RangeHighlighter? = null
+      fun setHighlighter(highlighter: RangeHighlighter) {
+        myHighlighter = highlighter
+      }
+
+      fun getHighlighter(): RangeHighlighter? = myHighlighter
+    }
+
     fun clearExchange(editor: Editor) {
       editor.getUserData(EXCHANGE_KEY)?.getHighlighter()?.let {
         editor.markupModel.removeHighlighter(it)
@@ -87,25 +104,18 @@ internal class VimExchangeExtension : VimExtension {
     }
   }
 
-  companion object {
-    @NonNls private const val EXCHANGE_CMD = "<Plug>(Exchange)"
-    @NonNls private const val EXCHANGE_CLEAR_CMD = "<Plug>(ExchangeClear)"
-    @NonNls private const val EXCHANGE_LINE_CMD = "<Plug>(ExchangeLine)"
-    @NonNls private const val OPERATOR_FUNC = "ExchangeOperatorFunc"
-  }
-
   private class ExchangeHandler(private val isLine: Boolean) : ExtensionHandler {
     override val isRepeatable = true
 
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      injector.globalOptions().operatorfunc = OPERATOR_FUNC
+      setOperatorFunction(Operator(false))
       executeNormalWithoutMapping(injector.parser.parseKeys(if (isLine) "g@_" else "g@"), editor.ij)
     }
   }
 
   private class ExchangeClearHandler : ExtensionHandler {
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      Util.clearExchange(editor.ij)
+      clearExchange(editor.ij)
     }
   }
 
@@ -115,12 +125,12 @@ internal class VimExchangeExtension : VimExtension {
         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)
+        Operator(true).apply(editor, context, mode.selectionType ?: CHARACTER_WISE)
       }
     }
   }
 
-  private class Operator(private val isVisual: Boolean = false) : OperatorFunction {
+  private class Operator(private val isVisual: Boolean) : OperatorFunction {
     fun Editor.getMarkOffset(mark: Mark) = IjVimEditor(this).getOffset(mark.line, mark.col)
     fun SelectionType.getString() = when (this) {
       SelectionType.CHARACTER_WISE -> "v"
@@ -138,7 +148,7 @@ internal class VimExchangeExtension : VimExtension {
           else -> HighlighterTargetArea.EXACT_RANGE
         }
         val isVisualLine = ex.type == SelectionType.LINE_WISE
-        val endAdj = if (!(isVisualLine) && (hlArea == HighlighterTargetArea.EXACT_RANGE || isVisual)) 1 else 0
+        val endAdj = if (!(isVisualLine) && (hlArea == HighlighterTargetArea.EXACT_RANGE || (isVisual))) 1 else 0
         return ijEditor.markupModel.addRangeHighlighter(
           ijEditor.getMarkOffset(ex.start),
           (ijEditor.getMarkOffset(ex.end) + endAdj).coerceAtMost(ijEditor.fileSize),
@@ -148,12 +158,12 @@ internal class VimExchangeExtension : VimExtension {
         )
       }
 
-      val currentExchange = getExchange(ijEditor, isVisual, selectionType ?: SelectionType.CHARACTER_WISE)
+      val currentExchange = getExchange(ijEditor, isVisual, selectionType ?: CHARACTER_WISE)
-      val exchange1 = ijEditor.getUserData(Util.EXCHANGE_KEY)
+      val exchange1 = ijEditor.getUserData(EXCHANGE_KEY)
       if (exchange1 == null) {
         val highlighter = highlightExchange(currentExchange)
         currentExchange.setHighlighter(highlighter)
-        ijEditor.putUserData(Util.EXCHANGE_KEY, currentExchange)
+        ijEditor.putUserData(EXCHANGE_KEY, currentExchange)
         return true
       } else {
         val cmp = compareExchanges(exchange1, currentExchange)
@@ -179,7 +189,7 @@ internal class VimExchangeExtension : VimExtension {
           }
         }
         exchange(ijEditor, ex1, ex2, reverse, expand)
-        Util.clearExchange(ijEditor)
+        clearExchange(ijEditor)
         return true
       }
     }
@@ -344,14 +354,4 @@ internal class VimExchangeExtension : VimExtension {
       }
     }
   }
-
-  // End mark has always greater of eq offset than start mark
-  class Exchange(val type: SelectionType, val start: Mark, val end: Mark, val text: String) {
-    private var myHighlighter: RangeHighlighter? = null
-    fun setHighlighter(highlighter: RangeHighlighter) {
-      myHighlighter = highlighter
-    }
-
-    fun getHighlighter(): RangeHighlighter? = myHighlighter
-  }
 }

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

@@ -99,7 +99,7 @@ internal class Matchit : VimExtension {
 
       // Normally we want to jump to the start of the matching pair. But when moving forward in operator
       // pending mode, we want to include the entire match. isInOpPending makes that distinction.
-      val isInOpPending = commandState.isOperatorPending(editor.mode)
+      val isInOpPending = commandState.isOperatorPending
 
       if (isInOpPending) {
         val matchitAction = MatchitAction()

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

@@ -246,7 +246,7 @@ internal class VimMultipleCursorsExtension : VimExtension {
 
       // Note that ignoreCase is not overridden by the `\C` in the pattern
       val pattern = makePattern(text, whole)
-      val matches = injector.searchHelper.findAll(IjVimEditor(editor), pattern, 0, -1, false)
+      val matches = SearchHelper.findAll(editor, pattern, 0, -1, false)
       for (match in matches) {
         if (match.contains(primaryCaret.offset)) {
           primaryCaret.vim.moveToOffset(match.startOffset)
@@ -322,7 +322,7 @@ internal class VimMultipleCursorsExtension : VimExtension {
       searchOptions.add(SearchOptions.WRAP)
     }
 
-    return injector.searchHelper.findPattern(IjVimEditor(editor), makePattern(text, whole), startOffset, 1, searchOptions)?.startOffset ?: -1
+    return SearchHelper.findPattern(editor, makePattern(text, whole), startOffset, 1, searchOptions)?.startOffset ?: -1
   }
 
   private fun makePattern(text: String, whole: Boolean): String {

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

@@ -130,15 +130,15 @@ internal class NerdTree : VimExtension {
     addCommand("NERDTreeFind", IjCommandHandler("SelectInProjectView"))
     addCommand("NERDTreeRefreshRoot", IjCommandHandler("Synchronize"))
 
-    synchronized(Util.monitor) {
+    synchronized(monitor) {
-      Util.commandsRegistered = true
+      commandsRegistered = true
       ProjectManager.getInstance().openProjects.forEach { project -> installDispatcher(project) }
     }
   }
 
   class IjCommandHandler(private val actionId: String) : CommandAliasHandler {
     override fun execute(command: String, ranges: Ranges, editor: VimEditor, context: ExecutionContext) {
-      Util.callAction(editor, actionId, context)
+      callAction(editor, actionId, context)
     }
   }
 
@@ -149,7 +149,7 @@ internal class NerdTree : VimExtension {
       if (toolWindow.isVisible) {
         toolWindow.hide()
       } else {
-        Util.callAction(editor, "ActivateProjectToolWindow", context)
+        callAction(editor, "ActivateProjectToolWindow", context)
       }
     }
   }
@@ -187,8 +187,8 @@ internal class NerdTree : VimExtension {
   // TODO I'm not sure is this activity runs at all? Should we use [RunOnceUtil] instead?
   class NerdStartupActivity : ProjectActivity {
     override suspend fun execute(project: Project) {
-      synchronized(Util.monitor) {
+      synchronized(monitor) {
-        if (!Util.commandsRegistered) return
+        if (!commandsRegistered) return
         installDispatcher(project)
       }
     }
@@ -214,7 +214,7 @@ internal class NerdTree : VimExtension {
 
           val action = nextNode.actionHolder
           when (action) {
-            is NerdAction.ToIj -> Util.callAction(null, action.name, e.dataContext.vim)
+            is NerdAction.ToIj -> callAction(null, action.name, e.dataContext.vim)
             is NerdAction.Code -> e.project?.let { action.action(it, e.dataContext, e) }
           }
         }
@@ -356,7 +356,7 @@ internal class NerdTree : VimExtension {
         currentWindow?.split(SwingConstants.VERTICAL, true, file, true)
 
         // FIXME: 22.01.2021 This solution bouncing a bit
-        Util.callAction(null, "ActivateProjectToolWindow", context.vim)
+        callAction(null, "ActivateProjectToolWindow", context.vim)
       },
     )
     registerCommand(
@@ -368,7 +368,7 @@ internal class NerdTree : VimExtension {
         val currentWindow = splitters.currentWindow
         currentWindow?.split(SwingConstants.HORIZONTAL, true, file, true)
 
-        Util.callAction(null, "ActivateProjectToolWindow", context.vim)
+        callAction(null, "ActivateProjectToolWindow", context.vim)
       },
     )
     registerCommand(
@@ -502,18 +502,16 @@ internal class NerdTree : VimExtension {
         }
       },
     )
-    
-    for (c in ('a'..'z') + ('A'..'Z')) {
-      val ks = KeyStroke.getKeyStroke(c)
-      if (ks !in actionsRoot) {
-        registerCommand(c.toString(), NerdAction.Code { _, _, _ -> })
-      }
-    }
   }
 
-  object Util {
+  companion object {
+    const val pluginName = "NERDTree"
+
     internal val monitor = Any()
     internal var commandsRegistered = false
+
+    private val LOG = logger<NerdTree>()
+
     fun callAction(editor: VimEditor?, name: String, context: ExecutionContext) {
       val action = ActionManager.getInstance().getAction(name) ?: run {
         VimPlugin.showMessage(MessageHelper.message("action.not.found.0", name))
@@ -528,51 +526,45 @@ internal class NerdTree : VimExtension {
         }
       }
     }
-  }
 
-  companion object {
+    private fun addCommand(alias: String, handler: CommandAliasHandler) {
-    const val pluginName = "NERDTree"
+      VimPlugin.getCommand().setAlias(alias, CommandAlias.Call(0, -1, alias, handler))
-    private val LOG = logger<NerdTree>()
+    }
+
+    private fun registerCommand(variable: String, default: String, action: NerdAction) {
+      val variableValue = VimPlugin.getVariableService().getGlobalVariableValue(variable)
+      val mappings = if (variableValue is VimString) {
+        variableValue.value
+      } else {
+        default
+      }
+      actionsRoot.addLeafs(mappings, action)
+    }
+
+    private fun registerCommand(default: String, action: NerdAction) {
+      actionsRoot.addLeafs(default, action)
+    }
+
+    private val actionsRoot: RootNode<NerdAction> = RootNode()
+    private var currentNode: CommandPartNode<NerdAction> = actionsRoot
+
+    private fun collectShortcuts(node: Node<NerdAction>): Set<KeyStroke> {
+      return if (node is CommandPartNode<NerdAction>) {
+        val res = node.keys.toMutableSet()
+        res += node.values.map { collectShortcuts(it) }.flatten()
+        res
+      } else {
+        emptySet()
+      }
+    }
+
+    private fun installDispatcher(project: Project) {
+      val dispatcher = NerdDispatcher.getInstance(project)
+      val shortcuts = collectShortcuts(actionsRoot).map { RequiredShortcut(it, MappingOwner.Plugin.get(pluginName)) }
+      dispatcher.registerCustomShortcutSet(
+        KeyGroup.toShortcutSet(shortcuts),
+        (ProjectView.getInstance(project) as ProjectViewImpl).component,
+      )
+    }
   }
 }
-
-private fun addCommand(alias: String, handler: CommandAliasHandler) {
-  VimPlugin.getCommand().setAlias(alias, CommandAlias.Call(0, -1, alias, handler))
-}
-
-private fun registerCommand(variable: String, default: String, action: NerdAction) {
-  val variableValue = VimPlugin.getVariableService().getGlobalVariableValue(variable)
-  val mappings = if (variableValue is VimString) {
-    variableValue.value
-  } else {
-    default
-  }
-  actionsRoot.addLeafs(mappings, action)
-}
-
-private fun registerCommand(default: String, action: NerdAction) {
-  actionsRoot.addLeafs(default, action)
-}
-
-
-private val actionsRoot: RootNode<NerdAction> = RootNode()
-private var currentNode: CommandPartNode<NerdAction> = actionsRoot
-private fun collectShortcuts(node: Node<NerdAction>): Set<KeyStroke> {
-  return if (node is CommandPartNode<NerdAction>) {
-    val res = node.keys.toMutableSet()
-    res += node.values.map { collectShortcuts(it) }.flatten()
-    res
-  } else {
-    emptySet()
-  }
-}
-
-private fun installDispatcher(project: Project) {
-  val dispatcher = NerdTree.NerdDispatcher.getInstance(project)
-  val shortcuts =
-    collectShortcuts(actionsRoot).map { RequiredShortcut(it, MappingOwner.Plugin.get(NerdTree.pluginName)) }
-  dispatcher.registerCustomShortcutSet(
-    KeyGroup.toShortcutSet(shortcuts),
-    (ProjectView.getInstance(project) as ProjectViewImpl).component,
-  )
-}

src/main/java/com/maddyhome/idea/vim/extension/paragraphmotion/ParagraphMotion.kt

@@ -9,7 +9,6 @@
 package com.maddyhome.idea.vim.extension.paragraphmotion
 
 import com.intellij.openapi.editor.Caret
-import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
@@ -21,10 +20,8 @@ import com.maddyhome.idea.vim.extension.VimExtension
 import com.maddyhome.idea.vim.extension.VimExtensionFacade
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissing
 import com.maddyhome.idea.vim.helper.vimForEachCaret
-import com.maddyhome.idea.vim.key.MappingOwner
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
-import javax.swing.KeyStroke
 
 internal class ParagraphMotion : VimExtension {
   override fun getName(): String = "vim-paragraph-motion"
@@ -33,8 +30,8 @@ internal class ParagraphMotion : VimExtension {
     VimExtensionFacade.putExtensionHandlerMapping(MappingMode.NXO, injector.parser.parseKeys("<Plug>(ParagraphNextMotion)"), owner, ParagraphMotionHandler(1), false)
     VimExtensionFacade.putExtensionHandlerMapping(MappingMode.NXO, injector.parser.parseKeys("<Plug>(ParagraphPrevMotion)"), owner, ParagraphMotionHandler(-1), false)
 
-    putKeyMappingIfMissingFromAndToKeys(MappingMode.NXO, injector.parser.parseKeys("}"), owner, injector.parser.parseKeys("<Plug>(ParagraphNextMotion)"), true)
+    putKeyMappingIfMissing(MappingMode.NXO, injector.parser.parseKeys("}"), owner, injector.parser.parseKeys("<Plug>(ParagraphNextMotion)"), true)
-    putKeyMappingIfMissingFromAndToKeys(MappingMode.NXO, injector.parser.parseKeys("{"), owner, injector.parser.parseKeys("<Plug>(ParagraphPrevMotion)"), true)
+    putKeyMappingIfMissing(MappingMode.NXO, injector.parser.parseKeys("{"), owner, injector.parser.parseKeys("<Plug>(ParagraphPrevMotion)"), true)
   }
 
   private class ParagraphMotionHandler(private val count: Int) : ExtensionHandler {
@@ -52,17 +49,4 @@ internal class ParagraphMotion : VimExtension {
         ?.let { editor.normalizeOffset(it, true) }
     }
   }
-
-  // For VIM-3306
-  @Suppress("SameParameterValue")
-  private fun putKeyMappingIfMissingFromAndToKeys(
-    modes: Set<MappingMode>,
-    fromKeys: List<KeyStroke>,
-    pluginOwner: MappingOwner,
-    toKeys: List<KeyStroke>,
-    recursive: Boolean,
-  ) {
-    val filteredModes = modes.filterNotTo(HashSet()) { VimPlugin.getKey().hasmapfrom(it, fromKeys) }
-    putKeyMappingIfMissing(filteredModes, fromKeys, pluginOwner, toKeys, recursive)
-  }
 }

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

@@ -14,19 +14,24 @@ 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.getLineEndOffset
-import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.MappingMode
+import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.state.mode.SelectionType
+import com.maddyhome.idea.vim.state.mode.SelectionType.CHARACTER_WISE
+import com.maddyhome.idea.vim.state.mode.isLine
+import com.maddyhome.idea.vim.state.mode.selectionType
 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
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.executeNormalWithoutMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissing
-import com.maddyhome.idea.vim.extension.exportOperatorFunction
+import com.maddyhome.idea.vim.extension.VimExtensionFacade.setOperatorFunction
 import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.helper.exitVisualMode
+import com.maddyhome.idea.vim.state.mode.mode
 import com.maddyhome.idea.vim.helper.vimStateMachine
 import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.IjVimEditor
@@ -34,10 +39,6 @@ import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.options.helpers.ClipboardOptionHelper
 import com.maddyhome.idea.vim.put.PutData
-import com.maddyhome.idea.vim.state.mode.Mode
-import com.maddyhome.idea.vim.state.mode.SelectionType
-import com.maddyhome.idea.vim.state.mode.isLine
-import com.maddyhome.idea.vim.state.mode.selectionType
 import org.jetbrains.annotations.NonNls
 
 internal class ReplaceWithRegister : VimExtension {
@@ -52,13 +53,11 @@ internal class ReplaceWithRegister : VimExtension {
     putKeyMappingIfMissing(MappingMode.N, injector.parser.parseKeys("gr"), owner, injector.parser.parseKeys(RWR_OPERATOR), true)
     putKeyMappingIfMissing(MappingMode.N, injector.parser.parseKeys("grr"), owner, injector.parser.parseKeys(RWR_LINE), true)
     putKeyMappingIfMissing(MappingMode.X, injector.parser.parseKeys("gr"), owner, injector.parser.parseKeys(RWR_VISUAL), true)
-
-    VimExtensionFacade.exportOperatorFunction(OPERATOR_FUNC, Operator())
   }
 
   private class RwrVisual : ExtensionHandler {
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      val typeInEditor = editor.mode.selectionType ?: SelectionType.CHARACTER_WISE
+      val typeInEditor = editor.mode.selectionType ?: CHARACTER_WISE
       editor.sortedCarets().forEach { caret ->
         val selectionStart = caret.selectionStart
         val selectionEnd = caret.selectionEnd
@@ -74,7 +73,7 @@ internal class ReplaceWithRegister : VimExtension {
     override val isRepeatable: Boolean = true
 
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      injector.globalOptions().operatorfunc = OPERATOR_FUNC
+      setOperatorFunction(Operator())
       executeNormalWithoutMapping(injector.parser.parseKeys("g@"), editor.ij)
     }
   }
@@ -113,11 +112,11 @@ internal class ReplaceWithRegister : VimExtension {
           editor.primaryCaret() to VimSelection.create(
             range.startOffset,
             range.endOffset - 1,
-            selectionType ?: SelectionType.CHARACTER_WISE,
+            selectionType ?: CHARACTER_WISE,
             editor,
           ),
         ),
-        selectionType ?: SelectionType.CHARACTER_WISE,
+        selectionType ?: CHARACTER_WISE,
       )
       // todo multicaret
       doReplace(ijEditor, editor.primaryCaret(), visualSelection)
@@ -133,49 +132,52 @@ internal class ReplaceWithRegister : VimExtension {
   }
 
   companion object {
-    @NonNls private const val RWR_OPERATOR = "<Plug>ReplaceWithRegisterOperator"
+    @NonNls
-    @NonNls private const val RWR_LINE = "<Plug>ReplaceWithRegisterLine"
+    private const val RWR_OPERATOR = "<Plug>ReplaceWithRegisterOperator"
-    @NonNls private const val RWR_VISUAL = "<Plug>ReplaceWithRegisterVisual"
+
-    @NonNls private const val OPERATOR_FUNC = "ReplaceWithRegisterOperatorFunc"
+    @NonNls
+    private const val RWR_LINE = "<Plug>ReplaceWithRegisterLine"
+
+    @NonNls
+    private const val RWR_VISUAL = "<Plug>ReplaceWithRegisterVisual"
+
+    private fun doReplace(editor: Editor, 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
+
+      var usedType = savedRegister.type
+      var usedText = savedRegister.text
+      if (usedType.isLine && usedText?.endsWith('\n') == true) {
+        // Code from original plugin implementation. Correct text for linewise selected text
+        usedText = usedText.dropLast(1)
+        usedType = SelectionType.CHARACTER_WISE
+      }
+
+      val textData = PutData.TextData(usedText, usedType, savedRegister.transferableData, savedRegister.name)
+
+      val putData = PutData(
+        textData,
+        visualSelection,
+        1,
+        insertTextBeforeCaret = true,
+        rawIndent = true,
+        caretAfterInsertedText = false,
+        putToLine = -1,
+      )
+      ClipboardOptionHelper.IdeaputDisabler().use {
+        VimPlugin.getPut().putText(
+          IjVimEditor(editor),
+          injector.executionContextManager.onEditor(editor.vim),
+          putData,
+          operatorArguments = OperatorArguments(
+            editor.vimStateMachine?.isOperatorPending ?: false,
+            0,
+            editor.vim.mode,
+          ),
+          saveToRegister = false
+        )
+      }
+    }
   }
 }
-
-private fun doReplace(editor: Editor, 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
-
-  var usedType = savedRegister.type
-  var usedText = savedRegister.text
-  if (usedType.isLine && usedText?.endsWith('\n') == true) {
-    // Code from original plugin implementation. Correct text for linewise selected text
-    usedText = usedText.dropLast(1)
-    usedType = SelectionType.CHARACTER_WISE
-  }
-
-  val textData = PutData.TextData(usedText, usedType, savedRegister.transferableData, savedRegister.name)
-
-  val putData = PutData(
-    textData,
-    visualSelection,
-    1,
-    insertTextBeforeCaret = true,
-    rawIndent = true,
-    caretAfterInsertedText = false,
-    putToLine = -1,
-  )
-  val vimEditor = editor.vim
-  ClipboardOptionHelper.IdeaputDisabler().use {
-    VimPlugin.getPut().putText(
-      vimEditor,
-      injector.executionContextManager.onEditor(editor.vim),
-      putData,
-      operatorArguments = OperatorArguments(
-        editor.vimStateMachine?.isOperatorPending(vimEditor.mode) ?: false,
-        0,
-        editor.vim.mode,
-      ),
-      saveToRegister = false
-    )
-  }
-}

src/main/java/com/maddyhome/idea/vim/extension/sneak/IdeaVimSneakExtension.kt

@@ -1,327 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package com.maddyhome.idea.vim.extension.sneak
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.ScrollType
-import com.intellij.openapi.editor.colors.EditorColors
-import com.intellij.openapi.editor.markup.EffectType
-import com.intellij.openapi.editor.markup.HighlighterLayer
-import com.intellij.openapi.editor.markup.HighlighterTargetArea
-import com.intellij.openapi.editor.markup.RangeHighlighter
-import com.intellij.openapi.editor.markup.TextAttributes
-import com.intellij.openapi.util.Disposer
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.VimProjectService
-import com.maddyhome.idea.vim.api.ExecutionContext
-import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.api.options
-import com.maddyhome.idea.vim.command.MappingMode
-import com.maddyhome.idea.vim.command.OperatorArguments
-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
-import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMapping
-import com.maddyhome.idea.vim.extension.VimExtensionHandler
-import com.maddyhome.idea.vim.helper.StrictMode
-import com.maddyhome.idea.vim.newapi.ij
-import java.awt.Font
-import java.awt.event.KeyEvent
-import java.util.*
-import javax.swing.Timer
-
-
-private const val DEFAULT_HIGHLIGHT_DURATION_SNEAK = 300
-
-// By [Mikhail Levchenko](https://github.com/Mishkun)
-// Original repository with the plugin: https://github.com/Mishkun/ideavim-sneak
-internal class IdeaVimSneakExtension : VimExtension {
-  override fun getName(): String = "sneak"
-
-  override fun init() {
-    val highlightHandler = HighlightHandler()
-    mapToFunctionAndProvideKeys("s", SneakHandler(highlightHandler, Direction.FORWARD), MappingMode.NXO)
-
-    // vim-sneak uses `Z` for visual mode because `S` conflict with vim-sneak plugin VIM-3330
-    mapToFunctionAndProvideKeys("S", SneakHandler(highlightHandler, Direction.BACKWARD), MappingMode.NO)
-    mapToFunctionAndProvideKeys("Z", SneakHandler(highlightHandler, Direction.BACKWARD), MappingMode.X)
-
-    // workaround to support ; and , commands
-    mapToFunctionAndProvideKeys("f", SneakMemoryHandler("f"), MappingMode.NXO)
-    mapToFunctionAndProvideKeys("F", SneakMemoryHandler("F"), MappingMode.NXO)
-    mapToFunctionAndProvideKeys("t", SneakMemoryHandler("t"), MappingMode.NXO)
-    mapToFunctionAndProvideKeys("T", SneakMemoryHandler("T"), MappingMode.NXO)
-
-    mapToFunctionAndProvideKeys(";", SneakRepeatHandler(highlightHandler, RepeatDirection.IDENTICAL), MappingMode.NXO)
-    mapToFunctionAndProvideKeys(",", SneakRepeatHandler(highlightHandler, RepeatDirection.REVERSE), MappingMode.NXO)
-  }
-
-  private class SneakHandler(
-    private val highlightHandler: HighlightHandler,
-    private val direction: Direction,
-  ) : ExtensionHandler {
-    override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      val charone = getChar(editor) ?: return
-      val chartwo = getChar(editor) ?: return
-      val range = Util.jumpTo(editor, charone, chartwo, direction)
-      range?.let { highlightHandler.highlightSneakRange(editor.ij, range) }
-      Util.lastSymbols = "${charone}${chartwo}"
-      Util.lastSDirection = direction
-    }
-
-    private fun getChar(editor: VimEditor): Char? {
-      val key = VimExtensionFacade.inputKeyStroke(editor.ij)
-      return when {
-        key.keyChar == KeyEvent.CHAR_UNDEFINED || key.keyCode == KeyEvent.VK_ESCAPE -> null
-        else -> key.keyChar
-      }
-    }
-  }
-
-  /**
-   * This class acts as proxy for normal find commands because we need to update [Util.lastSDirection]
-   */
-  private class SneakMemoryHandler(private val char: String) : VimExtensionHandler {
-    override fun execute(editor: Editor, context: DataContext) {
-      Util.lastSDirection = null
-      VimExtensionFacade.executeNormalWithoutMapping(injector.parser.parseKeys(char), editor)
-    }
-  }
-
-  private class SneakRepeatHandler(
-    private val highlightHandler: HighlightHandler,
-    private val direction: RepeatDirection,
-  ) : ExtensionHandler {
-    override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      val lastSDirection = Util.lastSDirection
-      if (lastSDirection != null) {
-        val (charone, chartwo) = Util.lastSymbols.toList()
-        val jumpRange = Util.jumpTo(editor, charone, chartwo, direction.map(lastSDirection))
-        jumpRange?.let { highlightHandler.highlightSneakRange(editor.ij, jumpRange) }
-      } else {
-        VimExtensionFacade.executeNormalWithoutMapping(injector.parser.parseKeys(direction.symb), editor.ij)
-      }
-    }
-  }
-
-  private object Util {
-    var lastSDirection: Direction? = null
-    var lastSymbols: String = ""
-    fun jumpTo(editor: VimEditor, charone: Char, chartwo: Char, sneakDirection: Direction): TextRange? {
-      val caret = editor.primaryCaret()
-      val position = caret.offset.point
-      val chars = editor.text()
-      val foundPosition = sneakDirection.findBiChar(editor, chars, position, charone, chartwo)
-      if (foundPosition != null) {
-        editor.primaryCaret().moveToOffset(foundPosition)
-      }
-      editor.ij.scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE)
-      return foundPosition?.let { TextRange(foundPosition, foundPosition + 2) }
-    }
-  }
-
-  private enum class Direction(val offset: Int) {
-    FORWARD(1) {
-      override fun findBiChar(
-        editor: VimEditor,
-        charSequence: CharSequence,
-        position: Int,
-        charone: Char,
-        chartwo: Char
-      ): Int? {
-        for (i in (position + offset) until charSequence.length - 1) {
-          if (matches(editor, charSequence, i, charone, chartwo)) {
-            return i
-          }
-        }
-        return null
-      }
-    },
-    BACKWARD(-1) {
-      override fun findBiChar(
-        editor: VimEditor,
-        charSequence: CharSequence,
-        position: Int,
-        charone: Char,
-        chartwo: Char
-      ): Int? {
-        for (i in (position + offset) downTo 0) {
-          if (matches(editor, charSequence, i, charone, chartwo)) {
-            return i
-          }
-        }
-        return null
-      }
-
-    };
-
-    abstract fun findBiChar(
-      editor: VimEditor,
-      charSequence: CharSequence,
-      position: Int,
-      charone: Char,
-      chartwo: Char,
-    ): Int?
-
-    fun matches(
-      editor: VimEditor,
-      charSequence: CharSequence,
-      charPosition: Int,
-      charOne: Char,
-      charTwo: Char,
-    ): Boolean {
-      var match = charSequence[charPosition].equals(charOne, ignoreCase = injector.options(editor).ignorecase) &&
-        charSequence[charPosition + 1].equals(charTwo, ignoreCase = injector.options(editor).ignorecase)
-
-      if (injector.options(editor).ignorecase && injector.options(editor).smartcase) {
-        if (charOne.isUpperCase() || charTwo.isUpperCase()) {
-          match = charSequence[charPosition].equals(charOne, ignoreCase = false) &&
-            charSequence[charPosition + 1].equals(charTwo, ignoreCase = false)
-        }
-      }
-      return match
-    }
-  }
-
-  private enum class RepeatDirection(val symb: String) {
-    IDENTICAL(";") {
-      override fun map(direction: Direction): Direction = direction
-    },
-    REVERSE(",") {
-      override fun map(direction: Direction): Direction = when (direction) {
-        Direction.FORWARD -> Direction.BACKWARD
-        Direction.BACKWARD -> Direction.FORWARD
-      }
-    };
-
-    abstract fun map(direction: Direction): Direction
-  }
-
-  private class HighlightHandler {
-    private var editor: Editor? = null
-    private val sneakHighlighters: MutableSet<RangeHighlighter> = mutableSetOf()
-
-    fun highlightSneakRange(editor: Editor, range: TextRange) {
-      clearAllSneakHighlighters()
-
-      this.editor = editor
-      val project = editor.project
-      if (project != null) {
-        Disposer.register(VimProjectService.getInstance(project)) {
-          this.editor = null
-          sneakHighlighters.clear()
-        }
-      }
-
-      if (range.isMultiple) {
-        for (i in 0 until range.size()) {
-          highlightSingleRange(editor, range.startOffsets[i]..range.endOffsets[i])
-        }
-      } else {
-        highlightSingleRange(editor, range.startOffset..range.endOffset)
-      }
-    }
-
-    fun clearAllSneakHighlighters() {
-      sneakHighlighters.forEach { highlighter ->
-        editor?.markupModel?.removeHighlighter(highlighter) ?: StrictMode.fail("Highlighters without an editor")
-      }
-
-      sneakHighlighters.clear()
-    }
-
-    private fun highlightSingleRange(editor: Editor, range: ClosedRange<Int>) {
-      val highlighter = editor.markupModel.addRangeHighlighter(
-        range.start,
-        range.endInclusive,
-        HighlighterLayer.SELECTION,
-        getHighlightTextAttributes(),
-        HighlighterTargetArea.EXACT_RANGE
-      )
-
-      sneakHighlighters.add(highlighter)
-
-      setClearHighlightRangeTimer(highlighter)
-    }
-
-    private fun setClearHighlightRangeTimer(highlighter: RangeHighlighter) {
-      val timer = Timer(DEFAULT_HIGHLIGHT_DURATION_SNEAK) {
-        if (editor?.isDisposed != true) {
-          editor?.markupModel?.removeHighlighter(highlighter)
-        }
-      }
-      timer.isRepeats = false
-      timer.start()
-    }
-
-    private fun getHighlightTextAttributes() = TextAttributes(
-      null,
-      EditorColors.TEXT_SEARCH_RESULT_ATTRIBUTES.defaultAttributes.backgroundColor,
-      editor?.colorsScheme?.getColor(EditorColors.CARET_COLOR),
-      EffectType.SEARCH_MATCH,
-      Font.PLAIN
-    )
-  }
-}
-
-/**
- * Map some <Plug>(keys) command to given handler
- *  and create mapping to <Plug>(prefix)[keys]
- */
-private fun VimExtension.mapToFunctionAndProvideKeys(
-  keys: String, handler: ExtensionHandler, mappingModes: EnumSet<MappingMode>
-) {
-  VimExtensionFacade.putExtensionHandlerMapping(
-    mappingModes,
-    injector.parser.parseKeys(command(keys)),
-    owner,
-    handler,
-    false
-  )
-  VimExtensionFacade.putExtensionHandlerMapping(
-    mappingModes,
-    injector.parser.parseKeys(commandFromOriginalPlugin(keys)),
-    owner,
-    handler,
-    false
-  )
-
-  // This is a combination to meet the following requirements:
-  //  - Now we should support mappings from sneak `Sneak_s` and mappings from the previous version of the plugin `(sneak-s)`
-  //  - The shortcut should not be registered if any of these mappings is overridden in .ideavimrc
-  //  - The shortcut should not be registered if some other shortcut for this key exists
-  val fromKeys = injector.parser.parseKeys(keys)
-  val filteredModes = mappingModes.filterNotTo(HashSet()) {
-    VimPlugin.getKey().hasmapto(it, injector.parser.parseKeys(command(keys)))
-  }
-  val filteredModes2 = mappingModes.filterNotTo(HashSet()) {
-    VimPlugin.getKey().hasmapto(it, injector.parser.parseKeys(commandFromOriginalPlugin(keys)))
-  }
-  val filteredFromModes = mappingModes.filterNotTo(HashSet()) {
-    injector.keyGroup.hasmapfrom(it, fromKeys)
-  }
-
-  val doubleFiltered = mappingModes
-    .filter { it in filteredModes2 && it in filteredModes && it in filteredFromModes }
-    .toSet()
-  putKeyMapping(doubleFiltered, fromKeys, owner, injector.parser.parseKeys(command(keys)), true)
-  putKeyMapping(
-    doubleFiltered,
-    fromKeys,
-    owner,
-    injector.parser.parseKeys(commandFromOriginalPlugin(keys)),
-    true
-  )
-}
-
-private fun command(keys: String) = "<Plug>(sneak-$keys)"
-private fun commandFromOriginalPlugin(keys: String) = "<Plug>Sneak_$keys"

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

@@ -17,7 +17,6 @@ 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
-import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.setChangeMarks
 import com.maddyhome.idea.vim.command.MappingMode
@@ -25,15 +24,14 @@ import com.maddyhome.idea.vim.command.OperatorArguments
 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
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.executeNormalWithoutMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.getRegisterForCaret
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.inputKeyStroke
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.inputString
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putExtensionHandlerMapping
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissing
+import com.maddyhome.idea.vim.extension.VimExtensionFacade.setOperatorFunction
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.setRegisterForCaret
-import com.maddyhome.idea.vim.extension.exportOperatorFunction
 import com.maddyhome.idea.vim.helper.runWithEveryCaretAndRestore
 import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.IjVimCaret
@@ -80,15 +78,13 @@ internal class VimSurroundExtension : VimExtension {
       putKeyMappingIfMissing(MappingMode.N, injector.parser.parseKeys("ds"), owner, injector.parser.parseKeys("<Plug>DSurround"), true)
       putKeyMappingIfMissing(MappingMode.XO, injector.parser.parseKeys("S"), owner, injector.parser.parseKeys("<Plug>VSurround"), true)
     }
-
-    VimExtensionFacade.exportOperatorFunction(OPERATOR_FUNC, Operator(supportsMultipleCursors = false, count = 1)) // TODO
   }
 
   private class YSurroundHandler : ExtensionHandler {
     override val isRepeatable = true
 
     override fun execute(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments) {
-      injector.globalOptions().operatorfunc = OPERATOR_FUNC
+      setOperatorFunction(Operator(supportsMultipleCursors = false, count = 1)) // TODO
       executeNormalWithoutMapping(injector.parser.parseKeys("g@"), editor.ij)
     }
   }
@@ -319,9 +315,7 @@ private val LOG = logger<VimSurroundExtension>()
 
 private const val REGISTER = '"'
 
-private const val OPERATOR_FUNC = "SurroundOperatorFunc"
+private val tagNameAndAttributesCapturePattern = "(\\S+)([^>]*)>".toPattern()
-
-    private val tagNameAndAttributesCapturePattern = "(\\S+)([^>]*)>".toPattern()
 
 private val SURROUND_PAIRS = mapOf(
   'b' to ("(" to ")"),

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

@@ -138,7 +138,7 @@ public class VimTextObjEntireExtension implements VimExtension {
 
       final EntireTextObjectHandler textObjectHandler = new EntireTextObjectHandler(ignoreLeadingAndTrailing);
       //noinspection DuplicatedCode
-      if (!vimStateMachine.isOperatorPending(editor.getMode())) {
+      if (!vimStateMachine.isOperatorPending()) {
         ((IjVimEditor) editor).getEditor().getCaretModel().runForEachCaret((Caret caret) -> {
           final TextRange range = textObjectHandler.getRange(editor, new IjVimCaret(caret), context, count, 0);
           if (range != null) {

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

@@ -267,7 +267,7 @@ public class VimIndentObject implements VimExtension {
 
       final IndentObjectHandler textObjectHandler = new IndentObjectHandler(includeAbove, includeBelow);
 
-      if (!vimStateMachine.isOperatorPending(editor.getMode())) {
+      if (!vimStateMachine.isOperatorPending()) {
         ((IjVimEditor)editor).getEditor().getCaretModel().runForEachCaret((Caret caret) -> {
           final TextRange range = textObjectHandler.getRange(vimEditor, new IjVimCaret(caret), context, count, 0);
           if (range != null) {

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

@@ -68,11 +68,10 @@ import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
 import com.maddyhome.idea.vim.newapi.IjVimCaret
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.ij
-import com.maddyhome.idea.vim.regexp.VimRegex
-import com.maddyhome.idea.vim.regexp.match.VimMatchResult
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.Mode.VISUAL
 import com.maddyhome.idea.vim.state.mode.SelectionType
+import com.maddyhome.idea.vim.state.mode.mode
 import com.maddyhome.idea.vim.vimscript.model.commands.SortOption
 import org.jetbrains.annotations.TestOnly
 import java.math.BigInteger
@@ -532,7 +531,7 @@ public class ChangeGroup : VimChangeGroupBase() {
         val soff = editor.getLineStartOffset(l)
         val eoff = editor.getLineEndOffset(l, true)
         val woff = injector.motion.moveCaretToLineStartSkipLeading(editor, l)
-        val col = editor.offsetToBufferPosition(woff).column
+        val col = editor.offsetToVisualPosition(woff).column
         val limit = max(0.0, (col + dir * indentConfig.getTotalIndent(count)).toDouble())
           .toInt()
         if (col > 0 || soff != eoff) {
@@ -574,62 +573,48 @@ public class ChangeGroup : VimChangeGroupBase() {
     }
     val startOffset = editor.getLineStartOffset(startLine)
     val endOffset = editor.getLineEndOffset(endLine)
+    return sortTextRange(editor, caret, startOffset, endOffset, lineComparator, sortOptions)
+  }
 
-    val selectedText = (editor as IjVimEditor).editor.document.getText(TextRangeInterval(startOffset, endOffset))
+  /**
-    val lines = selectedText.split("\n")
+   * Sorts a text range with a comparator. Returns true if a replace was performed, false otherwise.
-    val modifiedLines = sortOptions.pattern?.let {
+   *
-      if (sortOptions.sortOnPattern) {
+   * @param editor         The editor to replace text in
-        extractPatternFromLines(editor, lines, startLine, it)
+   * @param start          The starting position for the sort
-      } else {
+   * @param end            The ending position for the sort
-        deletePatternFromLines(editor, lines, startLine, it)
+   * @param lineComparator The comparator to use to sort
-      }
+   * @param sortOption     The option to sort the range
-    } ?: lines
+   * @return true if able to sort the text, false if not
-    val sortedLines = lines.zip(modifiedLines)
+   */
-      .sortedWith { l1, l2 -> lineComparator.compare(l1.second, l2.second) }
+  private fun sortTextRange(
-      .map {it.first}
+    editor: VimEditor,
-      .toMutableList()
+    caret: VimCaret,
-
+    start: Int,
-    if (sortOptions.unique) {
+    end: Int,
-      val iterator = sortedLines.iterator()
+    lineComparator: Comparator<String>,
+    sortOption: SortOption,
+  ): Boolean {
+    val selectedText = (editor as IjVimEditor).editor.document.getText(TextRangeInterval(start, end))
+    val lines: MutableList<String> = selectedText.split("\n").sortedWith(lineComparator).toMutableList()
+    if (sortOption.unique) {
+      val iterator = lines.iterator()
       var previous: String? = null
       while (iterator.hasNext()) {
         val current = iterator.next()
-        if (current == previous || sortOptions.ignoreCase && current.equals(previous, ignoreCase = true)) {
+        if (current == previous || sortOption.ignoreCase && current.equals(previous, ignoreCase = true)) {
           iterator.remove()
         } else {
           previous = current
         }
       }
     }
-    if (sortedLines.isEmpty()) {
+    if (lines.size < 1) {
       return false
     }
-    replaceText(editor, caret, startOffset, endOffset, StringUtil.join(sortedLines, "\n"))
+    replaceText(editor, caret, start, end, StringUtil.join(lines, "\n"))
     return true
   }
 
-  private fun extractPatternFromLines(editor: VimEditor, lines: List<String>, startLine: Int, pattern: String): List<String> {
-    val regex = VimRegex(pattern)
-    return lines.mapIndexed { i: Int, line: String ->
-      val result = regex.findInLine(editor, startLine + i, 0)
-      when (result) {
-        is VimMatchResult.Success -> result.value
-        is VimMatchResult.Failure -> line
-      }
-    }
-  }
-
-  private fun deletePatternFromLines(editor: VimEditor, lines: List<String>, startLine: Int, pattern: String): List<String> {
-    val regex = VimRegex(pattern)
-    return lines.mapIndexed { i: Int, line: String ->
-      val result = regex.findInLine(editor, startLine + i, 0)
-      when (result) {
-        is VimMatchResult.Success -> line.substring(result.value.length, line.length)
-        is VimMatchResult.Failure -> line
-      }
-    }
-  }
-
   /**
    * Perform increment and decrement for numbers in visual mode
    *

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

@@ -8,11 +8,9 @@
 
 package com.maddyhome.idea.vim.group
 
-import com.intellij.openapi.components.Service
 import com.maddyhome.idea.vim.api.VimCommandGroupBase
 
 /**
  * @author Elliot Courant
  */
-@Service
 internal class CommandGroup : VimCommandGroupBase()

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

@@ -11,9 +11,6 @@ package com.maddyhome.idea.vim.group;
 import com.intellij.execution.impl.ConsoleViewImpl;
 import com.intellij.find.EditorSearchSession;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.client.ClientAppSession;
-import com.intellij.openapi.client.ClientKind;
-import com.intellij.openapi.client.ClientSessionsManager;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
@@ -25,10 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.maddyhome.idea.vim.KeyHandler;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.*;
-import com.maddyhome.idea.vim.helper.CaretVisualAttributesHelperKt;
+import com.maddyhome.idea.vim.helper.*;
-import com.maddyhome.idea.vim.helper.CommandStateHelper;
-import com.maddyhome.idea.vim.helper.EditorHelper;
-import com.maddyhome.idea.vim.helper.UserDataManager;
 import com.maddyhome.idea.vim.newapi.IjVimDocument;
 import com.maddyhome.idea.vim.newapi.IjVimEditor;
 import com.maddyhome.idea.vim.options.EffectiveOptionValueChangeListener;
@@ -40,10 +34,10 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Collection;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
 import static com.maddyhome.idea.vim.api.VimInjectorKt.options;
+import static com.maddyhome.idea.vim.helper.CaretVisualAttributesHelperKt.updateCaretsVisualAttributes;
 import static com.maddyhome.idea.vim.newapi.IjVimInjectorKt.ijOptions;
 
 /**
@@ -210,8 +204,7 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
   }
 
   public void editorCreated(@NotNull Editor editor) {
-    UserDataManager.setVimInitialised(editor, true);
+    DocumentManager.INSTANCE.addListeners(editor.getDocument());
-
     VimPlugin.getKey().registerRequiredShortcutKeys(new IjVimEditor(editor));
 
     initLineNumbers(editor);
@@ -253,13 +246,14 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
           switchToInsertMode.run();
         }
       });
-    updateCaretsVisualAttributes(new IjVimEditor(editor));
+    updateCaretsVisualAttributes(editor);
   }
 
   public void editorDeinit(@NotNull Editor editor, boolean isReleased) {
     deinitLineNumbers(editor, isReleased);
     UserDataManager.unInitializeEditor(editor);
     VimPlugin.getKey().unregisterShortcutKeys(new IjVimEditor(editor));
+    DocumentManager.INSTANCE.removeListeners(editor.getDocument());
     CaretVisualAttributesHelperKt.removeCaretsVisualAttributes(editor);
   }
 
@@ -290,18 +284,6 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
     notifyIdeaJoin(((IjVimEditor) editor).getEditor().getProject(), editor);
   }
 
-  @Override
-  public void updateCaretsVisualAttributes(@NotNull VimEditor editor) {
-    Editor ijEditor = ((IjVimEditor) editor).getEditor();
-    CaretVisualAttributesHelperKt.updateCaretsVisualAttributes(ijEditor);
-  }
-
-  @Override
-  public void updateCaretsVisualPosition(@NotNull VimEditor editor) {
-    Editor ijEditor = ((IjVimEditor) editor).getEditor();
-    CaretVisualAttributesHelperKt.updateCaretsVisualAttributes(ijEditor);
-  }
-
   public static class NumberChangeListener implements EffectiveOptionValueChangeListener {
     public static NumberChangeListener INSTANCE = new NumberChangeListener();
 
@@ -342,45 +324,20 @@ public class EditorGroup implements PersistentStateComponent<Element>, VimEditor
     }
   }
 
+  @NotNull
   @Override
-  public @NotNull Collection<VimEditor> getEditorsRaw() {
+  public Collection<VimEditor> localEditors() {
-    return getLocalEditors()
+    return HelperKt.localEditors().stream()
       .map(IjVimEditor::new)
       .collect(Collectors.toList());
   }
 
   @NotNull
   @Override
-  public Collection<VimEditor> getEditors() {
+  public Collection<VimEditor> localEditors(@NotNull VimDocument buffer) {
-    return getLocalEditors()
-      .filter(UserDataManager::getVimInitialised)
-      .map(IjVimEditor::new)
-      .collect(Collectors.toList());
-  }
-
-  @NotNull
-  @Override
-  public Collection<VimEditor> getEditors(@NotNull VimDocument buffer) {
     final Document document = ((IjVimDocument)buffer).getDocument();
-    return getLocalEditors()
+    return HelperKt.localEditors(document).stream()
-      .filter(editor -> UserDataManager.getVimInitialised(editor) && editor.getDocument().equals(document))
       .map(IjVimEditor::new)
       .collect(Collectors.toList());
   }
-
-  private Stream<Editor> getLocalEditors() {
-    // Always fetch local editors. If we're hosting a Code With Me session, any connected guests will create hidden
-    // editors to handle syntax highlighting, completion requests, etc. We need to make sure that IdeaVim only makes
-    // changes (e.g. adding search highlights) to local editors, so things don't incorrectly flow through to any Clients.
-    // In non-CWM scenarios, or if IdeaVim is installed on the Client, there are only ever local editors, so this will
-    // also work there. In Gateway remote development scenarios, IdeaVim should not be installed on the host, only the
-    // Client, so all should work there too.
-    // Note that most IdeaVim operations are in response to interactive keystrokes, which would mean that
-    // ClientEditorManager.getCurrentInstance would return local editors. However, some operations are in response to
-    // events such as document change (to update search highlights) and these can come from CWM guests, and we'd get the
-    // remote editors.
-    // This invocation will always get local editors, regardless of current context.
-    final ClientAppSession localSession = ClientSessionsManager.getAppSessions(ClientKind.LOCAL).get(0);
-    return localSession.getService(ClientEditorManager.class).editors();
-  }
 }

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

@@ -30,6 +30,8 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.ProjectScope;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.*;
+import com.maddyhome.idea.vim.state.mode.Mode;
+import com.maddyhome.idea.vim.state.VimStateMachine;
 import com.maddyhome.idea.vim.common.TextRange;
 import com.maddyhome.idea.vim.helper.EditorHelper;
 import com.maddyhome.idea.vim.helper.EditorHelperRt;
@@ -38,8 +40,6 @@ import com.maddyhome.idea.vim.helper.SearchHelper;
 import com.maddyhome.idea.vim.newapi.ExecuteExtensionKt;
 import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext;
 import com.maddyhome.idea.vim.newapi.IjVimEditor;
-import com.maddyhome.idea.vim.state.VimStateMachine;
-import com.maddyhome.idea.vim.state.mode.Mode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -438,11 +438,14 @@ public class FileGroup extends VimFileBase {
   private static final @NotNull Logger logger = Logger.getInstance(FileGroup.class.getName());
 
   /**
-   * Respond to editor tab selection and remember the last used tab
+   * This method listens for editor tab changes so any insert/replace modes that need to be reset can be.
    */
   public static void fileEditorManagerSelectionChangedCallback(@NotNull FileEditorManagerEvent event) {
+    // The user has changed the editor they are working with - exit insert/replace mode, and complete any
+    // appropriate repeat
     if (event.getOldFile() != null) {
       LastTabService.getInstance(event.getManager().getProject()).setLastTab(event.getOldFile());
     }
   }
 }
+

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

@@ -20,6 +20,7 @@ import com.maddyhome.idea.vim.options.OptionAccessScope
  */
 @Suppress("SpellCheckingInspection")
 public open class GlobalIjOptions(scope: OptionAccessScope) : OptionsPropertiesBase(scope) {
+  public var closenotebooks: Boolean by optionProperty(IjOptions.closenotebooks)
   public var ide: String by optionProperty(IjOptions.ide)
   public var ideamarks: Boolean by optionProperty(IjOptions.ideamarks)
   public var ideastatusicon: String by optionProperty(IjOptions.ideastatusicon)
@@ -28,15 +29,15 @@ public open class GlobalIjOptions(scope: OptionAccessScope) : OptionsPropertiesB
   public val lookupkeys: StringListOptionValue by optionProperty(IjOptions.lookupkeys)
   public var trackactionids: Boolean by optionProperty(IjOptions.trackactionids)
   public var visualdelay: Int by optionProperty(IjOptions.visualdelay)
+  public var showmodewidget: Boolean by optionProperty(IjOptions.showmodewidget)
+  public var colorfulmodewidget: Boolean by optionProperty(IjOptions.colorfulmodewidget)
 
   // Temporary options to control work-in-progress behaviour
-  public var closenotebooks: Boolean by optionProperty(IjOptions.closenotebooks)
-  public var commandOrMotionAnnotation: Boolean by optionProperty(IjOptions.commandOrMotionAnnotation)
-  public var exCommandAnnotation: Boolean by optionProperty(IjOptions.exCommandAnnotation)
   public var oldundo: Boolean by optionProperty(IjOptions.oldundo)
   public var unifyjumps: Boolean by optionProperty(IjOptions.unifyjumps)
-  public var useNewRegex: Boolean by optionProperty(IjOptions.useNewRegex)
+  public var exCommandAnnotation: Boolean by optionProperty(IjOptions.exCommandAnnotation)
   public var vimscriptFunctionAnnotation: Boolean by optionProperty(IjOptions.vimscriptFunctionAnnotation)
+  public var commandOrMotionAnnotation: Boolean by optionProperty(IjOptions.commandOrMotionAnnotation)
 }
 
 /**

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

@@ -33,6 +33,8 @@ public object IjOptions {
     Options.overrideDefaultValue(Options.clipboard, VimString("ideaput,autoselect,exclude:cons\\|linux"))
   }
 
+  public val closenotebooks: ToggleOption = addOption(ToggleOption("closenotebooks", GLOBAL, "closenotebooks", true))
+  public val exCommandAnnotation: ToggleOption = addOption(ToggleOption("excommandannotation", GLOBAL, "excommandannotation", true))
   public val ide: StringOption = addOption(
     StringOption("ide", GLOBAL, "ide", ApplicationNamesInfo.getInstance().fullProductNameWithEdition)
   )
@@ -79,16 +81,13 @@ public object IjOptions {
       "<Tab>,<Down>,<Up>,<Enter>,<Left>,<Right>,<C-Down>,<C-Up>,<PageUp>,<PageDown>,<C-J>,<C-Q>")
   )
   public val trackactionids: ToggleOption = addOption(ToggleOption("trackactionids", GLOBAL, "tai", false))
+  public val unifyjumps: ToggleOption = addOption(ToggleOption("unifyjumps", GLOBAL, "unifyjumps", true))
   public val visualdelay: UnsignedNumberOption = addOption(UnsignedNumberOption("visualdelay", GLOBAL, "visualdelay", 100))
-
+  public val oldundo: ToggleOption = addOption(ToggleOption("oldundo", GLOBAL, "oldundo", true, isTemporary = true))
-  // Temporary feature flags during development, not really intended for external use
+  public val vimscriptFunctionAnnotation: ToggleOption = addOption(ToggleOption("vimscriptfunctionannotation", GLOBAL, "vimscriptfunctionannotation", true, isTemporary = true))
-  public val closenotebooks: ToggleOption = addOption(ToggleOption("closenotebooks", GLOBAL, "closenotebooks", true, isHidden = true))
+  public val commandOrMotionAnnotation: ToggleOption = addOption(ToggleOption("commandormotionannotation", GLOBAL, "commandormotionannotation", true, isTemporary = true))
-  public val commandOrMotionAnnotation: ToggleOption = addOption(ToggleOption("commandormotionannotation", GLOBAL, "commandormotionannotation", true, isHidden = true))
+  public val showmodewidget: ToggleOption = addOption(ToggleOption("showmodewidget", GLOBAL, "showmodewidget", false, isTemporary = true))
-  public val exCommandAnnotation: ToggleOption = addOption(ToggleOption("excommandannotation", GLOBAL, "excommandannotation", true, isHidden = true))
+  public val colorfulmodewidget: ToggleOption = addOption(ToggleOption("colorfulmodewidget", GLOBAL, "colorfulmodewidget", false, isTemporary = true))
-  public val oldundo: ToggleOption = addOption(ToggleOption("oldundo", GLOBAL, "oldundo", true, isHidden = true))
-  public val unifyjumps: ToggleOption = addOption(ToggleOption("unifyjumps", GLOBAL, "unifyjumps", true, isHidden = true))
-  public val useNewRegex: ToggleOption = addOption(ToggleOption("usenewregex", GLOBAL, "usenewregex", true, isHidden = true))
-  public 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>

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

@@ -15,38 +15,38 @@ import com.maddyhome.idea.vim.statistic.VimscriptState
 internal class IjStatisticsService : VimStatistics {
 
   override fun logTrackedAction(actionId: String) {
-    ActionTracker.Util.logTrackedAction(actionId)
+    ActionTracker.logTrackedAction(actionId)
   }
 
   override fun logCopiedAction(actionId: String) {
-    ActionTracker.Util.logCopiedAction(actionId)
+    ActionTracker.logCopiedAction(actionId)
   }
 
   override fun setIfLoopUsed(value: Boolean) {
-    VimscriptState.Util.isLoopUsed = value
+    VimscriptState.isLoopUsed = value
   }
 
   override fun setIfMapExprUsed(value: Boolean) {
-    VimscriptState.Util.isMapExprUsed = value
+    VimscriptState.isMapExprUsed = value
   }
 
   override fun setIfFunctionCallUsed(value: Boolean) {
-    VimscriptState.Util.isFunctionCallUsed = value
+    VimscriptState.isFunctionCallUsed = value
   }
 
   override fun setIfFunctionDeclarationUsed(value: Boolean) {
-    VimscriptState.Util.isFunctionDeclarationUsed = value
+    VimscriptState.isFunctionDeclarationUsed = value
   }
 
   override fun setIfIfUsed(value: Boolean) {
-    VimscriptState.Util.isIfUsed = value
+    VimscriptState.isIfUsed = value
   }
 
   override fun addExtensionEnabledWithPlug(extension: String) {
-    VimscriptState.Util.extensionsEnabledWithPlug.add(extension)
+    VimscriptState.extensionsEnabledWithPlug.add(extension)
   }
 
   override fun addSourcedFile(path: String) {
-    VimscriptState.Util.sourcedFiles.add(path)
+    VimscriptState.sourcedFiles.add(path)
   }
 }

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

@@ -24,16 +24,17 @@ import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.keymap.ex.KeymapManagerEx;
 import com.maddyhome.idea.vim.EventFacade;
 import com.maddyhome.idea.vim.VimPlugin;
+import com.maddyhome.idea.vim.action.ComplicatedKeysAction;
 import com.maddyhome.idea.vim.action.VimShortcutKeyAction;
 import com.maddyhome.idea.vim.action.change.LazyVimCommand;
-import com.maddyhome.idea.vim.api.NativeAction;
+import com.maddyhome.idea.vim.api.*;
-import com.maddyhome.idea.vim.api.VimEditor;
-import com.maddyhome.idea.vim.api.VimInjectorKt;
-import com.maddyhome.idea.vim.api.VimKeyGroupBase;
 import com.maddyhome.idea.vim.command.MappingMode;
 import com.maddyhome.idea.vim.ex.ExOutputModel;
+import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
+import com.maddyhome.idea.vim.helper.HelperKt;
 import com.maddyhome.idea.vim.key.*;
 import com.maddyhome.idea.vim.newapi.IjNativeAction;
+import com.maddyhome.idea.vim.newapi.IjVimActionsInitiator;
 import com.maddyhome.idea.vim.newapi.IjVimEditor;
 import kotlin.Pair;
 import kotlin.text.StringsKt;
@@ -48,7 +49,6 @@ import java.awt.event.KeyEvent;
 import java.util.List;
 import java.util.*;
 
-import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -101,9 +101,9 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
 
   @Override
   public void updateShortcutKeysRegistration() {
-    for (VimEditor editor : injector.getEditorGroup().getEditors()) {
+    for (Editor editor : HelperKt.localEditors()) {
-      unregisterShortcutKeys(editor);
+      unregisterShortcutKeys(new IjVimEditor(editor));
-      registerRequiredShortcutKeys(editor);
+      registerRequiredShortcutKeys(new IjVimEditor(editor));
     }
   }
 
@@ -221,20 +221,63 @@ public class KeyGroup extends VimKeyGroupBase implements PersistentStateComponen
       registerRequiredShortcut(keyStrokes, MappingOwner.IdeaVim.System.INSTANCE);
 
       for (MappingMode mappingMode : command.getModes()) {
-        Node<LazyVimCommand> node = getKeyRoot(mappingMode);
+        Node<VimActionsInitiator> node = getKeyRoot(mappingMode);
         NodesKt.addLeafs(node, keyStrokes, command);
       }
     }
   }
 
+  @Deprecated
+  public void registerCommandAction(@NotNull VimActionsInitiator actionHolder) {
+    IjVimActionsInitiator holder = (IjVimActionsInitiator)actionHolder;
+
+    if (!VimPlugin.getPluginId().equals(holder.getBean().getPluginDescriptor().getPluginId())) {
+      logger.error("IdeaVim doesn't accept contributions to `vimActions` extension points. " +
+                   "Please create a plugin using `VimExtension`. " +
+                   "Plugin to blame: " +
+                   holder.getBean().getPluginDescriptor().getPluginId());
+      return;
+    }
+
+    Set<List<KeyStroke>> actionKeys = holder.getBean().getParsedKeys();
+    if (actionKeys == null) {
+      final EditorActionHandlerBase action = actionHolder.getInstance();
+      if (action instanceof ComplicatedKeysAction) {
+        actionKeys = ((ComplicatedKeysAction)action).getKeyStrokesSet();
+      }
+      else {
+        throw new RuntimeException("Cannot register action: " + action.getClass().getName());
+      }
+    }
+
+    Set<MappingMode> actionModes = holder.getBean().getParsedModes();
+    if (actionModes == null) {
+      throw new RuntimeException("Cannot register action: " + holder.getBean().getImplementation());
+    }
+
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      initIdentityChecker();
+      for (List<KeyStroke> keys : actionKeys) {
+        checkCommand(actionModes, actionHolder.getInstance(), keys);
+      }
+    }
+
+    for (List<KeyStroke> keyStrokes : actionKeys) {
+      registerRequiredShortcut(keyStrokes, MappingOwner.IdeaVim.System.INSTANCE);
+
+      for (MappingMode mappingMode : actionModes) {
+        Node<VimActionsInitiator> node = getKeyRoot(mappingMode);
+        NodesKt.addLeafs(node, keyStrokes, actionHolder);
+      }
+    }
+  }
+
   private void registerRequiredShortcut(@NotNull List<KeyStroke> keys, MappingOwner owner) {
     for (KeyStroke key : keys) {
-      if (key.getKeyChar() == KeyEvent.CHAR_UNDEFINED) {
+      if (key.getKeyChar() == KeyEvent.CHAR_UNDEFINED &&
-        if (!injector.getApplication().isOctopusEnabled() ||
+          !(key.getKeyCode() == KeyEvent.VK_ESCAPE && key.getModifiers() == 0) &&
-            !(key.getKeyCode() == KeyEvent.VK_ESCAPE && key.getModifiers() == 0) &&
+          !(key.getKeyCode() == KeyEvent.VK_ENTER && key.getModifiers() == 0)) {
-            !(key.getKeyCode() == KeyEvent.VK_ENTER && key.getModifiers() == 0)) {
+        getRequiredShortcutKeys().add(new RequiredShortcut(key, owner));
-          getRequiredShortcutKeys().add(new RequiredShortcut(key, owner));
-        }
       }
     }
   }

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

@@ -10,7 +10,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
 import com.intellij.openapi.progress.ProgressManager
@@ -27,7 +26,6 @@ import com.maddyhome.idea.vim.newapi.ij
 /**
  * Used to handle playback of macros
  */
-@Service
 internal class MacroGroup : VimMacroBase() {
 
   // If it's null, this is the top macro (as in most cases). If it's not null, this macro is executed from top macro
@@ -78,12 +76,11 @@ internal class MacroGroup : VimMacroBase() {
                 } catch (e: ProcessCanceledException) {
                   return@runnable
                 }
-                val keyHandler = getInstance()
                 ProgressManager.getInstance().executeNonCancelableSection {
                   // Prevent autocompletion during macros.
                   // See https://github.com/JetBrains/ideavim/pull/772 for details
                   CompletionServiceImpl.setCompletionPhase(CompletionPhase.NoCompletion)
-                  keyHandler.handleKey(editor, key, context, keyHandler.keyHandlerState)
+                  getInstance().handleKey(editor, key, context)
                 }
                 if (injector.messages.isError()) return@runnable
               }

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

@@ -0,0 +1,138 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package com.maddyhome.idea.vim.group;
+
+import com.intellij.ide.bookmark.LineBookmark;
+import com.intellij.openapi.editor.Editor;
+import com.maddyhome.idea.vim.api.*;
+import com.maddyhome.idea.vim.common.TextRange;
+import com.maddyhome.idea.vim.mark.IntellijMark;
+import com.maddyhome.idea.vim.mark.Jump;
+import com.maddyhome.idea.vim.mark.Mark;
+import com.maddyhome.idea.vim.newapi.IjVimEditor;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+@Deprecated
+@ApiStatus.ScheduledForRemoval(inVersion = "2.3")
+public class MarkGroup {
+  public List<Jump> jumps = VimInjectorKt.injector.getJumpService().getJumps("");
+
+  public void saveJumpLocation(@NotNull Editor editor) {
+    VimInjectorKt.injector.getJumpService().saveJumpLocation(new IjVimEditor(editor));
+  }
+
+  public void saveJumpLocation(@NotNull VimEditor editor) {
+    VimInjectorKt.injector.getJumpService().saveJumpLocation(editor);
+  }
+
+  public void setChangeMarks(@NotNull VimEditor vimEditor, @NotNull TextRange range) {
+    VimMarkService markService = VimInjectorKt.injector.getMarkService();
+    VimMarkServiceKt.setChangeMarks(markService, vimEditor.primaryCaret(), range);
+  }
+
+  public void addJump(@NotNull VimEditor editor, boolean reset) {
+    VimJumpServiceKt.addJump(VimInjectorKt.injector.getJumpService(), editor, reset);
+  }
+
+  @Nullable
+  public Mark getMark(@NotNull VimEditor editor, char ch) {
+    return VimInjectorKt.injector.getMarkService().getMark(editor.primaryCaret(), ch);
+  }
+
+  @Nullable
+  public Jump getJump(int count) {
+    return VimInjectorKt.injector.getJumpService().getJump("", count);
+  }
+
+  @Nullable
+  public Mark createSystemMark(char ch, int line, int col, @NotNull VimEditor editor) {
+    Editor ijEditor = ((IjVimEditor)editor).getEditor();
+    @Nullable LineBookmark systemMark = SystemMarks.createOrGetSystemMark(ch, line, ijEditor);
+    if (systemMark == null) {
+      return null;
+    }
+    return new IntellijMark(systemMark, col, ijEditor.getProject());
+  }
+
+  public boolean setMark(@NotNull VimEditor editor, char ch, int offset) {
+    return VimInjectorKt.injector.getMarkService().setMark(editor.primaryCaret(), ch, offset);
+  }
+
+  public boolean setMark(@NotNull VimEditor editor, char ch) {
+    return VimInjectorKt.injector.getMarkService().setMark(editor, ch);
+  }
+
+  public void includeCurrentCommandAsNavigation(@NotNull VimEditor editor) {
+    VimInjectorKt.injector.getJumpService().includeCurrentCommandAsNavigation(editor);
+  }
+
+  @Nullable
+  public Mark getFileMark(@NotNull VimEditor editor, char ch) {
+    return VimInjectorKt.injector.getMarkService().getMark(editor.primaryCaret(), ch);
+  }
+
+  public void setVisualSelectionMarks(@NotNull VimEditor editor, @NotNull TextRange range) {
+    VimMarkService markService = VimInjectorKt.injector.getMarkService();
+    VimMarkServiceKt.setVisualSelectionMarks(markService, editor.primaryCaret(), range);
+  }
+
+  @Nullable
+  public TextRange getChangeMarks(@NotNull VimEditor editor) {
+    return VimInjectorKt.injector.getMarkService().getChangeMarks(editor.primaryCaret());
+  }
+
+  @Nullable
+  public TextRange getVisualSelectionMarks(@NotNull VimEditor editor) {
+    return VimInjectorKt.injector.getMarkService().getVisualSelectionMarks(editor.primaryCaret());
+  }
+
+  public void resetAllMarks() {
+    VimInjectorKt.injector.getMarkService().resetAllMarks();
+  }
+
+  public void removeMark(char ch, @NotNull Mark mark) {
+    VimInjectorKt.injector.getMarkService().removeMark(ch, mark);
+  }
+
+  @NotNull
+  public List<Mark> getMarks(@NotNull VimEditor editor) {
+    Set<Mark> marks = VimInjectorKt.injector.getMarkService().getAllLocalMarks(editor.primaryCaret());
+    marks.addAll(VimInjectorKt.injector.getMarkService().getGlobalMarks(editor));
+    return new ArrayList<>(marks);
+  }
+
+  public int getJumpSpot() {
+    return VimInjectorKt.injector.getJumpService().getJumpSpot("");
+  }
+
+  public void updateMarkFromDelete(@Nullable VimEditor editor,
+                                   @Nullable HashMap<Character, Mark> marks,
+                                   int delStartOff,
+                                   int delLength) {
+    VimInjectorKt.injector.getMarkService().updateMarksFromDelete(editor, delStartOff, delLength);
+  }
+
+  public void updateMarkFromInsert(@Nullable VimEditor editor,
+                                   @Nullable HashMap<Character, Mark> marks,
+                                   int insStartOff,
+                                   int insLength) {
+    VimInjectorKt.injector.getMarkService().updateMarksFromInsert(editor, insStartOff, insLength);
+  }
+
+  public void dropLastJump() {
+    VimInjectorKt.injector.getJumpService().dropLastJump("");
+  }
+}

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

@@ -8,7 +8,6 @@
 package com.maddyhome.idea.vim.group
 
 import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.components.Service
 import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.LogicalPosition
@@ -84,7 +83,6 @@ import kotlin.math.min
 /**
  * This handles all motion related commands and marks
  */
-@Service
 internal class MotionGroup : VimMotionGroupBase() {
   override fun onAppCodeMovement(editor: VimEditor, caret: VimCaret, offset: Int, oldOffset: Int) {
     AppCodeTemplates.onMovement(editor.ij, caret.ij, oldOffset < offset)

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

@@ -21,7 +21,6 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.KeyboardShortcut
-import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.ide.CopyPasteManager
 import com.intellij.openapi.keymap.KeymapUtil
@@ -56,7 +55,6 @@ import javax.swing.KeyStroke
  * This service is can be used as application level and as project level service.
  * If project is null, this means that this is an application level service and notification will be shown for all projects
  */
-@Service(Service.Level.PROJECT, Service.Level.APP)
 internal class NotificationService(private val project: Project?) {
   // This constructor is used to create an applicationService
   @Suppress("unused")
@@ -278,7 +276,7 @@ internal class NotificationService(private val project: Project?) {
       }
 
       if (id != null) {
-        ActionTracker.Util.logTrackedAction(id)
+        ActionTracker.logTrackedAction(id)
       }
     }
 
@@ -286,7 +284,7 @@ internal class NotificationService(private val project: Project?) {
       override fun actionPerformed(e: AnActionEvent) {
         CopyPasteManager.getInstance().setContents(StringSelection(id ?: ""))
         if (id != null) {
-          ActionTracker.Util.logCopiedAction(id)
+          ActionTracker.logCopiedAction(id)
         }
         notification?.expire()
 

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

@@ -65,28 +65,28 @@ internal class OptionGroup : VimOptionGroupBase(), IjVimOptionGroup {
   }
 }
 
-public class IjOptionConstants {
+internal class IjOptionConstants {
   @Suppress("SpellCheckingInspection", "MemberVisibilityCanBePrivate", "ConstPropertyName")
-  public companion object {
+  companion object {
 
-    public const val idearefactormode_keep: String = "keep"
+    const val idearefactormode_keep = "keep"
-    public const val idearefactormode_select: String = "select"
+    const val idearefactormode_select = "select"
-    public const val idearefactormode_visual: String = "visual"
+    const val idearefactormode_visual = "visual"
 
-    public const val ideastatusicon_enabled: String = "enabled"
+    const val ideastatusicon_enabled = "enabled"
-    public const val ideastatusicon_gray: String = "gray"
+    const val ideastatusicon_gray = "gray"
-    public const val ideastatusicon_disabled: String = "disabled"
+    const val ideastatusicon_disabled = "disabled"
 
-    public const val ideavimsupport_dialog: String = "dialog"
+    const val ideavimsupport_dialog = "dialog"
-    public const val ideavimsupport_singleline: String = "singleline"
+    const val ideavimsupport_singleline = "singleline"
-    public const val ideavimsupport_dialoglegacy: String = "dialoglegacy"
+    const val ideavimsupport_dialoglegacy = "dialoglegacy"
 
-    public const val ideawrite_all: String = "all"
+    const val ideawrite_all = "all"
-    public const val ideawrite_file: String = "file"
+    const val ideawrite_file = "file"
 
-    public val ideaStatusIconValues: Set<String> = setOf(ideastatusicon_enabled, ideastatusicon_gray, ideastatusicon_disabled)
+    val ideaStatusIconValues = setOf(ideastatusicon_enabled, ideastatusicon_gray, ideastatusicon_disabled)
-    public val ideaRefactorModeValues: Set<String> = setOf(idearefactormode_keep, idearefactormode_select, idearefactormode_visual)
+    val ideaRefactorModeValues = setOf(idearefactormode_keep, idearefactormode_select, idearefactormode_visual)
-    public val ideaWriteValues: Set<String> = setOf(ideawrite_all, ideawrite_file)
+    val ideaWriteValues = setOf(ideawrite_all, ideawrite_file)
-    public val ideavimsupportValues: Set<String> = setOf(ideavimsupport_dialog, ideavimsupport_singleline, ideavimsupport_dialoglegacy)
+    val ideavimsupportValues = setOf(ideavimsupport_dialog, ideavimsupport_singleline, ideavimsupport_dialoglegacy)
   }
 }

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

@@ -20,7 +20,6 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.util.execution.ParametersListUtil
 import com.intellij.util.text.CharSequenceReader
 import com.maddyhome.idea.vim.KeyHandler.Companion.getInstance
-import com.maddyhome.idea.vim.KeyProcessResult
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
@@ -38,6 +37,7 @@ import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.Mode.NORMAL
 import com.maddyhome.idea.vim.state.mode.Mode.VISUAL
 import com.maddyhome.idea.vim.state.mode.ReturnableFromCmd
+import com.maddyhome.idea.vim.state.mode.mode
 import com.maddyhome.idea.vim.ui.ex.ExEntryPanel
 import com.maddyhome.idea.vim.vimscript.model.CommandLineVimLContext
 import java.io.BufferedWriter
@@ -51,8 +51,6 @@ import javax.swing.SwingUtilities
 public class ProcessGroup : VimProcessGroupBase() {
   override var lastCommand: String? = null
     private set
-  override var isCommandProcessing: Boolean = false
-  override var modeBeforeCommandProcessing: Mode? = null
 
   public override fun startSearchCommand(editor: VimEditor, context: ExecutionContext, count: Int, leader: Char) {
     // Don't allow searching in one line editors
@@ -81,31 +79,26 @@ public class ProcessGroup : VimProcessGroupBase() {
       "Cannot enable cmd mode from current mode $currentMode"
     }
 
-    isCommandProcessing = true
-    modeBeforeCommandProcessing = currentMode
     val initText = getRange(editor, cmd)
     injector.markService.setVisualSelectionMarks(editor)
-    editor.mode = Mode.CMD_LINE(currentMode)
+    editor.vimStateMachine.mode = Mode.CMD_LINE(currentMode)
     val panel = ExEntryPanel.getInstance()
     panel.activate(editor.ij, context.ij, ":", initText, 1)
   }
 
-  public override fun processExKey(editor: VimEditor, stroke: KeyStroke, processResultBuilder: KeyProcessResult.KeyProcessResultBuilder): Boolean {
+  public override fun processExKey(editor: VimEditor, stroke: KeyStroke): Boolean {
     // This will only get called if somehow the key focus ended up in the editor while the ex entry window
     // is open. So I'll put focus back in the editor and process the key.
 
     val panel = ExEntryPanel.getInstance()
     if (panel.isActive) {
-      processResultBuilder.addExecutionStep { _, _, _ ->
+      requestFocus(panel.entry)
-        requestFocus(panel.entry)
+      panel.handleKey(stroke)
-        panel.handleKey(stroke)
+
-      }
       return true
     } else {
-      processResultBuilder.addExecutionStep { _, lambdaEditor, _ ->
+      getInstance(editor).mode = NORMAL()
-        lambdaEditor.mode = NORMAL()
+      getInstance().reset(editor)
-        getInstance().reset(lambdaEditor)
-      }
       return false
     }
   }
@@ -115,7 +108,7 @@ public class ProcessGroup : VimProcessGroupBase() {
     panel.deactivate(true)
     var res = true
     try {
-      editor.mode = NORMAL()
+      getInstance(editor).mode = NORMAL()
 
       logger.debug("processing command")
 
@@ -141,9 +134,6 @@ public class ProcessGroup : VimProcessGroupBase() {
       logger.error(bad)
       VimPlugin.indicateError()
       res = false
-    } finally {
-      isCommandProcessing = false
-      modeBeforeCommandProcessing = null
     }
 
     return res
@@ -155,7 +145,7 @@ public class ProcessGroup : VimProcessGroupBase() {
   }
 
   public override fun cancelExEntry(editor: VimEditor, resetCaret: Boolean) {
-    editor.mode = NORMAL()
+    editor.vimStateMachine.mode = NORMAL()
     getInstance().reset(editor)
     val panel = ExEntryPanel.getInstance()
     panel.deactivate(true, resetCaret)
@@ -165,7 +155,7 @@ public class ProcessGroup : VimProcessGroupBase() {
     val initText = getRange(editor, cmd) + "!"
     val currentMode = editor.mode
     check(currentMode is ReturnableFromCmd) { "Cannot enable cmd mode from $currentMode" }
-    editor.mode = Mode.CMD_LINE(currentMode)
+    editor.vimStateMachine.mode = Mode.CMD_LINE(currentMode)
     val panel = ExEntryPanel.getInstance()
     panel.activate(editor.ij, context.ij, ":", initText, 1)
   }

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

@@ -14,9 +14,9 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
 import com.maddyhome.idea.vim.VimPlugin;
+import com.maddyhome.idea.vim.state.mode.SelectionType;
 import com.maddyhome.idea.vim.register.Register;
 import com.maddyhome.idea.vim.register.VimRegisterGroupBase;
-import com.maddyhome.idea.vim.state.mode.SelectionType;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -37,10 +37,6 @@ public class RegisterGroup extends VimRegisterGroupBase implements PersistentSta
 
   private static final Logger logger = Logger.getInstance(RegisterGroup.class);
 
-  public RegisterGroup() {
-    this.initClipboardOptionListener();
-  }
-
   public void saveData(final @NotNull Element element) {
     logger.debug("Save registers data");
     final Element registersElement = new Element("registers");

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

@@ -21,6 +21,8 @@ import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.event.DocumentListener;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.util.Ref;
 import com.maddyhome.idea.vim.VimPlugin;
 import com.maddyhome.idea.vim.api.*;
@@ -31,7 +33,9 @@ import com.maddyhome.idea.vim.ex.ExException;
 import com.maddyhome.idea.vim.ex.ranges.LineRange;
 import com.maddyhome.idea.vim.helper.*;
 import com.maddyhome.idea.vim.history.HistoryConstants;
-import com.maddyhome.idea.vim.newapi.*;
+import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext;
+import com.maddyhome.idea.vim.newapi.IjVimCaret;
+import com.maddyhome.idea.vim.newapi.IjVimEditor;
 import com.maddyhome.idea.vim.options.GlobalOptionChangeListener;
 import com.maddyhome.idea.vim.regexp.CharPointer;
 import com.maddyhome.idea.vim.regexp.CharacterClasses;
@@ -56,47 +60,36 @@ import java.text.ParsePosition;
 import java.util.*;
 
 import static com.maddyhome.idea.vim.api.VimInjectorKt.*;
+import static com.maddyhome.idea.vim.helper.HelperKt.localEditors;
 import static com.maddyhome.idea.vim.helper.SearchHelperKtKt.shouldIgnoreCase;
-import static com.maddyhome.idea.vim.newapi.IjVimInjectorKt.globalIjOptions;
 import static com.maddyhome.idea.vim.register.RegisterConstants.LAST_SEARCH_REGISTER;
 
 @State(name = "VimSearchSettings", storages = {
   @Storage(value = "$APP_CONFIG$/vim_settings_local.xml", roamingType = RoamingType.DISABLED)
 })
-@Deprecated
+public class SearchGroup extends VimSearchGroupBase implements PersistentStateComponent<Element> {
-/**
- * @deprecated Replace with IjVimSearchGroup
- */
-public class SearchGroup extends IjVimSearchGroup implements PersistentStateComponent<Element> {
   public SearchGroup() {
-    super();
+    // TODO: Investigate migrating these listeners to use the effective value change listener
-    if (!globalIjOptions(injector).getUseNewRegex()) {
+    // This would allow us to update the editor we're told to update, rather than looping over all projects and updating
-      // TODO: Investigate migrating these listeners to use the effective value change listener
+    // the highlights in that project's current document's open editors (see VIM-2779).
-      // This would allow us to update the editor we're told to update, rather than looping over all projects and updating
+    // However, we probably only want to update the editors associated with the current document, so maybe the whole
-      // the highlights in that project's current document's open editors (see VIM-2779).
+    // code needs to be reworked. We're currently using the same update code for changes in the search term as well as
-      // However, we probably only want to update the editors associated with the current document, so maybe the whole
+    // changes in the search options.
-      // code needs to be reworked. We're currently using the same update code for changes in the search term as well as
+    VimPlugin.getOptionGroup().addGlobalOptionChangeListener(Options.hlsearch, () -> {
-      // changes in the search options.
+      resetShowSearchHighlight();
-      VimPlugin.getOptionGroup().addGlobalOptionChangeListener(Options.hlsearch, () -> {
+      forceUpdateSearchHighlights();
-        resetShowSearchHighlight();
+    });
-        forceUpdateSearchHighlights();
-      });
 
-      final GlobalOptionChangeListener updateHighlightsIfVisible = () -> {
+    final GlobalOptionChangeListener updateHighlightsIfVisible = () -> {
-        if (showSearchHighlight) {
+      if (showSearchHighlight) {
-          forceUpdateSearchHighlights();
+        forceUpdateSearchHighlights();
-        }
+      }
-      };
+    };
-      VimPlugin.getOptionGroup().addGlobalOptionChangeListener(Options.ignorecase, updateHighlightsIfVisible);
+    VimPlugin.getOptionGroup().addGlobalOptionChangeListener(Options.ignorecase, updateHighlightsIfVisible);
-      VimPlugin.getOptionGroup().addGlobalOptionChangeListener(Options.smartcase, updateHighlightsIfVisible);
+    VimPlugin.getOptionGroup().addGlobalOptionChangeListener(Options.smartcase, updateHighlightsIfVisible);
-    }
   }
 
   public void turnOn() {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.updateSearchHighlights(false);
-      return;
-    }
     updateSearchHighlights();
   }
 
@@ -107,12 +100,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
   }
 
   @TestOnly
-  @Override
   public void resetState() {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.resetState();
-      return;
-    }
     lastPatternIdx = RE_SEARCH;
     lastSearch = lastSubstitute = lastReplace = null;
     lastPatternOffset = "";
@@ -126,9 +114,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    *
    * @return The pattern used for last search. Can be null
    */
-  @Override
   public @Nullable String getLastSearchPattern() {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.getLastSearchPattern();
     return lastSearch;
   }
 
@@ -136,9 +122,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    * Get the last pattern used in substitution.
    * @return The pattern used for the last substitute command. Can be null
    */
-  @Override
   public @Nullable String getLastSubstitutePattern() {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.getLastSubstitutePattern();
     return lastSubstitute;
   }
 
@@ -147,9 +131,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    *
    * @return The pattern last used for either searching or substitution. Can be null
    */
-  @Override
+  public @Nullable String getLastUsedPattern() {
-  protected @Nullable String getLastUsedPattern() {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.getLastUsedPattern();
     switch (lastPatternIdx) {
       case RE_SEARCH: return lastSearch;
       case RE_SUBST:  return lastSubstitute;
@@ -213,10 +195,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
   @Override
   public void setLastSearchState(@SuppressWarnings("unused") @NotNull VimEditor editor, @NotNull String pattern,
                                  @NotNull String patternOffset, Direction direction) {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.setLastSearchState(pattern, patternOffset, direction);
-      return;
-    }
     setLastUsedPattern(pattern, RE_SEARCH, true);
     lastIgnoreSmartCase = false;
     lastPatternOffset = patternOffset;
@@ -248,7 +226,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
                                                  int startLine,
                                                  int endLine,
                                                  boolean ignoreCase) {
-    return injector.getSearchHelper().findAll(new IjVimEditor(editor), pattern, startLine, endLine, ignoreCase);
+    return SearchHelper.findAll(editor, pattern, startLine, endLine, ignoreCase);
   }
 
   /**
@@ -276,8 +254,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    */
   @Override
   public int processSearchCommand(@NotNull VimEditor editor, @NotNull String command, int startOffset, @NotNull Direction dir) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.processSearchCommand(editor, command, startOffset, dir);
-
     boolean isNewPattern = false;
     String pattern = null;
     String patternOffset = null;
@@ -438,7 +414,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    */
   @Override
   public int searchWord(@NotNull VimEditor editor, @NotNull ImmutableVimCaret caret, int count, boolean whole, @NotNull Direction dir) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.searchWord(editor, caret, count, whole, dir);
     TextRange range = SearchHelper.findWordUnderCursor(((IjVimEditor)editor).getEditor(), ((IjVimCaret)caret).getCaret());
     if (range == null) {
       logger.warn("No range was found");
@@ -480,7 +455,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    */
   @Override
   public int searchNext(@NotNull VimEditor editor, @NotNull ImmutableVimCaret caret, int count) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.searchNext(editor, caret, count);
     return searchNextWithDirection(((IjVimEditor)editor).getEditor(), ((IjVimCaret)caret).getCaret(), count, lastDir);
   }
 
@@ -497,7 +471,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    */
   @Override
   public int searchPrevious(@NotNull VimEditor editor, @NotNull ImmutableVimCaret caret, int count) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.searchPrevious(editor, caret, count);
     return searchNextWithDirection(((IjVimEditor)editor).getEditor(), ((IjVimCaret)caret).getCaret(), count,
                                    lastDir.reverse());
   }
@@ -551,8 +524,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
                                           @NotNull @NonNls String excmd,
                                           @NotNull @NonNls String exarg,
                                           @NotNull VimLContext parent) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.processSubstituteCommand(editor, caret, range, excmd, exarg, parent);
-
     // Explicitly exit visual mode here, so that visual mode marks don't change when we move the cursor to a match.
     List<ExException> exceptions = new ArrayList<>();
     if (CommandStateHelper.inVisualMode(((IjVimEditor) editor).getEditor())) {
@@ -716,7 +687,8 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
       return false;
     }
 
-    Pair<Boolean, Triple<Object, String, Object>> booleanregmmatch_tPair = search_regcomp(pat, which_pat, RE_SUBST);
+    Pair<Boolean, Triple<Object, String, Object>> booleanregmmatch_tPair = search_regcomp(pat, which_pat,
+                                                                                          RE_SUBST);
     if (!booleanregmmatch_tPair.getFirst()) {
       if (do_error) {
         VimPlugin.showMessage(MessageHelper.message(Msg.e_invcmd));
@@ -724,9 +696,9 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
       }
       return false;
     }
-    RegExp.regmmatch_T regmatch = (RegExp.regmmatch_T)booleanregmmatch_tPair.getSecond().getFirst();
+    RegExp.regmmatch_T regmatch = (RegExp.regmmatch_T) booleanregmmatch_tPair.getSecond().getFirst();
     String pattern = booleanregmmatch_tPair.getSecond().getSecond();
-    RegExp sp = (RegExp)booleanregmmatch_tPair.getSecond().getThird();
+    RegExp sp = (RegExp) booleanregmmatch_tPair.getSecond().getThird();
 
     /* the 'i' or 'I' flag overrules 'ignorecase' and 'smartcase' */
     if (do_ic == 'i') {
@@ -759,8 +731,8 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
     resetShowSearchHighlight();
     forceUpdateSearchHighlights();
 
-    int start = ((IjVimEditor)editor).getEditor().getDocument().getLineStartOffset(line1);
+    int start = ((IjVimEditor) editor).getEditor().getDocument().getLineStartOffset(line1);
-    int end = ((IjVimEditor)editor).getEditor().getDocument().getLineEndOffset(line2);
+    int end = ((IjVimEditor) editor).getEditor().getDocument().getLineEndOffset(line2);
 
     if (logger.isDebugEnabled()) {
       logger.debug("search range=[" + start + "," + end + "]");
@@ -783,6 +755,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
           firstMatch = false;
         }
 
+
         String match = sp.vim_regsub_multi(regmatch, lnum, sub, 1, false);
         if (sub.charAt(0) == '\\' && sub.charAt(1) == '=') {
           String exprString = sub.toString().substring(2);
@@ -791,25 +764,22 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
             exceptions.add(new ExException("E15: Invalid expression: " + exprString));
             expression = new SimpleExpression(new VimString(""));
           }
-        }
+        } else if (match == null) {
-        else if (match == null) {
           return false;
         }
 
         int line = lnum + regmatch.startpos[0].lnum;
         CharacterPosition startpos = new CharacterPosition(lnum + regmatch.startpos[0].lnum, regmatch.startpos[0].col);
         CharacterPosition endpos = new CharacterPosition(lnum + regmatch.endpos[0].lnum, regmatch.endpos[0].col);
-        int startoff = startpos.toOffset(((IjVimEditor)editor).getEditor());
+        int startoff = startpos.toOffset(((IjVimEditor) editor).getEditor());
-        int endoff = endpos.toOffset(((IjVimEditor)editor).getEditor());
+        int endoff = endpos.toOffset(((IjVimEditor) editor).getEditor());
 
         if (do_all || line != lastLine) {
           boolean doReplace = true;
           if (do_ask) {
-            RangeHighlighter hl =
+            RangeHighlighter hl = SearchHighlightsHelper.addSubstitutionConfirmationHighlight(((IjVimEditor) editor).getEditor(), startoff, endoff);
-              SearchHighlightsHelper.addSubstitutionConfirmationHighlight(((IjVimEditor)editor).getEditor(), startoff,
+            final ReplaceConfirmationChoice choice = confirmChoice(((IjVimEditor) editor).getEditor(), match, ((IjVimCaret) caret).getCaret(), startoff);
-                                                                          endoff);
+            ((IjVimEditor) editor).getEditor().getMarkupModel().removeHighlighter(hl);
-            final ReplaceConfirmationChoice choice = confirmChoice(((IjVimEditor)editor).getEditor(), match, ((IjVimCaret)caret).getCaret(), startoff);
-            ((IjVimEditor)editor).getEditor().getMarkupModel().removeHighlighter(hl);
             switch (choice) {
               case SUBSTITUTE_THIS:
                 doReplace = true;
@@ -832,26 +802,25 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
             }
           }
           if (doReplace) {
-            SubmatchFunctionHandler.Companion.getInstance().setLatestMatch(
+            SubmatchFunctionHandler.Companion.getInstance().setLatestMatch(((IjVimEditor) editor).getEditor().getDocument().getText(new com.intellij.openapi.util.TextRange(startoff, endoff)));
-              ((IjVimEditor)editor).getEditor().getDocument().getText(new com.intellij.openapi.util.TextRange(startoff, endoff)));
             caret.moveToOffset(startoff);
             if (expression != null) {
               try {
-                match =
+              match = expression
-                  expression.evaluate(editor, injector.getExecutionContextManager().onEditor(editor, null), parent).toInsertableString();
+                .evaluate(editor, injector.getExecutionContextManager().onEditor(editor, null), parent)
-              }
+                .toInsertableString();
-              catch (Exception e) {
+              } catch (Exception e) {
-                exceptions.add((ExException)e);
+                exceptions.add((ExException) e);
                 match = "";
               }
             }
 
             String finalMatch = match;
-            ApplicationManager.getApplication().runWriteAction(
+            ApplicationManager.getApplication().runWriteAction(() -> ((IjVimEditor) editor).getEditor().getDocument().replaceString(startoff, endoff,
-              () -> ((IjVimEditor)editor).getEditor().getDocument().replaceString(startoff, endoff, finalMatch));
+                                                                                                        finalMatch));
             lastMatch = startoff;
             int newend = startoff + match.length();
-            newpos = CharacterPosition.Companion.fromOffset(((IjVimEditor)editor).getEditor(), newend);
+            newpos = CharacterPosition.Companion.fromOffset(((IjVimEditor) editor).getEditor(), newend);
 
             lnum += newpos.line - endpos.line;
             line2 += newpos.line - endpos.line;
@@ -906,10 +875,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
 
   @Override
   public void setLastSearchPattern(@Nullable String lastSearchPattern) {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.setLastSearchPattern(lastSearchPattern);
-      return;
-    }
     this.lastSearch = lastSearchPattern;
     if (showSearchHighlight) {
       resetIncsearchHighlights();
@@ -919,10 +884,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
 
   @Override
   public void setLastSubstitutePattern(@Nullable String lastSubstitutePattern) {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.setLastSubstitutePattern(lastSubstitutePattern);
-      return;
-    }
     this.lastSubstitute = lastSubstitutePattern;
   }
 
@@ -932,7 +893,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
                                 int patternOffset,
                                 int startOffset,
                                 @NotNull Direction direction) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.processSearchRange(editor, pattern, patternOffset, startOffset, direction);
     return processSearchRange(((IjVimEditor) editor).getEditor(), pattern, patternOffset, startOffset, direction);
   }
 
@@ -1055,7 +1015,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
    */
   @Override
   public @Nullable TextRange getNextSearchRange(@NotNull VimEditor editor, int count, boolean forwards) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.getNextSearchRange(editor, count, forwards);
     editor.removeSecondaryCarets();
     TextRange current = findUnderCaret(editor);
 
@@ -1087,10 +1046,17 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
     }
   }
 
+  @Override
+  @Nullable
+  public TextRange findUnderCaret(@NotNull VimEditor editor) {
+    final TextRange backSearch = searchBackward(editor, editor.primaryCaret().getOffset().getPoint() + 1, 1);
+    if (backSearch == null) return null;
+    return backSearch.contains(editor.primaryCaret().getOffset().getPoint()) ? backSearch : null;
+  }
+
   @Override
   @Nullable
   public TextRange searchBackward(@NotNull VimEditor editor, int offset, int count) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.searchBackward(editor, offset, count);
     // Backward search returns wrongs end offset for some cases. That's why we should perform additional forward search
     final EnumSet<SearchOptions> searchOptions = EnumSet.of(SearchOptions.WRAP, SearchOptions.WHOLE_FILE, SearchOptions.BACKWARDS);
     final TextRange foundBackward = VimInjectorKt.getInjector().getSearchHelper().findPattern(editor, getLastUsedPattern(), offset, count, searchOptions);
@@ -1108,12 +1074,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
   //
   // *******************************************************************************************************************
   //region Search highlights
-  @Override
   public void clearSearchHighlight() {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.clearSearchHighlight();
-      return;
-    }
     showSearchHighlight = false;
     updateSearchHighlights();
   }
@@ -1133,12 +1094,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
   /**
    * Reset the search highlights to the last used pattern after highlighting incsearch results.
    */
-  @Override
   public void resetIncsearchHighlights() {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.resetIncsearchHighlights();
-      return;
-    }
     SearchHighlightsHelper.updateSearchHighlights(getLastUsedPattern(), lastIgnoreSmartCase, showSearchHighlight, true);
   }
 
@@ -1147,13 +1103,9 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
   }
 
   private void highlightSearchLines(@NotNull Editor editor, int startLine, int endLine) {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.highlightSearchLines(new IjVimEditor(editor), startLine, endLine);
-      return;
-    }
     final String pattern = getLastUsedPattern();
     if (pattern != null) {
-      final List<TextRange> results = injector.getSearchHelper().findAll(new IjVimEditor(editor), pattern, startLine, endLine,
+      final List<TextRange> results = SearchHelper.findAll(editor, pattern, startLine, endLine,
         shouldIgnoreCase(pattern, lastIgnoreSmartCase));
       SearchHighlightsHelper.highlightSearchResults(editor, pattern, results, -1);
     }
@@ -1162,17 +1114,12 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
   /**
    * Updates search highlights when the selected editor changes
    */
-  public void fileEditorManagerSelectionChangedCallback(@SuppressWarnings("unused") @NotNull FileEditorManagerEvent event) {
+  public static void fileEditorManagerSelectionChangedCallback(@SuppressWarnings("unused") @NotNull FileEditorManagerEvent event) {
-    if (globalIjOptions(injector).getUseNewRegex()) {
-      super.updateSearchHighlights(false);
-      return;
-    }
     VimPlugin.getSearch().updateSearchHighlights();
   }
 
   @Override
   public Integer findDecimalNumber(@NotNull String line) {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.findDecimalNumber(line);
     Pair<TextRange, NumberType> searchResult = SearchHelper.findNumberInText(line, 0, false, false, false);
     if (searchResult != null) {
       TextRange range = searchResult.component1();
@@ -1184,7 +1131,6 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
   @NotNull
   @Override
   public Direction getLastSearchDirection() {
-    if (globalIjOptions(injector).getUseNewRegex()) return super.getLastSearchDirection();
     return lastDir;
   }
 
@@ -1196,50 +1142,47 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
     public static DocumentSearchListener INSTANCE = new DocumentSearchListener();
 
     @Contract(pure = true)
-    private DocumentSearchListener() {
+    private DocumentSearchListener () {
     }
 
     @Override
     public void documentChanged(@NotNull DocumentEvent event) {
-      // Loop over all local editors for the changed document, across all projects, and update search highlights.
+      for (Project project : ProjectManager.getInstance().getOpenProjects()) {
-      // Note that the change may have come from a remote guest in Code With Me scenarios (in which case
+        final Document document = event.getDocument();
-      // ClientId.current will be a guest ID), but we don't care - we still need to add/remove highlights for the
-      // changed text. Make sure we only update local editors, though.
-      final Document document = event.getDocument();
-      for (VimEditor vimEditor : injector.getEditorGroup().getEditors(new IjVimDocument(document))) {
-        final Editor editor = ((IjVimEditor)vimEditor).getEditor();
-        Collection<RangeHighlighter> hls = UserDataManager.getVimLastHighlighters(editor);
-        if (hls == null) {
-          continue;
-        }
 
-        if (logger.isDebugEnabled()) {
+        for (Editor editor : localEditors(document, project)) {
-          logger.debug("hls=" + hls);
+          Collection<RangeHighlighter> hls = UserDataManager.getVimLastHighlighters(editor);
-          logger.debug("event=" + event);
+          if (hls == null) {
-        }
+            continue;
-
-        // We can only re-highlight whole lines, so clear any highlights in the affected lines
-        final LogicalPosition startPosition = editor.offsetToLogicalPosition(event.getOffset());
-        final LogicalPosition endPosition = editor.offsetToLogicalPosition(event.getOffset() + event.getNewLength());
-        final int startLineOffset = document.getLineStartOffset(startPosition.line);
-        final int endLineOffset = document.getLineEndOffset(endPosition.line);
-
-        final Iterator<RangeHighlighter> iter = hls.iterator();
-        while (iter.hasNext()) {
-          final RangeHighlighter highlighter = iter.next();
-          if (!highlighter.isValid() ||
-              (highlighter.getStartOffset() >= startLineOffset && highlighter.getEndOffset() <= endLineOffset)) {
-            iter.remove();
-            editor.getMarkupModel().removeHighlighter(highlighter);
           }
-        }
 
-        VimPlugin.getSearch().highlightSearchLines(editor, startPosition.line, endPosition.line);
+          if (logger.isDebugEnabled()) {
+            logger.debug("hls=" + hls);
+            logger.debug("event=" + event);
+          }
 
-        if (logger.isDebugEnabled()) {
+          // We can only re-highlight whole lines, so clear any highlights in the affected lines
-          hls = UserDataManager.getVimLastHighlighters(editor);
+          final LogicalPosition startPosition = editor.offsetToLogicalPosition(event.getOffset());
-          logger.debug("sl=" + startPosition.line + ", el=" + endPosition.line);
+          final LogicalPosition endPosition = editor.offsetToLogicalPosition(event.getOffset() + event.getNewLength());
-          logger.debug("hls=" + hls);
+          final int startLineOffset = document.getLineStartOffset(startPosition.line);
+          final int endLineOffset = document.getLineEndOffset(endPosition.line);
+
+          final Iterator<RangeHighlighter> iter = hls.iterator();
+          while (iter.hasNext()) {
+            final RangeHighlighter highlighter = iter.next();
+            if (!highlighter.isValid() || (highlighter.getStartOffset() >= startLineOffset && highlighter.getEndOffset() <= endLineOffset)) {
+              iter.remove();
+              editor.getMarkupModel().removeHighlighter(highlighter);
+            }
+          }
+
+          VimPlugin.getSearch().highlightSearchLines(editor, startPosition.line, endPosition.line);
+
+          if (logger.isDebugEnabled()) {
+            hls = UserDataManager.getVimLastHighlighters(editor);
+            logger.debug("sl=" + startPosition.line + ", el=" + endPosition.line);
+            logger.debug("hls=" + hls);
+          }
         }
       }
     }
@@ -1331,7 +1274,7 @@ public class SearchGroup extends IjVimSearchGroup implements PersistentStateComp
     if (hasEndOffset) searchOptions.add(SearchOptions.WANT_ENDPOS);
 
     // Uses RE_LAST. We know this is always set before being called
-    TextRange range = injector.getSearchHelper().findPattern(new IjVimEditor(editor), getLastUsedPattern(), startOffset, count, searchOptions);
+    TextRange range = SearchHelper.findPattern(editor, getLastUsedPattern(), startOffset, count, searchOptions);
     if (range == null) {
       logger.warn("No range is found");
       return -1;

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

@@ -111,7 +111,7 @@ internal class JumpsListener(val project: Project) : RecentPlacesListener {
   }
 
   private fun buildJump(place: PlaceInfo): Jump? {
-    val editor = injector.editorGroup.getEditors().firstOrNull { it.ij.virtualFile == place.file } ?: return null
+    val editor = injector.editorGroup.localEditors().firstOrNull { it.ij.virtualFile == place.file } ?: return null
     val offset = place.caretPosition?.startOffset ?: return null
 
     val bufferPosition = editor.offsetToBufferPosition(offset)

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

@@ -7,7 +7,6 @@
  */
 package com.maddyhome.idea.vim.group
 
-import com.intellij.codeWithMe.ClientId
 import com.intellij.ide.bookmark.Bookmark
 import com.intellij.ide.bookmark.BookmarkGroup
 import com.intellij.ide.bookmark.BookmarksListener
@@ -19,7 +18,7 @@ import com.intellij.openapi.components.State
 import com.intellij.openapi.components.Storage
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.editor.Document
-import com.intellij.openapi.editor.EditorFactory
+import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.event.DocumentEvent
 import com.intellij.openapi.editor.event.DocumentListener
 import com.intellij.openapi.fileEditor.FileEditorManager
@@ -29,11 +28,11 @@ import com.intellij.openapi.util.text.StringUtil
 import com.intellij.util.asSafely
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.VimEditorGroup
 import com.maddyhome.idea.vim.api.VimMarkService
 import com.maddyhome.idea.vim.api.VimMarkServiceBase
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.group.SystemMarks.Companion.createOrGetSystemMark
+import com.maddyhome.idea.vim.helper.localEditors
 import com.maddyhome.idea.vim.mark.IntellijMark
 import com.maddyhome.idea.vim.mark.Mark
 import com.maddyhome.idea.vim.mark.VimMark.Companion.create
@@ -178,6 +177,15 @@ internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateCompone
     return createOrGetSystemMark(char, line, col, editor)
   }
 
+  @Deprecated("Please use removeMark with other signature")
+  override fun removeMark(ch: Char, mark: Mark) {
+    if (ch.isGlobalMark()) {
+      removeGlobalMark(ch)
+    } else if (ch.isLocalMark()) {
+      getLocalMarks(mark.filepath).remove(ch)
+    }
+  }
+
   override fun removeGlobalMark(char: Char) {
     val mark = getGlobalMark(char)
     if (mark is IntellijMark) {
@@ -194,10 +202,6 @@ internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateCompone
      * This event indicates that a document is about to be changed. We use this event to update all the
      * editor's marks if text is about to be deleted.
      *
-     * Note that the event is fired for both local changes and changes from remote guests in Code With Me scenarios (in
-     * which case [ClientId.current] will be the remote client). We don't care who caused it, we just need to update the
-     * stored marks.
-     *
      * @param event The change event
      */
     override fun beforeDocumentChange(event: DocumentEvent) {
@@ -205,18 +209,15 @@ internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateCompone
       if (logger.isDebugEnabled) logger.debug("MarkUpdater before, event = $event")
       if (event.oldLength == 0) return
       val doc = event.document
-      val anEditor = getAnyEditorForDocument(doc) ?: return
+      val anEditor = getAnEditor(doc) ?: return
-      injector.markService.updateMarksFromDelete(anEditor, event.offset, event.oldLength)
+      injector.markService
+        .updateMarksFromDelete(IjVimEditor(anEditor), event.offset, event.oldLength)
     }
 
     /**
      * This event indicates that a document was just changed. We use this event to update all the editor's
      * marks if text was just added.
      *
-     * Note that the event is fired for both local changes and changes from remote guests in Code With Me scenarios (in
-     * which case [ClientId.current] will be the remote client). We don't care who caused it, we just need to update the
-     * stored marks.
-     *
      * @param event The change event
      */
     override fun documentChanged(event: DocumentEvent) {
@@ -224,19 +225,19 @@ internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateCompone
       if (logger.isDebugEnabled) logger.debug("MarkUpdater after, event = $event")
       if (event.newLength == 0 || event.newLength == 1 && event.newFragment[0] != '\n') return
       val doc = event.document
-      val anEditor = getAnyEditorForDocument(doc) ?: return
+      val anEditor = getAnEditor(doc) ?: return
-      injector.markService.updateMarksFromInsert(anEditor, event.offset, event.newLength)
+      injector.markService
+        .updateMarksFromInsert(IjVimEditor(anEditor), event.offset, event.newLength)
     }
 
-    /**
+    private fun getAnEditor(doc: Document): Editor? {
-     * Get any editor for the given document
+      val editors = localEditors(doc)
-     *
+      return if (editors.size > 0) {
-     * We need an editor to help calculate offsets for marks, and it doesn't matter which one we use, because they would
+        editors[0]
-     * all return the same results. However, we cannot use [VimEditorGroup.getEditors] because the change might have
+      } else {
-     * come from a remote guest and there might not be an open local editor.
+        null
-     */
+      }
-    private fun getAnyEditorForDocument(doc: Document) =
+    }
-      EditorFactory.getInstance().getEditors(doc).firstOrNull()?.let { IjVimEditor(it) }
   }
 
   class VimBookmarksListener(private val myProject: Project) : BookmarksListener {
@@ -278,6 +279,16 @@ internal class VimMarkServiceImpl : VimMarkServiceBase(), PersistentStateCompone
     }
   }
 
+  /**
+   * COMPATIBILITY-LAYER: Method added
+   * Please see: [doc](https://jb.gg/zo8n0r)
+   *
+   */
+  @Deprecated("Please use method with VimEditor")
+  fun saveJumpLocation(editor: Editor?) {
+    injector.jumpService.saveJumpLocation(IjVimEditor(editor!!))
+  }
+
   companion object {
     private const val SAVE_MARK_COUNT = 20
     private val logger = Logger.getInstance(

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

@@ -8,11 +8,9 @@
 
 package com.maddyhome.idea.vim.group
 
-import com.intellij.openapi.components.Service
 import org.apache.commons.codec.binary.Base64
 import org.jdom.Element
 
-@Service
 internal class XMLGroup {
   /**
    * Set the text of an XML element, safely encode it if needed.

src/main/java/com/maddyhome/idea/vim/group/copy/PutGroup.kt

@@ -14,7 +14,6 @@ import com.intellij.ide.DataManager
 import com.intellij.ide.PasteProvider
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.PlatformDataKeys
-import com.intellij.openapi.components.Service
 import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.RangeMarker
 import com.intellij.openapi.editor.ex.EditorEx
@@ -52,7 +51,6 @@ import com.maddyhome.idea.vim.state.mode.isChar
 import com.maddyhome.idea.vim.state.mode.isLine
 import java.awt.datatransfer.DataFlavor
 
-@Service
 internal class PutGroup : VimPutBase() {
 
   override fun getProviderForPasteViaIde(

src/main/java/com/maddyhome/idea/vim/group/visual/IdeaSelectionControl.kt

@@ -20,8 +20,9 @@ import com.maddyhome.idea.vim.helper.exitVisualMode
 import com.maddyhome.idea.vim.helper.hasVisualSelection
 import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.helper.inNormalMode
+import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
 import com.maddyhome.idea.vim.helper.isTemplateActive
-import com.maddyhome.idea.vim.helper.vimDisabled
+import com.maddyhome.idea.vim.helper.vimStateMachine
 import com.maddyhome.idea.vim.listener.VimListenerManager
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.options.OptionConstants
@@ -29,6 +30,7 @@ import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.inNormalMode
 import com.maddyhome.idea.vim.state.mode.inSelectMode
 import com.maddyhome.idea.vim.state.mode.inVisualMode
+import com.maddyhome.idea.vim.state.mode.mode
 import com.maddyhome.idea.vim.vimscript.model.options.helpers.IdeaRefactorModeHelper
 import com.maddyhome.idea.vim.vimscript.model.options.helpers.isIdeaRefactorModeKeep
 import com.maddyhome.idea.vim.vimscript.model.options.helpers.isIdeaRefactorModeSelect
@@ -53,7 +55,9 @@ internal object IdeaSelectionControl {
     selectionSource: VimListenerManager.SelectionSource = VimListenerManager.SelectionSource.OTHER,
   ) {
     VimVisualTimer.singleTask(editor.vim.mode) { initialMode ->
-      if (vimDisabled(editor)) return@singleTask
+
+      if (VimPlugin.isNotEnabled()) return@singleTask
+      if (editor.isIdeaVimDisabledHere) return@singleTask
 
       logger.debug("Adjust non-vim selection. Source: $selectionSource, initialMode: $initialMode")
 
@@ -75,7 +79,7 @@ internal object IdeaSelectionControl {
 
         logger.debug("Some carets have selection. State before adjustment: ${editor.vim.mode}")
 
-        editor.vim.mode = Mode.NORMAL()
+        editor.vim.vimStateMachine.mode = Mode.NORMAL()
 
         activateMode(editor, chooseSelectionMode(editor, selectionSource, true))
       } else {

src/main/java/com/maddyhome/idea/vim/group/visual/VimVisualTimer.kt

@@ -52,13 +52,12 @@ import javax.swing.Timer
  *   editorHasSelection is false. Insert mode ([mode]) has no selection and editor also has no selection, so
  *   no adjustment gets performed and IdeaVim stays in insert mode.
  */
-// Do not remove until it's used in EasyMotion plugin in tests
+internal object VimVisualTimer {
-public object VimVisualTimer {
 
-  public var swingTimer: Timer? = null
+  var swingTimer: Timer? = null
-  public var mode: Mode? = null
+  var mode: Mode? = null
 
-  public inline fun singleTask(currentMode: Mode, crossinline task: (initialMode: Mode?) -> Unit) {
+  inline fun singleTask(currentMode: Mode, crossinline task: (initialMode: Mode?) -> Unit) {
     swingTimer?.stop()
 
     if (mode == null) mode = currentMode
@@ -70,7 +69,7 @@ public object VimVisualTimer {
     swingTimer = timer
   }
 
-  public fun doNow() {
+  fun doNow() {
     val swingTimer1 = swingTimer
     if (swingTimer1 != null) {
       swingTimer1.stop()
@@ -80,12 +79,12 @@ public object VimVisualTimer {
     }
   }
 
-  public fun drop() {
+  fun drop() {
     swingTimer?.stop()
     swingTimer = null
   }
 
-  public inline fun timerAction(task: (initialMode: Mode?) -> Unit) {
+  inline fun timerAction(task: (initialMode: Mode?) -> Unit) {
     task(mode)
     swingTimer = null
     mode = null

src/main/java/com/maddyhome/idea/vim/group/visual/VisualGroup.kt

@@ -12,13 +12,13 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.api.getLineEndForOffset
 import com.maddyhome.idea.vim.api.getLineStartForOffset
+import com.maddyhome.idea.vim.state.mode.Mode
+import com.maddyhome.idea.vim.state.mode.inBlockSelection
 import com.maddyhome.idea.vim.helper.isEndAllowed
 import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
 import com.maddyhome.idea.vim.helper.vimSelectionStart
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.Mode
-import com.maddyhome.idea.vim.state.mode.inBlockSelection
 
 internal fun moveCaretOneCharLeftFromSelectionEnd(editor: Editor, predictedMode: Mode) {
   if (predictedMode !is Mode.VISUAL) {

src/main/java/com/maddyhome/idea/vim/group/visual/VisualMotionGroup.kt

@@ -13,10 +13,10 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimVisualMotionGroupBase
 import com.maddyhome.idea.vim.command.CommandState
+import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.command.engine
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.SelectionType
 
 /**
  * @author Alex Plate

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

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package com.maddyhome.idea.vim.handler
+
+import com.intellij.serviceContainer.BaseKeyedLazyInstance
+import com.intellij.util.SmartList
+import com.intellij.util.xmlb.annotations.Attribute
+import com.maddyhome.idea.vim.command.MappingMode
+import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval
+import javax.swing.KeyStroke
+
+/**
+ * Action holder for IdeaVim actions.
+ *
+ * [implementation] should be subclass of [EditorActionHandlerBase]
+ *
+ * [modes] ("mappingModes") defines the action modes. E.g. "NO" - action works in normal and op-pending modes.
+ *   Warning: V - Visual and Select mode. X - Visual mode. (like vmap and xmap).
+ *   Use "ALL" to enable action for all modes.
+ *
+ * [keys] comma-separated list of keys for the action. E.g. `gt,gT` - action gets executed on `gt` or `gT`
+ * Since xml doesn't allow using raw `<` character, use « and » symbols for mappings with modifiers.
+ *   E.g. `«C-U»` - CTRL-U (<C-U> in vim notation)
+ * If you want to use exactly `<` character, replace it with `&lt;`. E.g. `i&lt;` - i<
+ * If you want to use comma in mapping, use `«COMMA»`
+ * Do not place a whitespace around the comma!
+ *
+ *
+ * !! IMPORTANT !!
+ * You may wonder why the extension points are used instead of any other approach to register actions.
+ *   The reason is startup performance. Using the extension points you don't even have to load classes of actions.
+ *   So, all actions are loaded on demand, including classes in classloader.
+ */
+@Deprecated(message = "Please use CommandOrMotion annotation")
+@ScheduledForRemoval(inVersion = "2.9.0")
+internal class ActionBeanClass : BaseKeyedLazyInstance<EditorActionHandlerBase>() {
+  @Attribute("implementation")
+  var implementation: String? = null
+
+  @Attribute("mappingModes")
+  var modes: String? = null
+
+  @Attribute("keys")
+  var keys: String? = null
+
+  val actionId: String get() = implementation?.let { EditorActionHandlerBase.getActionId(it) } ?: ""
+
+  fun getParsedKeys(): Set<List<KeyStroke>>? {
+    val myKeys = keys ?: return null
+    val escapedKeys = myKeys.splitByComma()
+    return EditorActionHandlerBase.parseKeysSet(escapedKeys)
+  }
+
+  override fun getImplementationClassName(): String? = implementation
+
+  fun getParsedModes(): Set<MappingMode>? {
+    val myModes = modes ?: return null
+
+    if ("ALL" == myModes) return MappingMode.ALL
+
+    val res = mutableListOf<MappingMode>()
+    for (c in myModes) {
+      when (c) {
+        'N' -> res += MappingMode.NORMAL
+        'X' -> res += MappingMode.VISUAL
+        'V' -> {
+          res += MappingMode.VISUAL
+          res += MappingMode.SELECT
+        }
+        'S' -> res += MappingMode.SELECT
+        'O' -> res += MappingMode.OP_PENDING
+        'I' -> res += MappingMode.INSERT
+        'C' -> res += MappingMode.CMD_LINE
+        else -> error("Wrong mapping mode: $c")
+      }
+    }
+    return res.toSet()
+  }
+
+  private fun String.splitByComma(): List<String> {
+    if (this.isEmpty()) return ArrayList()
+    val res = SmartList<String>()
+    var start = 0
+    var current = 0
+    while (current < this.length) {
+      if (this[current] == ',') {
+        res += this.substring(start, current)
+        current++
+        start = current
+      }
+      current++
+    }
+    res += this.substring(start, current)
+    return res
+  }
+}

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

@@ -9,70 +9,42 @@
 package com.maddyhome.idea.vim.handler
 
 import com.intellij.openapi.actionSystem.KeyboardShortcut
-import com.intellij.openapi.components.Service
-import com.intellij.openapi.components.service
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.keymap.Keymap
 import com.intellij.openapi.keymap.KeymapManagerListener
 import com.intellij.openapi.keymap.ex.KeymapManagerEx
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.ProjectActivity
+import com.intellij.openapi.startup.StartupActivity
+import com.intellij.util.SingleAlarm
 import com.jetbrains.rd.util.ConcurrentHashMap
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.api.key
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.channels.BufferOverflow
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.launch
 
 
 // We use alarm with delay to avoid many actions in case many events are fired at the same time
-internal val correctorRequester = MutableSharedFlow<Unit>(replay=1, onBufferOverflow = BufferOverflow.DROP_OLDEST)
+// [VERSION UPDATE] 2023.3+ Replace SingleAlarm with coroutine flows https://youtrack.jetbrains.com/articles/IJPL-A-8/Alarm-Alternative
+internal val correctorRequester = SingleAlarm({ correctCopilotKeymap() }, 1_000)
 
 private val LOG = logger<CopilotKeymapCorrector>()
 
-internal class CopilotKeymapCorrector : ProjectActivity {
+internal class CopilotKeymapCorrector : StartupActivity {
-  override suspend fun execute(project: Project) {
+  override fun runActivity(project: Project) {
-    project.service<CopilotKeymapCorrectorService>().start()
+    correctorRequester.request()
-    correctorRequester.emit(Unit)
   }
 }
 
-/**
- * At the moment of release 2023.3 there is a problem that starting a coroutine like this
- *   right in the project activity will block this project activity in tests.
- * To avoid that, there is an intermediate service that will allow to avoid this issue.
- *
- * However, in general we should start this coroutine right in the [CopilotKeymapCorrector]
- */
-@OptIn(FlowPreview::class)
-@Service(Service.Level.PROJECT)
-internal class CopilotKeymapCorrectorService(private val cs: CoroutineScope) {
-  fun start() {
-    cs.launch {
-      correctorRequester
-        .debounce(5_000)
-        .collectLatest { correctCopilotKeymap() }
-    }
-  }
-}
-
-
 internal class IdeaVimCorrectorKeymapChangedListener : KeymapManagerListener {
   override fun activeKeymapChanged(keymap: Keymap?) {
-    check(correctorRequester.tryEmit(Unit))
+    correctorRequester.request()
   }
 
   override fun shortcutChanged(keymap: Keymap, actionId: String) {
-    check(correctorRequester.tryEmit(Unit))
+    correctorRequester.request()
   }
 
   override fun shortcutChanged(keymap: Keymap, actionId: String, fromSettings: Boolean) {
-    check(correctorRequester.tryEmit(Unit))
+    correctorRequester.request()
   }
 }
 
@@ -95,7 +67,6 @@ private fun correctCopilotKeymap() {
   // This is needed to initialize the injector in case this verification is called to fast
   VimPlugin.getInstance()
 
-  if (!enableOctopus) return
   if (injector.enabler.isEnabled()) {
     val keymap = KeymapManagerEx.getInstanceEx().activeKeymap
     val res = keymap.getShortcuts("copilot.disposeInlays")

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

@@ -34,8 +34,6 @@ internal class EditorHandlersChainLogger : ProjectActivity {
   private val editorHandlers = ExtensionPointName<EditorActionHandlerBean>("com.intellij.editorActionHandler")
 
   override suspend fun execute(project: Project) {
-    if (!enableOctopus) return
-
     val escHandlers = editorHandlers.extensionList
       .filter { it.action == "EditorEscape" }
       .joinToString("\n") { it.implementationClass }