.github/workflows/mergePr.yml

@@ -4,7 +4,6 @@
 name: Update Changelog On PR
 
 on:
-  workflow_dispatch:
   pull_request:
     types: [ closed ]
 
@@ -30,7 +29,7 @@ jobs:
         id: update_authors
         run: ./gradlew updateMergedPr -PprId=${{ github.event.number }}
         env:
-          GITHUB_OAUTH: ${{ secrets.MERGE_PR }}
+          GITHUB_OAUTH: ${{ secrets.AUTOMATION_TOKEN }}
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.github/workflows/mergePrTest.yml

@@ -1,40 +0,0 @@
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
-
-name: Update Changelog On PR (Test)
-
-on:
-  workflow_dispatch:
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 50
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          java-version: '11'
-          distribution: 'adopt'
-          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
-          settings-path: ${{ github.workspace }} # location for the settings.xml file
-
-      - name: Update authors
-        id: update_authors
-        run: ./gradlew updateMergedPr -PprId=525
-        env:
-          GITHUB_OAUTH: ${{ secrets.MERGE_PR }}
-
-#      - name: Commit changes
-#        uses: stefanzweifel/git-auto-commit-action@v4
-#        with:
-#          branch: master
-#          commit_message: Update changelog  after merging PR
-#          commit_user_name: Alex Plate
-#          commit_user_email: aleksei.plate@jetbrains.com
-#          commit_author: Alex Plate <aleksei.plate@jetbrains.com>
-#          file_pattern: CHANGES.md

.github/workflows/updateAuthors.yml

@@ -37,7 +37,7 @@ jobs:
         run: ./gradlew updateAuthors --stacktrace
         env:
           SUCCESS_COMMIT: ${{ steps.last_successful_commit.outputs.commit_hash }}
-          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_OAUTH: ${{ secrets.AUTOMATION_TOKEN }}
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4

.teamcity/_Self/Constants.kt

@@ -13,8 +13,11 @@ object Constants {
   const val PROPERTY_TESTS = "LATEST-EAP-SNAPSHOT"
   const val LONG_RUNNING_TESTS = "LATEST-EAP-SNAPSHOT"
   const val QODANA_TESTS = "LATEST-EAP-SNAPSHOT"
-  const val RELEASE = "LATEST-EAP-SNAPSHOT"
+  const val RELEASE = "2022.1.3"
 
-  const val RELEASE_DEV = "LATEST-EAP-SNAPSHOT"
-  const val RELEASE_EAP = "LATEST-EAP-SNAPSHOT"
+
+  // Use LATEST-EAP-SNAPSHOT only when we'll update the minimum version of IJ to 222+
+  // Because of some API inconcistincies, IdeaVim built on 2022+ won't run on older versions of IJ
+  const val RELEASE_DEV = "2022.1.3"
+  const val RELEASE_EAP = "2022.1.3"
 }

.teamcity/_Self/Project.kt

@@ -1,12 +1,6 @@
 package _Self
 
-import _Self.buildTypes.Compatibility
-import _Self.buildTypes.LongRunning
-import _Self.buildTypes.Nvim
-import _Self.buildTypes.PluginVerifier
-import _Self.buildTypes.PropertyBased
-import _Self.buildTypes.Qodana
-import _Self.buildTypes.TestsForIntelliJEAP
+import _Self.buildTypes.*
 import _Self.subprojects.GitHub
 import _Self.subprojects.OldTests
 import _Self.subprojects.Releases
@@ -16,7 +10,6 @@ import _Self.vcsRoots.Branch_191_193
 import _Self.vcsRoots.Branch_201
 import _Self.vcsRoots.Branch_202
 import _Self.vcsRoots.Branch_203_212
-import _Self.vcsRoots.Branch_213_221
 import _Self.vcsRoots.Branch_Release
 import _Self.vcsRoots.GitHubPullRequest
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
@@ -33,11 +26,11 @@ object Project : Project({
   vcsRoot(Branch_201)
   vcsRoot(Branch_202)
   vcsRoot(Branch_203_212)
-  vcsRoot(Branch_213_221)
   vcsRoot(Branch_Release)
   vcsRoot(GitHubPullRequest)
 
   // Builds
+  buildType(TestsForIntelliJ20213)
   buildType(TestsForIntelliJEAP)
 
   buildType(PropertyBased)
@@ -45,7 +38,6 @@ object Project : Project({
 
   buildType(Nvim)
   buildType(PluginVerifier)
-  buildType(Compatibility)
 
   buildType(Qodana)
 
@@ -55,7 +47,7 @@ object Project : Project({
       type = "CloudImage"
       id = "PROJECT_EXT_768"
       param("agent_pool_id", "41")
-      param("amazon-id", "ami-0fa17ce8238eb8868")
+      param("amazon-id", "ami-0d1a6a32faa92923e")
       param("ebs-optimized", "false")
       param("image-instances-limit", "")
       param("image-name-prefix", "BuildAgentsIdeaVim")

.teamcity/_Self/buildTypes/ActiveTests.kt

@@ -55,4 +55,4 @@ sealed class ActiveTests(buildName: String, ijVersion: String) : BuildType({
 })
 
 object TestsForIntelliJEAP : ActiveTests("Tests for IntelliJ Latest EAP", "LATEST-EAP-SNAPSHOT")
-//object TestsForIntelliJ20213 : ActiveTests("Tests for IntelliJ 2021.3", "2021.3.2")
+object TestsForIntelliJ20213 : ActiveTests("Tests for IntelliJ 2021.3", "2021.3.2")

.teamcity/_Self/buildTypes/Nvim.kt

@@ -31,7 +31,7 @@ object Nvim : BuildType({
     script {
       name = "Set up NeoVim"
       scriptContent = """
-              wget https://github.com/neovim/neovim/releases/download/v0.7.2/nvim-linux64.tar.gz
+              wget https://github.com/neovim/neovim/releases/download/v0.4.4/nvim-linux64.tar.gz
               tar xzf nvim-linux64.tar.gz
               cd nvim-linux64/bin
               chmod +x nvim

.teamcity/_Self/buildTypes/Qodana.kt

@@ -4,7 +4,6 @@ import _Self.Constants.QODANA_TESTS
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.Qodana
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
@@ -47,15 +46,12 @@ object Qodana : BuildType({
       param("clonefinder-enable", "true")
       param("clonefinder-reference-projects", "src")
       param("yaml-configuration", "")
-      linter = jvm {
-        version = Qodana.JVMVersion.LATEST
-      }
     }
   }
 
   triggers {
     vcs {
-      enabled = true
+      enabled = false
       branchFilter = ""
     }
     schedule {

.teamcity/_Self/buildTypes/TestsForIntelliJ_213-221.kt

@@ -1,62 +0,0 @@
-@file:Suppress("ClassName")
-
-package _Self.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
-import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
-import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
-import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
-
-sealed class TestsForIntelliJ_213_221_branch(private val version: String) : BuildType({
-  name = "Tests for IntelliJ $version"
-
-  params {
-    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
-    param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
-    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
-    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
-    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
-  }
-
-  vcs {
-    root(_Self.vcsRoots.Branch_213_221)
-
-    checkoutMode = CheckoutMode.AUTO
-  }
-
-  steps {
-    gradle {
-      tasks = "clean test"
-      buildFile = ""
-      enableStacktrace = true
-      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
-    }
-  }
-
-  triggers {
-    vcs {
-      branchFilter = ""
-    }
-  }
-
-  requirements {
-    noLessThanVer("teamcity.agent.jvm.version", "1.8")
-  }
-
-  failureConditions {
-    failOnMetricChange {
-      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
-      threshold = 20
-      units = BuildFailureOnMetric.MetricUnit.PERCENTS
-      comparison = BuildFailureOnMetric.MetricComparison.LESS
-      compareTo = build {
-        buildRule = lastSuccessful()
-      }
-    }
-  }
-})
-
-
-object TestsForIntelliJ20213 : TestsForIntelliJ_213_221_branch("2021.3.2")

.teamcity/_Self/subprojects/OldTests.kt

@@ -11,7 +11,6 @@ import _Self.buildTypes.TestsForIntelliJ20202
 import _Self.buildTypes.TestsForIntelliJ20203
 import _Self.buildTypes.TestsForIntelliJ20211
 import _Self.buildTypes.TestsForIntelliJ20212
-import _Self.buildTypes.TestsForIntelliJ20213
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
 object OldTests : Project({
@@ -29,5 +28,4 @@ object OldTests : Project({
   buildType(TestsForIntelliJ20203)
   buildType(TestsForIntelliJ20211)
   buildType(TestsForIntelliJ20212)
-  buildType(TestsForIntelliJ20213)
 })

.teamcity/_Self/vcsRoots/Branch_213_221.kt

@@ -1,12 +0,0 @@
-@file:Suppress("ClassName")
-
-package _Self.vcsRoots
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
-
-object Branch_213_221 : GitVcsRoot({
-  id("HttpsGithubComJetBrainsIdeavimBranch213221")
-  name = "https://github.com/JetBrains/ideavim (branch 213-221)"
-  url = "https://github.com/JetBrains/ideavim.git"
-  branch = "213-221"
-})

.teamcity/patches/buildTypes/Build.kts

@@ -1,23 +1,29 @@
-package _Self.buildTypes
+package patches.buildTypes
 
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
-import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.golang
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
 
-object Compatibility : BuildType({
-  id("IdeaVimCompatibility")
-  name = "IdeaVim compatibility with external plugins"
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, create a buildType with id = 'Build'
+in the root project, and delete the patch script.
+*/
+create(DslContext.projectId, BuildType({
+    id("Build")
+    name = "IdeaVim compatibility with external plugins"
 
-  vcs {
-    root(DslContext.settingsRoot)
-  }
+    vcs {
+        root(DslContext.settingsRoot)
+    }
 
-  steps {
-    script {
-      name = "Check"
-      scriptContent = """
+    steps {
+        script {
+            name = "Check"
+            scriptContent = """
                 java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}org.jetbrains.IdeaVim-EasyMotion' [latest-IU] -team-city
                 java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}io.github.mishkun.ideavimsneak' [latest-IU] -team-city
                 java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
@@ -27,23 +33,24 @@ object Compatibility : BuildType({
                 java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
                 java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
             """.trimIndent()
+        }
     }
-  }
 
-  triggers {
-    schedule {
-      schedulingPolicy = daily {
-        hour = 4
-      }
-      branchFilter = ""
-      triggerBuild = always()
-      withPendingChangesOnly = false
+    triggers {
+        schedule {
+            schedulingPolicy = daily {
+                hour = 4
+            }
+            branchFilter = ""
+            triggerBuild = always()
+            withPendingChangesOnly = false
+        }
     }
-  }
 
-  features {
-    golang {
-      testFormat = "json"
+    features {
+        golang {
+            testFormat = "json"
+        }
     }
-  }
-})
+}))
+

.teamcity/patches/buildTypes/Nvim.kts

@@ -0,0 +1,25 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+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 = 'Nvim'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("Nvim")) {
+    triggers {
+        val trigger1 = find<VcsTrigger> {
+            vcs {
+                branchFilter = ""
+            }
+        }
+        trigger1.apply {
+            enabled = false
+
+        }
+    }
+}

.teamcity/patches/buildTypes/PluginVerifier.kts

@@ -0,0 +1,25 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+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 = 'PluginVerifier'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("PluginVerifier")) {
+    triggers {
+        val trigger1 = find<VcsTrigger> {
+            vcs {
+                branchFilter = ""
+            }
+        }
+        trigger1.apply {
+            enabled = false
+
+        }
+    }
+}

.teamcity/patches/buildTypes/Qodana.kts

@@ -2,8 +2,9 @@ package patches.buildTypes
 
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.Qodana
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.ScheduleTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
 
 /*
@@ -15,9 +16,6 @@ changeBuildType(RelativeId("Qodana")) {
     expectSteps {
         qodana {
             name = "Qodana"
-            linter = jvm {
-                version = Qodana.JVMVersion.LATEST
-            }
             param("clonefinder-enable", "true")
             param("clonefinder-languages", "Java")
             param("clonefinder-languages-container", "Java Kotlin")
@@ -31,25 +29,27 @@ changeBuildType(RelativeId("Qodana")) {
         }
     }
     steps {
-        insert(0) {
-            gradle {
-                name = "Generate grammar"
-                tasks = "generateGrammarSource"
-                param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        update<Qodana>(0) {
+            clearConditions()
+            linter = jvm {
+                version = Qodana.JVMVersion.LATEST
             }
         }
-        update<Qodana>(1) {
-            clearConditions()
-            reportAsTests = true
-            argumentsCommandDocker = "-e QODANA_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb24iOiIzUFZrQSIsInByb2plY3QiOiIzN1FlQSIsInRva2VuIjoiM0t2bXoifQ.uohp81tM7iAfvvB6k8faarfpV-OjusAaEbWQ8iNrOgs"
-            argumentsEntryPointDocker = "--baseline qodana.sarif.json"
-            param("clonefinder-languages", "")
-            param("collect-anonymous-statistics", "")
-            param("licenseaudit-enable", "")
-            param("clonefinder-languages-container", "")
-            param("clonefinder-queried-project", "")
-            param("clonefinder-enable", "")
-            param("clonefinder-reference-projects", "")
+    }
+
+    triggers {
+        val trigger1 = find<ScheduleTrigger> {
+            schedule {
+                schedulingPolicy = weekly {
+                    dayOfWeek = ScheduleTrigger.DAY.Tuesday
+                }
+                branchFilter = ""
+                triggerBuild = always()
+            }
+        }
+        trigger1.apply {
+            enabled = false
+
         }
     }
 }

.teamcity/patches/buildTypes/ReleaseEap.kts

@@ -1,27 +0,0 @@
-package patches.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.VcsLabeling
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.vcsLabeling
-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 = 'ReleaseEap'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("ReleaseEap")) {
-    features {
-        val feature1 = find<VcsLabeling> {
-            vcsLabeling {
-                vcsRootId = "${DslContext.settingsRoot.id}"
-                labelingPattern = "%system.build.number%"
-                successfulOnly = true
-                branchFilter = ""
-            }
-        }
-        feature1.apply {
-            successfulOnly = false
-        }
-    }
-}

.teamcity/patches/projects/_Self.kts

@@ -0,0 +1,74 @@
+package patches.projects
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.AmazonEC2CloudImage
+import jetbrains.buildServer.configs.kotlin.v2019_2.AmazonEC2CloudProfile
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+import jetbrains.buildServer.configs.kotlin.v2019_2.amazonEC2CloudImage
+import jetbrains.buildServer.configs.kotlin.v2019_2.amazonEC2CloudProfile
+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) {
+    features {
+        val feature1 = find<AmazonEC2CloudImage> {
+            amazonEC2CloudImage {
+                id = "PROJECT_EXT_768"
+                profileId = "amazon-48"
+                agentPoolId = "41"
+                name = "BuildAgentsIdeaVim"
+                vpcSubnetId = "subnet-58839511"
+                keyPairName = ""
+                instanceType = "c5d.xlarge"
+                securityGroups = listOf("sg-eda08696", "sg-7332cf0f")
+                useSpotInstances = true
+                instanceTags = mapOf(
+                    "project" to "idea-vim"
+                )
+                source = Source("ami-0d1a6a32faa92923e")
+                param("image-instances-limit", "")
+                param("spot-instance-price", "")
+            }
+        }
+        feature1.apply {
+            profileId = "amazon-48"
+            agentPoolId = "41"
+            name = "BuildAgentsIdeaVim"
+            vpcSubnetId = "subnet-58839511"
+            keyPairName = ""
+            instanceType = "c5d.xlarge"
+            securityGroups = listOf("sg-eda08696", "sg-7332cf0f")
+            useSpotInstances = true
+            instanceTags = mapOf(
+                "project" to "idea-vim"
+            )
+            source = Source("ami-0fa17ce8238eb8868")
+        }
+        val feature2 = find<AmazonEC2CloudProfile> {
+            amazonEC2CloudProfile {
+                id = "amazon-48"
+                name = "Cloud Agents - Single Build"
+                terminateAfterBuild = true
+                terminateIdleMinutes = 15
+                region = AmazonEC2CloudProfile.Regions.EU_WEST_DUBLIN
+                maxInstancesCount = 10
+                authType = accessKey {
+                    keyId = "credentialsJSON:dbcdb2a2-de5f-4bc9-9421-292b19e83947"
+                    secretKey = "credentialsJSON:65a87fe7-0977-4af9-96f1-344f2b82d269"
+                }
+                param("agentPushPreset", "")
+            }
+        }
+        feature2.apply {
+            name = "Cloud Agents - Single Build"
+            terminateAfterBuild = true
+            terminateIdleMinutes = 15
+            region = AmazonEC2CloudProfile.Regions.EU_WEST_DUBLIN
+            maxInstancesCount = 10
+        }
+    }
+}

.teamcity/patches/vcsRoots/HttpsGithubComAlexPl292IdeaVimCompatibilityRefsHeadsMaster.kts

@@ -0,0 +1,25 @@
+package patches.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, create a vcsRoot with id = 'HttpsGithubComAlexPl292IdeaVimCompatibilityRefsHeadsMaster'
+in the root project, and delete the patch script.
+*/
+create(DslContext.projectId, GitVcsRoot({
+    id("HttpsGithubComAlexPl292IdeaVimCompatibilityRefsHeadsMaster")
+    name = "https://github.com/AlexPl292/IdeaVimCompatibility#refs/heads/master"
+    url = "https://github.com/AlexPl292/IdeaVimCompatibility"
+    branch = "refs/heads/master"
+    branchSpec = "refs/heads/*"
+    authMethod = password {
+        userName = "AlexPl292"
+        password = "credentialsJSON:43afd6e5-6ad5-4d12-a218-cf1547717a7f"
+    }
+    param("oauthProviderId", "PROJECT_EXT_1")
+    param("useAlternates", "true")
+}))
+

.teamcity/patches/vcsRoots/IdeaVimCompatibility.kts

@@ -0,0 +1,23 @@
+package patches.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, create a vcsRoot with id = 'IdeaVimCompatibility'
+in the root project, and delete the patch script.
+*/
+create(DslContext.projectId, GitVcsRoot({
+    id("IdeaVimCompatibility")
+    name = "IdeaVimCompatibility"
+    url = "git@github.com:AlexPl292/IdeaVimCompatibility.git"
+    branch = "refs/heads/master"
+    authMethod = uploadedKey {
+        userName = "git"
+        uploadedKey = "Alex Plate TeamCity key"
+    }
+    param("useAlternates", "true")
+}))
+

AUTHORS.md

@@ -416,10 +416,6 @@ Contributors:
   [![icon][github]](https://github.com/Vvalter)
    
   Simon Rainer
-* [![icon][mail]](mailto:filipp.vakhitov@jetbrains.com)
-  [![icon][github]](https://github.com/lippfi)
-   
-  lippfi
                         
 If you are a contributor and your name is not listed here, feel free to
 contact the maintainers.

CHANGES.md

@@ -36,7 +36,6 @@ usual beta standards.
   E.g. `<Plug>Commentary` instead of `<Plug>(CommentMotion)`. Old mappings are maintained for compatibility.
 * If you open `~/.ideavimrc` in IDE, remove a mapping, and reload the config using the reload button,
   the mapping will actually be unmapped.
-* New vim (and IdeaVim) behaviour: `ci(`& friends searches for the brackets in the line.
 
 ### Fixes:
 * [VIM-2587](https://youtrack.jetbrains.com/issue/VIM-2587) Use ctrl-6 as ctrl-^
@@ -58,7 +57,6 @@ usual beta standards.
 * [VIM-1862](https://youtrack.jetbrains.com/issue/VIM-1862/Ex-commands-executed-in-keymaps-and-macros-are-added-to-the-command-history) Fix command history
 * [VIM-2227](https://youtrack.jetbrains.com/issue/VIM-2227) Wrong behavior when deleting / changing surround with invalid character
 * [VIM-2691](https://youtrack.jetbrains.com/issue/VIM-2691) Save file on :w
-* [VIM-2710](https://youtrack.jetbrains.com/issue/VIM-2710) Show options value on `set opt`
 
 ### Merged PRs:
 * [468](https://github.com/JetBrains/ideavim/pull/468) by [Thomas Schouten](https://github.com/PHPirates): Implement UserDataHolder for EditorDataContext
@@ -68,8 +66,6 @@ usual beta standards.
 * [494](https://github.com/JetBrains/ideavim/pull/494) by [Matt Ellis](https://github.com/citizenmatt): Cleanup pre-212 CaretVisualAttributes compatibility code
 * [504](https://github.com/JetBrains/ideavim/pull/504) by [Matt Ellis](https://github.com/citizenmatt): Minor bug fixes
 * [519](https://github.com/JetBrains/ideavim/pull/519) by [chylex](https://github.com/chylex): Fix(VIM-2227): Wrong behavior when deleting / changing surround with invalid character
-* [525](https://github.com/JetBrains/ideavim/pull/525) by [Matt Ellis](https://github.com/citizenmatt): Improve handling of fractional width fonts
-* [526](https://github.com/JetBrains/ideavim/pull/526) by [Alex Pláte](https://github.com/AlexPl292): Create gradle.properties
 
 ## 1.10.0, 2022-02-17
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@ IdeaVim is an open source project created by 80+ contributors. Would you like to
 This page is created to help you start contributing. And who knows, maybe in a few days this project will be brighter than ever!
 
 :warning: The plugin is currently under a huge refactoring aiming to split into vim-engine and IdeaVim in order to
-support the new [Fleet IDE](https://www.jetbrains.com/fleet/). Please see [Fleet refactoring](#Fleet-refactoring).
+support the new [Fleet IDE](https://www.jetbrains.com/fleet/).
 
 ## Before you begin
 
@@ -120,17 +120,6 @@ so you can reuse your `.vimrc` settings.
 We also support proper command mappings (functions are mapped to `<Plug>...`), the operator function (`OperatorFunction`), and so on.
 - Magic is supported as well. See `Magic`.
 
-
-## Fleet refactoring
-At the moment, IdeaVim is under an active refactoring aiming to split IdeaVim into two modules: vim-engine and IdeaVim.
-
-If you develop a plugin that depends on IdeaVim: We have an instrument to check that our changes don't affect
-the plugins in the marketplace. Also, we commit to support currently used API at least till the end of 2022.
-If you still encounter any issues with the newer versions of IdeaVim, please [contact maintainers](https://github.com/JetBrains/ideavim#contact-maintainers).
-We kindly ask you not to use anything from the new API (like `VimEditor`, `injector`) because at the moment we don't
-guarantee the compatibility of this API in the future versions.
-
-
 -----
 
 ### I read the whole page but something is still unclear.

build.gradle.kts

@@ -28,7 +28,7 @@ plugins {
     id("org.jetbrains.changelog") version "1.3.1"
 
     // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
-    id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }
 
 // Import variables from gradle.properties file
@@ -71,8 +71,6 @@ dependencies {
     antlr("org.antlr:antlr4:$antlrVersion")
 
     api(project(":vim-engine"))
-
-    testApi("com.squareup.okhttp3:okhttp:4.10.0")
 }
 
 configurations {
@@ -87,8 +85,6 @@ tasks.register<Test>("testWithNeovim") {
     group = "verification"
     systemProperty("ideavim.nvim.test", "true")
     exclude("/ui/**")
-    exclude("**/longrunning/**")
-    exclude("**/propertybased/**")
 }
 
 tasks.register<Test>("testPropertyBased") {
@@ -119,8 +115,6 @@ tasks {
         include("**/*test.class")
         include("**/*Tests.class")
         exclude("**/ParserTest.class")
-        exclude("**/longrunning/**")
-        exclude("**/propertybased/**")
     }
 
     val testPropertyBased by getting(Test::class) {
@@ -150,7 +144,7 @@ tasks {
     compileKotlin {
         kotlinOptions {
             jvmTarget = javaVersion
-            apiVersion = "1.6"
+            apiVersion = "1.5"
             freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
 //            allWarningsAsErrors = true
         }
@@ -158,7 +152,7 @@ tasks {
     compileTestKotlin {
         kotlinOptions {
             jvmTarget = javaVersion
-            apiVersion = "1.6"
+            apiVersion = "1.5"
 //            allWarningsAsErrors = true
         }
     }
@@ -206,7 +200,7 @@ tasks {
     runPluginVerifier {
         downloadDir.set("${project.buildDir}/pluginVerifier/ides")
         teamCityOutputFormat.set(true)
-//        ideVersions.set(listOf("IC-2021.3.4"))
+        ideVersions.set(listOf("IC-2021.3.4"))
     }
 
     generateGrammarSource {
@@ -237,18 +231,12 @@ tasks {
         dependsOn(createOpenApiSourceJar)
         from(createOpenApiSourceJar) { into("lib/src") }
     }
-
-    // Don't forget to update plugin.xml
-    patchPluginXml {
-        sinceBuild.set("222")
-    }
 }
 
 // --- Linting
 
 ktlint {
     disabledRules.add("no-wildcard-imports")
-    version.set("0.43.0")
 }
 
 // --- Tests
@@ -339,8 +327,7 @@ tasks.register("updateAuthors") {
             "aleksei.plate@jetbrains.com",
             "aleksei.plate@teamcity",
             "aleksei.plate@TeamCity",
-            "alex.plate@192.168.0.109",
-            "nikita.koshcheev@TeamCity",
+            "alex.plate@192.168.0.109"
         )
         updateAuthors(uncheckedEmails)
     }
@@ -351,7 +338,6 @@ val prId: String by project
 tasks.register("updateMergedPr") {
     doLast {
         if (project.hasProperty("prId")) {
-            println("Got pr id: $prId")
             updateMergedPr(prId.toInt())
         } else {
             error("Cannot get prId")
@@ -515,9 +501,7 @@ data class Change(val id: String, val text: String)
 
 fun updateMergedPr(number: Int) {
     val gitHub = org.kohsuke.github.GitHub.connect()
-    println("Connecting to the repo...")
     val repository = gitHub.getRepository("JetBrains/ideavim")
-    println("Getting pull requests...")
     val pullRequest = repository.getPullRequest(number)
     if (pullRequest.user.login == "dependabot[bot]") return
 

gradle.properties

@@ -5,10 +5,9 @@ downloadIdeaSources=true
 instrumentPluginCode=true
 version=SNAPSHOT
 javaVersion=11
-remoteRobotVersion=0.11.15
+remoteRobotVersion=0.11.10
 antlrVersion=4.10.1
 
-
 # Please don't forget to update kotlin version in buildscript section
 kotlinVersion=1.6.21
 publishToken=token

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

@@ -101,6 +101,12 @@ public class EventFacade {
     EditorFactory.getInstance().addEditorFactoryListener(listener, parentDisposable);
   }
 
+  @SuppressWarnings("deprecation")
+  public void removeEditorFactoryListener(@NotNull EditorFactoryListener listener) {
+    // Listener is removed not only if application is disposed
+    EditorFactory.getInstance().removeEditorFactoryListener(listener);
+  }
+
   public void addEditorMouseListener(@NotNull Editor editor, @NotNull EditorMouseListener listener) {
     editor.addEditorMouseListener(listener);
   }

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

@@ -19,6 +19,8 @@ package com.maddyhome.idea.vim;
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.ide.plugins.PluginManagerCore;
+import com.intellij.notification.Notification;
+import com.intellij.notification.NotificationListener;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
@@ -30,9 +32,9 @@ import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.ex.KeymapManagerEx;
 import com.intellij.openapi.keymap.impl.DefaultKeymap;
+import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.SystemInfo;
 import com.maddyhome.idea.vim.api.VimInjectorKt;
 import com.maddyhome.idea.vim.api.VimKeyGroup;
@@ -47,6 +49,7 @@ import com.maddyhome.idea.vim.helper.MacKeyRepeat;
 import com.maddyhome.idea.vim.listener.VimListenerManager;
 import com.maddyhome.idea.vim.newapi.IjVimInjector;
 import com.maddyhome.idea.vim.ui.StatusBarIconFactory;
+import com.maddyhome.idea.vim.ui.VimEmulationConfigurable;
 import com.maddyhome.idea.vim.ui.ex.ExEntryPanel;
 import com.maddyhome.idea.vim.vimscript.services.FunctionStorage;
 import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService;
@@ -57,6 +60,8 @@ import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.event.HyperlinkEvent;
+
 import static com.maddyhome.idea.vim.group.EditorGroup.EDITOR_STORE_ELEMENT;
 import static com.maddyhome.idea.vim.group.KeyGroup.SHORTCUT_CONFLICTS_ELEMENT;
 import static com.maddyhome.idea.vim.vimscript.services.VimRcService.executeIdeaVimRc;
@@ -89,8 +94,6 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
 
   private final @NotNull VimState state = new VimState();
 
-  public Disposable onOffDisposable;
-
   VimPlugin() {
     ApplicationConfigurationMigrator.getInstance().migrate();
   }
@@ -338,8 +341,6 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
    *      execution, what theoretically may cause bugs (e.g. VIM-2540)
    */
   private void turnOnPlugin() {
-    onOffDisposable = Disposer.newDisposable(this, "IdeaVimOnOffDisposer");
-
     // 1) Update state
     ApplicationManager.getApplication().invokeLater(this::updateState);
 
@@ -375,8 +376,6 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
 
     // Unregister vim actions in command mode
     RegisterActions.unregisterActions();
-
-    Disposer.dispose(onOffDisposable);
   }
 
   private boolean stateUpdated = false;
@@ -390,9 +389,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
         final Boolean enabled = keyRepeat.isEnabled();
         final Boolean isKeyRepeat = getEditor().isKeyRepeat();
         if ((enabled == null || !enabled) && (isKeyRepeat == null || isKeyRepeat)) {
-          // This system property is used in IJ ui robot to hide the startup tips
-          boolean showNotification = Boolean.getBoolean("ide.show.tips.on.startup.default.value");
-          if (showNotification && VimPlugin.getNotifications().enableRepeatingMode() == Messages.YES) {
+          if (VimPlugin.getNotifications().enableRepeatingMode() == Messages.YES) {
             getEditor().setKeyRepeat(true);
             keyRepeat.setEnabled(true);
           }
@@ -411,6 +408,12 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
           keymap = manager.getKeymap(DefaultKeymap.getInstance().getDefaultKeymapName());
         }
         assert keymap != null : "Default keymap not found";
+        VimPlugin.getNotifications().specialKeymap(keymap, new NotificationListener.Adapter() {
+          @Override
+          protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) {
+            ShowSettingsUtil.getInstance().showSettingsDialog(null, VimEmulationConfigurable.class);
+          }
+        });
         manager.setActiveKeymap(keymap);
       }
       if (previousStateVersion > 0 && previousStateVersion < 4) {

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

@@ -45,7 +45,7 @@ class DeleteJoinLinesAction : ChangeEditorActionHandler.SingleExecution() {
     val res = arrayOf(true)
     editor.forEachNativeCaret(
       { caret: VimCaret ->
-        if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, false, operatorArguments)) res[0] = false
+        if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, false)) res[0] = false
       },
       true
     )

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

@@ -45,7 +45,7 @@ class DeleteJoinLinesSpacesAction : ChangeEditorActionHandler.SingleExecution()
     val res = arrayOf(true)
     editor.forEachNativeCaret(
       { caret: VimCaret ->
-        if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, true, operatorArguments)) res[0] = false
+        if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, true)) res[0] = false
       },
       true
     )

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

@@ -57,14 +57,7 @@ class DeleteJoinVisualLinesAction : VisualOperatorActionHandler.SingleExecution(
         caret: VimCaret ->
         if (!caret.isValid) return@forEachNativeCaret
         val range = caretsAndSelections[caret] ?: return@forEachNativeCaret
-        if (!injector.changeGroup.deleteJoinRange(
-            editor,
-            caret,
-            range.toVimTextRange(true).normalize(),
-            false,
-            operatorArguments
-          )
-        ) {
+        if (!injector.changeGroup.deleteJoinRange(editor, caret, range.toVimTextRange(true).normalize(), false)) {
           res[0] = false
         }
       }, true

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

@@ -56,14 +56,7 @@ class DeleteJoinVisualLinesSpacesAction : VisualOperatorActionHandler.SingleExec
       { caret: VimCaret ->
         if (!caret.isValid) return@forEachNativeCaret
         val range = caretsAndSelections[caret] ?: return@forEachNativeCaret
-        if (!injector.changeGroup.deleteJoinRange(
-            editor,
-            caret,
-            range.toVimTextRange(true).normalize(),
-            true,
-            operatorArguments
-          )
-        ) {
+        if (!injector.changeGroup.deleteJoinRange(editor, caret, range.toVimTextRange(true).normalize(), true)) {
           res[0] = false
         }
       },

src/main/java/com/maddyhome/idea/vim/action/internal/AddBlockInlaysAction.kt

@@ -18,7 +18,6 @@
 package com.maddyhome.idea.vim.action.internal
 
 import com.intellij.ide.ui.AntialiasingType
-import com.intellij.ide.ui.UISettings
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
@@ -125,7 +124,7 @@ class AddBlockInlaysAction : AnAction() {
         val editorContext = FontInfo.getFontRenderContext(editor.contentComponent)
         return FontRenderContext(
           editorContext.transform, AntialiasingType.getKeyForCurrentScope(false),
-          if (editor is EditorImpl) UISettings.editorFractionalMetricsHint else RenderingHints.VALUE_FRACTIONALMETRICS_OFF
+          if (editor is EditorImpl) editor.myFractionalMetricsHintValue else RenderingHints.VALUE_FRACTIONALMETRICS_OFF
         )
       }
 

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

@@ -24,7 +24,6 @@ import com.maddyhome.idea.vim.newapi.vim
 
 /**
  * COMPATIBILITY-LAYER: Additional class
- * Please see: https://jb.gg/zo8n0r
  */
 class CommandState(private val machine: VimStateMachine) {
 

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

@@ -61,7 +61,6 @@ object VimExtensionFacade {
 
   /**
    * COMPATIBILITY-LAYER: Additional method
-   * Please see: https://jb.gg/zo8n0r
    */
   /** The 'map' command for mapping keys to handlers defined in extensions. */
   @JvmStatic

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

@@ -26,7 +26,6 @@ import com.maddyhome.idea.vim.newapi.ij
 
 /**
  * COMPATIBILITY-LAYER: Created a class, renamed original class
- * Please see: https://jb.gg/zo8n0r
  */
 interface VimExtensionHandler : ExtensionHandler {
   override fun execute(editor: VimEditor, context: ExecutionContext) {

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

@@ -44,18 +44,18 @@ import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.common.CommandAlias
 import com.maddyhome.idea.vim.common.CommandAliasHandler
+import com.maddyhome.idea.vim.key.CommandNode
+import com.maddyhome.idea.vim.key.CommandPartNode
+import com.maddyhome.idea.vim.key.Node
+import com.maddyhome.idea.vim.key.RootNode
+import com.maddyhome.idea.vim.key.addLeafs
 import com.maddyhome.idea.vim.ex.ranges.Ranges
 import com.maddyhome.idea.vim.extension.VimExtension
 import com.maddyhome.idea.vim.group.KeyGroup
 import com.maddyhome.idea.vim.helper.MessageHelper
 import com.maddyhome.idea.vim.helper.runAfterGotFocus
-import com.maddyhome.idea.vim.key.CommandNode
-import com.maddyhome.idea.vim.key.CommandPartNode
 import com.maddyhome.idea.vim.key.MappingOwner
-import com.maddyhome.idea.vim.key.Node
 import com.maddyhome.idea.vim.key.RequiredShortcut
-import com.maddyhome.idea.vim.key.RootNode
-import com.maddyhome.idea.vim.key.addLeafs
 import com.maddyhome.idea.vim.newapi.ij
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString

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

@@ -26,7 +26,6 @@ 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.command.OperatorArguments
 import com.maddyhome.idea.vim.command.SelectionType
 import com.maddyhome.idea.vim.command.VimStateMachine
 import com.maddyhome.idea.vim.command.isLine
@@ -39,10 +38,8 @@ import com.maddyhome.idea.vim.extension.VimExtensionFacade.putKeyMappingIfMissin
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.setOperatorFunction
 import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.helper.EditorDataContext
-import com.maddyhome.idea.vim.helper.editorMode
 import com.maddyhome.idea.vim.helper.mode
 import com.maddyhome.idea.vim.helper.subMode
-import com.maddyhome.idea.vim.helper.vimStateMachine
 import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.newapi.IjExecutionContext
 import com.maddyhome.idea.vim.newapi.IjVimEditor
@@ -174,15 +171,7 @@ class ReplaceWithRegister : VimExtension {
         putToLine = -1
       )
       ClipboardOptionHelper.IdeaputDisabler().use {
-        VimPlugin.getPut().putText(
-          IjVimEditor(editor),
-          IjExecutionContext(EditorDataContext.init(editor)),
-          putData,
-          operatorArguments = OperatorArguments(
-            editor.vimStateMachine?.isOperatorPending ?: false,
-            0, editor.editorMode, editor.subMode
-          )
-        )
+        VimPlugin.getPut().putText(IjVimEditor(editor), IjExecutionContext(EditorDataContext.init(editor)), putData)
       }
 
       caret.registerStorage.saveRegister(savedRegister.name, savedRegister)

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

@@ -245,7 +245,7 @@ public class ChangeGroup extends VimChangeGroupBase {
         final boolean lastWordChar =
           offset >= fileSize - 1 || CharacterHelper.charType(chars.charAt(offset + 1), bigWord) != charType;
         if (wordMotions.contains(id) && lastWordChar && motion.getCount() == 1) {
-          final boolean res = deleteCharacter(editor, caret, 1, true, operatorArguments);
+          final boolean res = deleteCharacter(editor, caret, 1, true);
           if (res) {
             editor.setVimChangeActionSwitchMode(VimStateMachine.Mode.INSERT);
           }
@@ -306,8 +306,7 @@ public class ChangeGroup extends VimChangeGroupBase {
       Pair<TextRange, SelectionType> deleteRangeAndType =
         getDeleteRangeAndType(editor, caret, context, argument, true, operatorArguments.withCount0(count0));
       if (deleteRangeAndType == null) return false;
-      return changeRange(editor, caret, deleteRangeAndType.getFirst(), deleteRangeAndType.getSecond(), context,
-                         operatorArguments);
+      return changeRange(editor, caret, deleteRangeAndType.getFirst(), deleteRangeAndType.getSecond(), context);
     }
   }
 
@@ -426,11 +425,10 @@ public class ChangeGroup extends VimChangeGroupBase {
   /**
    * Deletes the range of text and enters insert mode
    *
-   * @param editor            The editor to change
-   * @param caret             The caret to be moved after range deletion
-   * @param range             The range to change
-   * @param type              The type of the range
-   * @param operatorArguments
+   * @param editor The editor to change
+   * @param caret  The caret to be moved after range deletion
+   * @param range  The range to change
+   * @param type   The type of the range
    * @return true if able to delete the range, false if not
    */
   @Override
@@ -438,8 +436,7 @@ public class ChangeGroup extends VimChangeGroupBase {
                              @NotNull VimCaret caret,
                              @NotNull TextRange range,
                              @NotNull SelectionType type,
-                             @Nullable ExecutionContext context,
-                             @NotNull OperatorArguments operatorArguments) {
+                             ExecutionContext context) {
     int col = 0;
     int lines = 0;
     if (type == SelectionType.BLOCK_WISE) {
@@ -453,7 +450,7 @@ public class ChangeGroup extends VimChangeGroupBase {
 
     final VimLogicalPosition lp = editor.offsetToLogicalPosition(injector.getMotion().moveCaretToLineStartSkipLeading(editor, caret));
 
-    boolean res = deleteRange(editor, caret, range, type, true, operatorArguments);
+    boolean res = deleteRange(editor, caret, range, type, true);
     if (res) {
       if (type == SelectionType.LINE_WISE) {
         // Please don't use `getDocument().getText().isEmpty()` because it converts CharSequence into String
@@ -589,11 +586,10 @@ public class ChangeGroup extends VimChangeGroupBase {
                           @NotNull VimCaret caret,
                           @NotNull ExecutionContext context,
                           int lines,
-                          int dir,
-                          @NotNull OperatorArguments operatorArguments) {
+                          int dir) {
     int start = ((IjVimCaret) caret).getCaret().getOffset();
     int end = VimPlugin.getMotion().moveCaretToLineEndOffset(editor, caret, lines - 1, true);
-    indentRange(editor, caret, context, new TextRange(start, end), 1, dir, operatorArguments);
+    indentRange(editor, caret, context, new TextRange(start, end), 1, dir);
   }
 
   @Override
@@ -606,7 +602,7 @@ public class ChangeGroup extends VimChangeGroupBase {
     final TextRange range =
       injector.getMotion().getMotionRange(editor, caret, context, argument, operatorArguments);
     if (range != null) {
-      indentRange(editor, caret, context, range, 1, dir, operatorArguments);
+      indentRange(editor, caret, context, range, 1, dir);
     }
   }
 
@@ -633,8 +629,7 @@ public class ChangeGroup extends VimChangeGroupBase {
                           @NotNull ExecutionContext context,
                           @NotNull TextRange range,
                           int count,
-                          int dir,
-                          @NotNull OperatorArguments operatorArguments) {
+                          int dir) {
     if (logger.isDebugEnabled()) {
       logger.debug("count=" + count);
     }
@@ -680,7 +675,7 @@ public class ChangeGroup extends VimChangeGroupBase {
               }
             }
             if (pos > wsoff) {
-              deleteText(editor, new TextRange(wsoff, pos), null, caret, operatorArguments);
+              deleteText(editor, new TextRange(wsoff, pos), null, caret);
             }
           }
         }

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

@@ -36,7 +36,6 @@ class IjVimStorageService : VimStorageServiceBase() {
     editor.ij.putUserData(getOrCreateIjKey(key), data)
   }
 
-  @Suppress("UNCHECKED_CAST")
   override fun <T> getDataFromBuffer(editor: VimEditor, key: com.maddyhome.idea.vim.api.Key<T>): T? {
     val buffer = EditorHelper.getVirtualFile(editor.ij)?.path ?: "empty path"
     return bufferToKey[buffer]?.get(key.name) as T?
@@ -61,7 +60,6 @@ class IjVimStorageService : VimStorageServiceBase() {
   }
 
   private val ijKeys = mutableMapOf<String, Key<out Any?>>()
-  @Suppress("UNCHECKED_CAST")
   private fun <T> getOrCreateIjKey(key: com.maddyhome.idea.vim.api.Key<T>): Key<T> {
     val storedIjKey = ijKeys[key.name]
     if (storedIjKey != null) {

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

@@ -108,9 +108,7 @@ public class MacroGroup extends VimMacroBase {
               KeyHandler.getInstance().handleKey(editor, key, context);
             });
           }
-          keyStack.resetFirst();
         }
-        keyStack.removeFirst();
       });
     }
   }

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

@@ -411,7 +411,6 @@ public class MarkGroup extends VimMarkGroupBase implements PersistentStateCompon
 
   /**
    * COMPATIBILITY-LAYER: Method added
-   * Please see: <a href="https://jb.gg/zo8n0r">doc</a>
    *
    * @deprecated Please use method with VimEditor
    */

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

@@ -20,23 +20,26 @@ package com.maddyhome.idea.vim.group
 
 import com.intellij.icons.AllIcons
 import com.intellij.ide.BrowserUtil
+import com.intellij.ide.IdeBundle
 import com.intellij.ide.actions.OpenFileAction
 import com.intellij.ide.actions.RevealFileAction
-import com.intellij.notification.ActionCenter
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationGroup
 import com.intellij.notification.NotificationGroupManager
+import com.intellij.notification.NotificationListener
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.KeyboardShortcut
 import com.intellij.openapi.ide.CopyPasteManager
+import com.intellij.openapi.keymap.Keymap
 import com.intellij.openapi.keymap.KeymapUtil
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.project.DumbAwareAction
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.util.SystemInfo
+import com.intellij.openapi.util.registry.Registry
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.helper.MessageHelper
 import com.maddyhome.idea.vim.key.ShortcutOwner
@@ -47,6 +50,7 @@ import com.maddyhome.idea.vim.statistic.ActionTracker
 import com.maddyhome.idea.vim.ui.VimEmulationConfigurable
 import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 import com.maddyhome.idea.vim.vimscript.services.VimRcService
+import org.jetbrains.annotations.Nls
 import java.awt.datatransfer.StringSelection
 import java.io.File
 import javax.swing.KeyStroke
@@ -111,6 +115,23 @@ class NotificationService(private val project: Project?) {
     Messages.getQuestionIcon()
   )
 
+  fun specialKeymap(keymap: Keymap, listener: NotificationListener.Adapter) {
+    val notification = IDEAVIM_STICKY_GROUP.createNotification(
+      IDEAVIM_NOTIFICATION_TITLE,
+      "IdeaVim plugin doesn't use the special \"Vim\" keymap any longer. " +
+        "Switching to \"${keymap.presentableName}\" keymap.<br/><br/>" +
+        "Now it is possible to set up:<br/>" +
+        "<ul>" +
+        "<li>Vim keys in your ~/.ideavimrc file using key mapping commands</li>" +
+        "<li>IDE action shortcuts in \"File | Settings | Keymap\"</li>" +
+        "<li>Vim or IDE handlers for conflicting shortcuts in <a href='#settings'>Vim Emulation</a> settings</li>" +
+        "</ul>",
+      NotificationType.INFORMATION
+    )
+    notification.setListener(listener)
+    notification.notify(project)
+  }
+
   fun noVimrcAsDefault() {
     val notification = IDEAVIM_STICKY_GROUP.createNotification(
       IDEAVIM_NOTIFICATION_TITLE,
@@ -187,7 +208,7 @@ class NotificationService(private val project: Project?) {
       Notification(IDEAVIM_NOTIFICATION_ID, IDEAVIM_NOTIFICATION_TITLE, content, NotificationType.INFORMATION).let {
         notification = it
         it.whenExpired { notification = null }
-        it.setContent(it.content + "<br><br><small>Use ${ActionCenter.getToolwindowName()} to see previous ids</small>")
+        it.setContent(it.content + "<br><br><small>Use ${getToolwindowName()} to see previous ids</small>")
 
         it.addAction(StopTracking())
 
@@ -201,6 +222,15 @@ class NotificationService(private val project: Project?) {
       }
     }
 
+    // [VERSION UPDATE] 221+ Use ActionCenter.getToolWindowName
+    private fun getToolwindowName(): @Nls String {
+      return IdeBundle.message(if (isEnabled()) "toolwindow.stripe.Notifications" else "toolwindow.stripe.Event_Log")
+    }
+
+    private fun isEnabled(): Boolean {
+      return Registry.`is`("ide.notification.action.center", true)
+    }
+
     class CopyActionId(val id: String?, val project: Project?) : DumbAwareAction(MessageHelper.message("action.copy.action.id.text")) {
       override fun actionPerformed(e: AnActionEvent) {
         CopyPasteManager.getInstance().setContents(StringSelection(id ?: ""))

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

@@ -21,8 +21,8 @@ package com.maddyhome.idea.vim.group;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
-import com.intellij.openapi.fileEditor.impl.EditorComposite;
 import com.intellij.openapi.fileEditor.impl.EditorWindow;
+import com.intellij.openapi.fileEditor.impl.EditorWithProviderComposite;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.concurrency.annotations.RequiresReadLock;
@@ -183,7 +183,7 @@ public class WindowGroup extends WindowGroupBase {
   }
 
   private static @Nullable Rectangle getEditorWindowRectangle(@NotNull EditorWindow window) {
-    final EditorComposite editor = window.getSelectedComposite();
+    final EditorWithProviderComposite editor = window.getSelectedEditor();
     if (editor != null) {
       final Point point = editor.getComponent().getLocationOnScreen();
       final Dimension dimension = editor.getComponent().getSize();

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

@@ -34,7 +34,6 @@ 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.injector
-import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.command.SelectionType
 import com.maddyhome.idea.vim.command.VimStateMachine
 import com.maddyhome.idea.vim.command.isBlock
@@ -44,9 +43,7 @@ import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.TestClipboardModel
 import com.maddyhome.idea.vim.helper.fileSize
-import com.maddyhome.idea.vim.helper.mode
 import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
-import com.maddyhome.idea.vim.helper.subMode
 import com.maddyhome.idea.vim.mark.VimMarkConstants.MARK_CHANGE_POS
 import com.maddyhome.idea.vim.newapi.IjVimCaret
 import com.maddyhome.idea.vim.newapi.IjVimEditor
@@ -65,13 +62,7 @@ import kotlin.math.min
 class PutGroup : VimPutBase() {
   override fun putTextForCaret(editor: VimEditor, caret: VimCaret, context: ExecutionContext, data: PutData, updateVisualMarks: Boolean): Boolean {
     val additionalData = collectPreModificationData(editor, data)
-    data.visualSelection?.let {
-      deleteSelectedText(
-        editor,
-        data,
-        OperatorArguments(false, 0, editor.mode, editor.subMode)
-      )
-    }
+    data.visualSelection?.let { deleteSelectedText(editor, data) }
     val processedText = processText(editor, data) ?: return false
     putForCaret(editor, caret, data, additionalData, context, processedText)
     if (editor.primaryCaret() == caret && updateVisualMarks) {
@@ -102,6 +93,7 @@ class PutGroup : VimPutBase() {
       }
     }
 
+    notifyAboutIdeaPut(editor)
     logger.debug("Perform put via plugin")
     val myCarets = if (visualSelection != null) {
       visualSelection.caretsAndSelections.keys.sortedByDescending { it.getLogicalPosition() }
@@ -121,7 +113,6 @@ class PutGroup : VimPutBase() {
     context: ExecutionContext,
     text: ProcessedTextData,
   ) {
-    notifyAboutIdeaPut(editor)
     if (data.visualSelection?.typeInEditor?.isLine == true && editor.isOneLineMode()) return
     val startOffsets = prepareDocumentAndGetStartOffsets(editor, caret, text.typeInRegister, data, additionalData)
 

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

@@ -32,6 +32,7 @@ import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.fileSize
 import com.maddyhome.idea.vim.listener.VimYankListener
 import com.maddyhome.idea.vim.newapi.ij
+import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.yank.YankGroupBase
 import org.jetbrains.annotations.Contract
 import kotlin.math.min
@@ -210,8 +211,8 @@ class YankGroup : YankGroupBase() {
     notifyListeners(editor, range)
 
     var result = true
-    for ((caret, myRange) in caretToRange) {
-      result = caret.registerStorage.storeText(editor, myRange, type, false) && result
+    for ((caret, range) in caretToRange) {
+      result = caret.registerStorage.storeText(editor, range, type, false) && result
     }
     return result
   }

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

@@ -44,7 +44,6 @@ class VisualMotionGroup : VimVisualMotionGroupBase() {
 
   /**
    * COMPATIBILITY-LAYER: Added a method
-   * Please see: https://jb.gg/zo8n0r
    */
   fun enterVisualMode(editor: Editor, subMode: CommandState.SubMode? = null): Boolean {
     return this.enterVisualMode(editor.vim, subMode?.engine)

src/main/java/com/maddyhome/idea/vim/helper/CommandStateExtensions.kt

@@ -60,14 +60,12 @@ val Editor.editorMode
 
 /**
  * COMPATIBILITY-LAYER: New method
- * Please see: https://jb.gg/zo8n0r
  */
 val Editor.mode
   get() = this.vim.vimStateMachine.mode.ij
 
 /**
  * COMPATIBILITY-LAYER: New method
- * Please see: https://jb.gg/zo8n0r
  */
 val CommandState.Mode.isEndAllowed: Boolean
   get() = this.engine.isEndAllowed

src/main/java/com/maddyhome/idea/vim/helper/EditorHelper.java

@@ -37,7 +37,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Range;
 
 import java.awt.*;
-import java.awt.geom.Point2D;
 import java.nio.CharBuffer;
 import java.util.Collections;
 import java.util.Comparator;
@@ -155,7 +154,6 @@ public class EditorHelper {
 
   /**
    * COMPATIBILITY-LAYER: Created a function
-   * Please see: <a href="https://jb.gg/zo8n0r">doc</a>
    */
   public static int getVisualLineCount(final @NotNull Editor editor) {
     return getVisualLineCount(new IjVimEditor(editor));
@@ -247,27 +245,12 @@ public class EditorHelper {
    * font. It does not include inlays or folds.
    * <p>
    * Note that this value is only approximate and should be avoided whenever possible!
-   * </p>
    *
    * @param editor The editor
    * @return The number of screen columns
    */
   public static int getApproximateScreenWidth(final @NotNull Editor editor) {
-    return (int)(getVisibleArea(editor).width / getPlainSpaceWidthFloat(editor));
-  }
-
-  /**
-   * Gets the width of the space character in the editor's plain font as a float.
-   * <p>
-   * Font width can be fractional, but {@link EditorUtil#getPlainSpaceWidth(Editor)} returns it as an int, which can
-   * lead to rounding errors.
-   * </p>
-   *
-   * @param editor The editor
-   * @return The width of the space character in the editor's plain font in pixels. It might be a fractional value.
-   */
-  public static float getPlainSpaceWidthFloat(final @NotNull Editor editor) {
-    return EditorUtil.fontForChar(' ', Font.PLAIN, editor).charWidth2D(' ');
+    return getVisibleArea(editor).width / EditorUtil.getPlainSpaceWidth(editor);
   }
 
   /**
@@ -819,20 +802,19 @@ public class EditorHelper {
       }
     }
 
-    final int columnLeftX = (int) Math.round(editor.visualPositionToPoint2D(new VisualPosition(visualLine, targetVisualColumn)).getX());
+    final int columnLeftX = editor.visualPositionToXY(new VisualPosition(visualLine, targetVisualColumn)).x;
     scrollHorizontally(editor, columnLeftX);
   }
 
   public static void scrollColumnToMiddleOfScreen(@NotNull Editor editor, int visualLine, int visualColumn) {
-    final Point2D point = editor.visualPositionToPoint2D(new VisualPosition(visualLine, visualColumn));
+    final Point point = editor.visualPositionToXY(new VisualPosition(visualLine, visualColumn));
     final int screenWidth = getVisibleArea(editor).width;
 
     // Snap the column to the nearest standard column grid. This positions us nicely if there are an odd or even number
     // of columns. It also works with inline inlays and folds. It is slightly inaccurate for proportional fonts, but is
     // still a good solution. Besides, what kind of monster uses Vim with proportional fonts?
-    final float standardColumnWidth = EditorHelper.getPlainSpaceWidthFloat(editor);
-    final int screenMidColumn = (int) (screenWidth / standardColumnWidth / 2);
-    final int x = max(0, (int) Math.round(point.getX() - (screenMidColumn * standardColumnWidth)));
+    final int standardColumnWidth = EditorUtil.getPlainSpaceWidth(editor);
+    final int x = max(0, point.x - (screenWidth / standardColumnWidth / 2 * standardColumnWidth));
     scrollHorizontally(editor, x);
   }
 
@@ -857,7 +839,7 @@ public class EditorHelper {
     }
 
     // Scroll to the left edge of the target column, minus a screenwidth, and adjusted for inlays
-    final int targetColumnRightX = (int) Math.round(editor.visualPositionToPoint2D(new VisualPosition(visualLine, targetVisualColumn + 1)).getX());
+    final int targetColumnRightX = editor.visualPositionToXY(new VisualPosition(visualLine, targetVisualColumn + 1)).x;
     final int screenWidth = getVisibleArea(editor).width;
     scrollHorizontally(editor, targetColumnRightX - screenWidth);
   }
@@ -1019,18 +1001,18 @@ public class EditorHelper {
     // Note that visualPos.leansRight will be true for the right half side of the character grid
     VisualPosition closestVisualPosition = editor.xyToVisualPosition(new Point(x, y));
 
-    // Make sure we get the character that contains this XY, not the editor's decision about the closest character. The
-    // editor will give us the next character if X is over halfway through the character grid. Take into account that
-    // the font size might be fractional, but the editor's area is integer. Use floating point values and round.
-    long xActualLeft = Math.round(editor.visualPositionToPoint2D(closestVisualPosition).getX());
+    // Make sure we get the character that contains this XY, not the editor's decision about closest character. The
+    // editor will give us the next character if X is over half way through the character grid.
+    int xActualLeft = editor.visualPositionToXY(closestVisualPosition).x;
     if (xActualLeft > x) {
       closestVisualPosition = getPreviousNonInlayVisualPosition(editor, closestVisualPosition);
-      xActualLeft = Math.round(editor.visualPositionToPoint2D(closestVisualPosition).getX());
+      xActualLeft = editor.visualPositionToXY(closestVisualPosition).x;
     }
 
     if (xActualLeft >= leftBound) {
-      final VisualPosition nextVisualPosition = new VisualPosition(closestVisualPosition.line, closestVisualPosition.column + 1);
-      final long xActualRight = Math.round(editor.visualPositionToPoint2D(nextVisualPosition).getX()) - 1;
+      final int xActualRight =
+        editor.visualPositionToXY(new VisualPosition(closestVisualPosition.line, closestVisualPosition.column + 1)).x -
+        1;
       if (xActualRight <= rightBound) {
         return closestVisualPosition.column;
       }

src/main/java/com/maddyhome/idea/vim/helper/Helper.kt

@@ -22,7 +22,6 @@ import com.intellij.codeInsight.template.TemplateManager
 import com.intellij.codeWithMe.ClientId
 import com.intellij.injected.editor.EditorWindow
 import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.ClientEditorManager
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.EditorFactory
@@ -31,7 +30,6 @@ import com.intellij.openapi.util.Key
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.options.OptionConstants
 import com.maddyhome.idea.vim.options.OptionScope
-import kotlin.streams.toList
 
 /**
  * This annotation is created for test functions (methods).
@@ -85,9 +83,10 @@ fun Editor.getTopLevelEditor() = if (this is EditorWindow) this.delegate else th
 
 /**
  * Return list of editors for local host (for code with me plugin)
+ * [VERSION UPDATE] 212+ ClientEditorManager.editors()
  */
 fun localEditors(): List<Editor> {
-  return ClientEditorManager.getCurrentInstance().editors().toList()
+  return EditorFactory.getInstance().allEditors.filter { editor -> editor.editorClientId.let { it == null || it == ClientId.currentOrNull } }
 }
 
 fun localEditors(doc: Document): List<Editor> {

src/main/java/com/maddyhome/idea/vim/helper/IjActionExecutor.kt

@@ -24,8 +24,11 @@ import com.intellij.openapi.actionSystem.ActionPlaces
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.AnActionResult
+import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.IdeActions
+import com.intellij.openapi.actionSystem.PlatformCoreDataKeys
 import com.intellij.openapi.actionSystem.PlatformDataKeys
+import com.intellij.openapi.actionSystem.Presentation
 import com.intellij.openapi.actionSystem.ex.ActionManagerEx
 import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.command.CommandProcessor
@@ -83,7 +86,7 @@ class IjActionExecutor : VimActionExecutor {
     // This method executes inside of lastUpdateAndCheckDumb
     // Another related issue: VIM-2604
     if (!ActionUtil.lastUpdateAndCheckDumb(ijAction, event, false)) return false
-    if (ijAction is ActionGroup && !event.presentation.isPerformGroup) {
+    if (ijAction is ActionGroup && !canBePerformed(event, ijAction, context.ij)) {
       // Some ActionGroups should not be performed, but shown as a popup
       val popup = JBPopupFactory.getInstance()
         .createActionGroupPopup(event.presentation.text, ijAction, context.ij, false, null, -1)
@@ -115,9 +118,10 @@ class IjActionExecutor : VimActionExecutor {
     var indexError: IndexNotReadyException? = null
     val manager = ActionManagerEx.getInstanceEx()
     manager.fireBeforeActionPerformed(action, event)
+    val component = event.getData(PlatformCoreDataKeys.CONTEXT_COMPONENT)
     var result: AnActionResult? = null
     try {
-      SlowOperations.allowSlowOperations(SlowOperations.ACTION_PERFORM).use {
+      SlowOperations.allowSlowOperations(SlowOperations.ACTION_PERFORM).use { ignore ->
         performRunnable.run()
         result = AnActionResult.PERFORMED
       }
@@ -139,6 +143,17 @@ class IjActionExecutor : VimActionExecutor {
     }
   }
 
+  private fun canBePerformed(event: AnActionEvent, action: ActionGroup, context: DataContext): Boolean {
+    val presentation = event.presentation
+    return try {
+      // [VERSION UPDATE] 221+ Just use Presentation.isPerformGroup
+      val method = Presentation::class.java.getMethod("isPerformGroup")
+      method.invoke(presentation) as Boolean
+    } catch (e: Exception) {
+      action.canBePerformed(context)
+    }
+  }
+
   /**
    * Execute an action by name
    *

src/main/java/com/maddyhome/idea/vim/helper/SearchHelper.java

@@ -529,9 +529,6 @@ public class SearchHelper {
         CharSequence subSequence = chars.subSequence(startOffset, endOffset);
         int inQuotePos = pos - startOffset;
         int inQuoteStart = findBlockLocation(subSequence, close, type, Direction.BACKWARDS, inQuotePos, count, false);
-        if (inQuoteStart == -1) {
-          inQuoteStart = findBlockLocation(subSequence, close, type, Direction.FORWARDS, inQuotePos, count, false);
-        }
         if (inQuoteStart != -1) {
           startPosInStringFound = true;
           int inQuoteEnd = findBlockLocation(subSequence, type, close, Direction.FORWARDS, inQuoteStart, 1, false);
@@ -545,9 +542,6 @@ public class SearchHelper {
 
     if (!startPosInStringFound) {
       bstart = findBlockLocation(chars, close, type, Direction.BACKWARDS, pos, count, false);
-      if (bstart == -1) {
-        bstart = findBlockLocation(chars, close, type, Direction.FORWARDS, pos, count, false);
-      }
       if (bstart != -1) {
         bend = findBlockLocation(chars, type, close, Direction.FORWARDS, bstart, 1, false);
       }

src/main/java/com/maddyhome/idea/vim/helper/StringHelper.kt

@@ -24,7 +24,6 @@ import javax.swing.KeyStroke
 
 /**
  * COMPATIBILITY-LAYER: Created a helper class
- * Please see: https://jb.gg/zo8n0r
  */
 object StringHelper {
   @JvmStatic

src/main/java/com/maddyhome/idea/vim/helper/UndoRedoHelper.kt

@@ -21,8 +21,6 @@ package com.maddyhome.idea.vim.helper
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.PlatformDataKeys
-import com.intellij.openapi.command.CommandProcessor
-import com.intellij.openapi.command.impl.UndoManagerImpl
 import com.intellij.openapi.command.undo.UndoManager
 import com.intellij.openapi.components.Service
 import com.maddyhome.idea.vim.api.ExecutionContext
@@ -41,29 +39,22 @@ import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
  */
 @Service
 class UndoRedoHelper : UndoRedoBase() {
-  init {
-    injector.optionService.addListener(IjVimOptionService.oldUndo, { UndoManagerImpl.ourNeverAskUser = !injector.optionService.isSet(OptionScope.GLOBAL, IjVimOptionService.oldUndo) }, true)
-  }
-
   override fun undo(context: ExecutionContext): Boolean {
     val ijContext = context.context as DataContext
     val project = PlatformDataKeys.PROJECT.getData(ijContext) ?: return false
     val fileEditor = PlatformDataKeys.FILE_EDITOR.getData(ijContext)
     val undoManager = UndoManager.getInstance(project)
     if (fileEditor != null && undoManager.isUndoAvailable(fileEditor)) {
-      val editor = CommonDataKeys.EDITOR.getData(context.ij)?.vim
       if (injector.optionService.isSet(OptionScope.GLOBAL, IjVimOptionService.oldUndo)) {
         SelectionVimListenerSuppressor.lock().use { undoManager.undo(fileEditor) }
       } else {
+        val editor = CommonDataKeys.EDITOR.getData(context.ij)?.vim
         performUntilFileChanges(editor, { undoManager.isUndoAvailable(fileEditor) }, { undoManager.undo(fileEditor) })
-      }
-
-      editor?.carets()?.forEach {
-        val ijCaret = it.ij
-        val hasSelection = ijCaret.hasSelection()
-        if (hasSelection) {
-          val selectionStart = ijCaret.selectionStart
-          CommandProcessor.getInstance().runUndoTransparentAction {
+        editor?.carets()?.forEach {
+          val ijCaret = it.ij
+          val hasSelection = ijCaret.hasSelection()
+          if (hasSelection) {
+            val selectionStart = ijCaret.selectionStart
             it.ij.removeSelection()
             it.ij.moveToOffset(selectionStart)
           }
@@ -79,14 +70,12 @@ class UndoRedoHelper : UndoRedoBase() {
     val project = PlatformDataKeys.PROJECT.getData(ijContext) ?: return false
     val fileEditor = PlatformDataKeys.FILE_EDITOR.getData(ijContext)
     val undoManager = UndoManager.getInstance(project)
-    val editor = CommonDataKeys.EDITOR.getData(context.ij)?.vim
     if (fileEditor != null && undoManager.isRedoAvailable(fileEditor)) {
       if (injector.optionService.isSet(OptionScope.GLOBAL, IjVimOptionService.oldUndo)) {
         SelectionVimListenerSuppressor.lock().use { undoManager.redo(fileEditor) }
       } else {
+        val editor = CommonDataKeys.EDITOR.getData(context.ij)?.vim
         performUntilFileChanges(editor, { undoManager.isRedoAvailable(fileEditor) }, { undoManager.redo(fileEditor) })
-      }
-      CommandProcessor.getInstance().runUndoTransparentAction {
         editor?.carets()?.forEach { it.ij.removeSelection() }
       }
       return true
@@ -106,15 +95,10 @@ class UndoRedoHelper : UndoRedoBase() {
       }
     }
 
-    val oldPath = editor.getPath()
     vimDocument.addChangeListener(changeListener)
-    while (check() && !changeListener.hasChanged && !ifFilePathChanged(editor, oldPath)) {
+    while (check() && !changeListener.hasChanged) {
       action.run()
     }
     vimDocument.removeChangeListener(changeListener)
   }
-
-  private fun ifFilePathChanged(editor: IjVimEditor, oldPath: String?): Boolean {
-    return editor.getPath() != oldPath
-  }
 }

src/main/java/com/maddyhome/idea/vim/listener/AppCodeTemplates.kt

@@ -21,8 +21,8 @@ package com.maddyhome.idea.vim.listener
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.AnActionResult
 import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.actionSystem.ex.AnActionListener
 import com.intellij.openapi.editor.Caret
@@ -35,6 +35,7 @@ import com.maddyhome.idea.vim.group.visual.VimVisualTimer
 import com.maddyhome.idea.vim.helper.fileSize
 import com.maddyhome.idea.vim.helper.inVisualMode
 import com.maddyhome.idea.vim.newapi.vim
+import org.jetbrains.annotations.NotNull
 
 /**
  * A collection of hacks to improve the interaction with fancy AppCode templates
@@ -49,16 +50,16 @@ object AppCodeTemplates {
 
     private var editor: Editor? = null
 
-    override fun beforeActionPerformed(action: AnAction, event: AnActionEvent) {
+    override fun beforeActionPerformed(action: AnAction, dataContext: DataContext, event: AnActionEvent) {
       if (!VimPlugin.isEnabled()) return
 
-      val hostEditor = event.dataContext.getData(CommonDataKeys.HOST_EDITOR)
+      val hostEditor = dataContext.getData(CommonDataKeys.HOST_EDITOR)
       if (hostEditor != null) {
         editor = hostEditor
       }
     }
 
-    override fun afterActionPerformed(action: AnAction, event: AnActionEvent, result: AnActionResult) {
+    override fun afterActionPerformed(action: AnAction, dataContext: DataContext, event: AnActionEvent) {
       if (!VimPlugin.isEnabled()) return
 
       if (ActionManager.getInstance().getId(action) == IdeActions.ACTION_CHOOSE_LOOKUP_ITEM) {
@@ -76,8 +77,8 @@ object AppCodeTemplates {
 
   @JvmStatic
   fun onMovement(
-    editor: Editor,
-    caret: Caret,
+    editor: @NotNull Editor,
+    caret: @NotNull Caret,
     toRight: Boolean,
   ) {
     val offset = caret.offset

src/main/java/com/maddyhome/idea/vim/listener/IdeaSpecifics.kt

@@ -29,8 +29,8 @@ import com.intellij.find.FindModelListener
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.AnActionResult
 import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.ex.AnActionListener
 import com.intellij.openapi.actionSystem.impl.ProxyShortcutSet
 import com.intellij.openapi.editor.Editor
@@ -60,10 +60,10 @@ object IdeaSpecifics {
     private val surrounderAction =
       "com.intellij.codeInsight.generation.surroundWith.SurroundWithHandler\$InvokeSurrounderAction"
     private var editor: Editor? = null
-    override fun beforeActionPerformed(action: AnAction, event: AnActionEvent) {
+    override fun beforeActionPerformed(action: AnAction, dataContext: DataContext, event: AnActionEvent) {
       if (!VimPlugin.isEnabled()) return
 
-      val hostEditor = event.dataContext.getData(CommonDataKeys.HOST_EDITOR)
+      val hostEditor = dataContext.getData(CommonDataKeys.HOST_EDITOR)
       if (hostEditor != null) {
         editor = hostEditor
       }
@@ -72,13 +72,13 @@ object IdeaSpecifics {
       if (VimPlugin.getOptionService().isSet(OptionScope.GLOBAL, OptionConstants.trackactionidsName)) {
         if (action !is NotificationService.ActionIdNotifier.CopyActionId && action !is NotificationService.ActionIdNotifier.StopTracking) {
           val id: String? = ActionManager.getInstance().getId(action) ?: (action.shortcutSet as? ProxyShortcutSet)?.actionId
-          VimPlugin.getNotifications(event.dataContext.getData(CommonDataKeys.PROJECT)).notifyActionId(id)
+          VimPlugin.getNotifications(dataContext.getData(CommonDataKeys.PROJECT)).notifyActionId(id)
         }
       }
       //endregion
     }
 
-    override fun afterActionPerformed(action: AnAction, event: AnActionEvent, result: AnActionResult) {
+    override fun afterActionPerformed(action: AnAction, dataContext: DataContext, event: AnActionEvent) {
       if (!VimPlugin.isEnabled()) return
 
       //region Enter insert mode after surround with if
@@ -93,7 +93,7 @@ object IdeaSpecifics {
           while (commandState.mode != VimStateMachine.Mode.COMMAND) {
             commandState.popModes()
           }
-          VimPlugin.getChange().insertBeforeCursor(it.vim, event.dataContext.vim)
+          VimPlugin.getChange().insertBeforeCursor(it.vim, dataContext.vim)
           KeyHandler.getInstance().reset(it.vim)
         }
       }

src/main/java/com/maddyhome/idea/vim/listener/RiderSpecifics.kt

@@ -21,8 +21,8 @@ package com.maddyhome.idea.vim.listener
 import com.intellij.openapi.actionSystem.ActionManager
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.AnActionResult
 import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.actionSystem.ex.AnActionListener
 import com.intellij.openapi.editor.Editor
@@ -36,16 +36,16 @@ import com.maddyhome.idea.vim.helper.getTopLevelEditor
 class RiderActionListener : AnActionListener {
 
   private var editor: Editor? = null
-  override fun beforeActionPerformed(action: AnAction, event: AnActionEvent) {
+  override fun beforeActionPerformed(action: AnAction, dataContext: DataContext, event: AnActionEvent) {
     if (!VimPlugin.isEnabled()) return
 
-    val hostEditor = event.dataContext.getData(CommonDataKeys.HOST_EDITOR)
+    val hostEditor = dataContext.getData(CommonDataKeys.HOST_EDITOR)
     if (hostEditor != null) {
       editor = hostEditor
     }
   }
 
-  override fun afterActionPerformed(action: AnAction, event: AnActionEvent, result: AnActionResult) {
+  override fun afterActionPerformed(action: AnAction, dataContext: DataContext, event: AnActionEvent) {
     if (!VimPlugin.isEnabled()) return
 
     //region Extend Selection for Rider

src/main/java/com/maddyhome/idea/vim/listener/VimListenerManager.kt

@@ -122,9 +122,9 @@ object VimListenerManager {
       VimPlugin.getOptionService().addListener(OptionConstants.guicursorName, GuicursorChangeListener)
       VimPlugin.getOptionService().addListener(OptionConstants.iskeywordName, KeywordOptionChangeListener, true)
 
-      EventFacade.getInstance().addEditorFactoryListener(VimEditorFactoryListener, VimPlugin.getInstance().onOffDisposable)
+      EventFacade.getInstance().addEditorFactoryListener(VimEditorFactoryListener, VimPlugin.getInstance())
 
-      EditorFactory.getInstance().eventMulticaster.addCaretListener(VimCaretListener, VimPlugin.getInstance().onOffDisposable)
+      EditorFactory.getInstance().eventMulticaster.addCaretListener(VimCaretListener, VimPlugin.getInstance())
     }
 
     fun disable() {
@@ -136,6 +136,10 @@ object VimListenerManager {
       VimPlugin.getOptionService().removeListener(OptionConstants.showcmdName, ShowCmdOptionChangeListener)
       VimPlugin.getOptionService().removeListener(OptionConstants.guicursorName, GuicursorChangeListener)
       VimPlugin.getOptionService().removeListener(OptionConstants.iskeywordName, KeywordOptionChangeListener)
+
+      EventFacade.getInstance().removeEditorFactoryListener(VimEditorFactoryListener)
+
+      EditorFactory.getInstance().eventMulticaster.removeCaretListener(VimCaretListener)
     }
   }
 

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

@@ -99,7 +99,6 @@ fun changeRange(
           vimCaret.moveToOffset(deletedInfo.leftOffset.point)
         }
         is OperatedRange.Block -> TODO()
-        else -> TODO()
       }
       if (type == SelectionType.BLOCK_WISE) {
         VimPlugin.getChange().setInsertRepeat(lines, col, false)
@@ -180,7 +179,7 @@ fun insertLineAround(editor: VimEditor, context: ExecutionContext, shift: Int) {
       }
       val position = EditorLine.Offset.init(editor.offsetToLogicalPosition(lineEndOffset).line + shift, editor)
 
-      val insertedLine = editor.addLine(position)
+      val insertedLine = editor.addLine(position) ?: continue
       VimPlugin.getChange().saveStrokes("\n")
 
       var lineStart = editor.getLineRange(insertedLine).first

src/main/java/com/maddyhome/idea/vim/newapi/IjClipboardManager.kt

@@ -49,7 +49,6 @@ class IjClipboardManager : VimClipboardManager {
     return Pair(res, transferableData)
   }
 
-  @Suppress("UNCHECKED_CAST")
   override fun setClipboardText(text: String, rawText: String, transferableData: List<Any>): Any? {
     val transferableData1 = (transferableData as List<TextBlockTransferableData>).toMutableList()
     try {
@@ -98,7 +97,6 @@ class IjClipboardManager : VimClipboardManager {
     return transferableData
   }
 
-  @Suppress("UNCHECKED_CAST")
   override fun preprocessText(
     vimEditor: VimEditor,
     textRange: TextRange,

src/main/java/com/maddyhome/idea/vim/newapi/IjExecutionContextManager.kt

@@ -33,11 +33,11 @@ class IjExecutionContextManager : ExecutionContextManagerBase() {
   }
 
   override fun onCaret(caret: VimCaret, prevContext: ExecutionContext): ExecutionContext {
-    return IjExecutionContext(CaretSpecificDataContext.create(prevContext.ij, caret.ij))
+    return IjExecutionContext(CaretSpecificDataContext(prevContext.ij, caret.ij))
   }
 
   override fun createCaretSpecificDataContext(context: ExecutionContext, caret: VimCaret): ExecutionContext {
-    return IjExecutionContext(CaretSpecificDataContext.create(context.ij, caret.ij))
+    return IjExecutionContext(CaretSpecificDataContext(context.ij, caret.ij))
   }
 
   override fun createEditorDataContext(editor: VimEditor, context: ExecutionContext): ExecutionContext {

src/main/java/com/maddyhome/idea/vim/newapi/IjVimEditor.kt

@@ -62,9 +62,7 @@ import com.maddyhome.idea.vim.helper.updateCaretsVisualPosition
 import com.maddyhome.idea.vim.helper.vimChangeActionSwitchMode
 import com.maddyhome.idea.vim.helper.vimKeepingVisualOperatorAction
 import com.maddyhome.idea.vim.helper.vimLastSelectionType
-import org.jetbrains.annotations.ApiStatus
 
-@ApiStatus.Internal
 class IjVimEditor(editor: Editor) : MutableLinearEditor() {
 
   // All the editor actions should be performed with top level editor!!!

src/main/java/com/maddyhome/idea/vim/newapi/IjVimInjector.kt

@@ -68,13 +68,13 @@ import com.maddyhome.idea.vim.helper.vimStateMachine
 import com.maddyhome.idea.vim.history.VimHistory
 import com.maddyhome.idea.vim.macro.VimMacro
 import com.maddyhome.idea.vim.mark.VimMarkGroup
+import com.maddyhome.idea.vim.vimscript.services.OptionService
 import com.maddyhome.idea.vim.put.VimPut
 import com.maddyhome.idea.vim.register.VimRegisterGroup
 import com.maddyhome.idea.vim.ui.VimRcFileState
 import com.maddyhome.idea.vim.undo.VimUndoRedo
 import com.maddyhome.idea.vim.vimscript.Executor
 import com.maddyhome.idea.vim.vimscript.services.FunctionStorage
-import com.maddyhome.idea.vim.vimscript.services.OptionService
 import com.maddyhome.idea.vim.vimscript.services.PatternService
 import com.maddyhome.idea.vim.vimscript.services.VariableService
 import com.maddyhome.idea.vim.yank.VimYankGroup

src/main/java/com/maddyhome/idea/vim/newapi/IjVimMessages.kt

@@ -37,19 +37,19 @@ class IjVimMessages : VimMessagesBase() {
   private var error = false
   private var lastBeepTimeMillis = 0L
 
-  override fun showStatusBarMessage(message: String?) {
+  override fun showStatusBarMessage(msg: String?) {
     if (ApplicationManager.getApplication().isUnitTestMode) {
-      this.message = message
+      message = msg
     }
     val pm = ProjectManager.getInstance()
     val projects = pm.openProjects
     for (project in projects) {
       val bar = WindowManager.getInstance().getStatusBar(project)
       if (bar != null) {
-        if (message.isNullOrEmpty()) {
+        if (msg.isNullOrEmpty()) {
           bar.info = ""
         } else {
-          bar.info = "VIM - $message"
+          bar.info = "VIM - $msg"
         }
       }
     }

src/main/java/com/maddyhome/idea/vim/option/OptionsManager.kt

@@ -30,17 +30,16 @@ import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 
 /**
  * COMPATIBILITY-LAYER: Added a class and package
- * Please see: https://jb.gg/zo8n0r
  */
 object OptionsManager {
   val ignorecase: ToggleOption
-    get() = (injector.optionService as IjVimOptionService).getOptionByNameOrAbbr(ignorecaseName) as ToggleOption
+    get() = (injector.optionService as IjVimOptionService).getRawOption(ignorecaseName) as ToggleOption
   val smartcase: ToggleOption
-    get() = (injector.optionService as IjVimOptionService).getOptionByNameOrAbbr(smartcaseName) as ToggleOption
+    get() = (injector.optionService as IjVimOptionService).getRawOption(smartcaseName) as ToggleOption
   val timeout: ToggleOption
-    get() = (injector.optionService as IjVimOptionService).getOptionByNameOrAbbr(timeoutName) as ToggleOption
+    get() = (injector.optionService as IjVimOptionService).getRawOption(timeoutName) as ToggleOption
   val timeoutlen: NumberOption
-    get() = (injector.optionService as IjVimOptionService).getOptionByNameOrAbbr(timeoutlenName) as NumberOption
+    get() = (injector.optionService as IjVimOptionService).getRawOption(timeoutlenName) as NumberOption
   val iskeyword: KeywordOption
     get() = KeywordOption(KeywordOptionHelper)
 }

src/main/java/com/maddyhome/idea/vim/statistic/ActionTracker.kt

@@ -18,7 +18,6 @@
 
 package com.maddyhome.idea.vim.statistic
 
-import com.intellij.internal.statistic.collectors.fus.actions.persistence.ActionRuleValidator
 import com.intellij.internal.statistic.eventLog.EventLogGroup
 import com.intellij.internal.statistic.eventLog.events.EventFields
 import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector
@@ -26,14 +25,8 @@ import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesColle
 internal class ActionTracker : CounterUsagesCollector() {
   companion object {
     private val GROUP = EventLogGroup("vim.actions", 1)
-    private val TRACKED_ACTIONS = GROUP.registerEvent(
-      "tracked",
-      EventFields.StringValidatedByCustomRule("action_id", ActionRuleValidator::class.java)
-    )
-    private val COPIED_ACTIONS = GROUP.registerEvent(
-      "copied",
-      EventFields.StringValidatedByCustomRule("action_id", ActionRuleValidator::class.java)
-    )
+    private val TRACKED_ACTIONS = GROUP.registerEvent("tracked", EventFields.StringValidatedByCustomRule("action_id", "action"))
+    private val COPIED_ACTIONS = GROUP.registerEvent("copied", EventFields.StringValidatedByCustomRule("action_id", "action"))
 
     fun logTrackedAction(actionId: String) {
       TRACKED_ACTIONS.log(actionId)

src/main/java/com/maddyhome/idea/vim/vimscript/Executor.kt

@@ -48,13 +48,13 @@ class Executor : VimScriptExecutorBase() {
   override var executingVimscript = false
 
   @Throws(ExException::class)
-  override fun execute(script: String, editor: VimEditor, context: ExecutionContext, skipHistory: Boolean, indicateErrors: Boolean, vimContext: VimLContext?): ExecutionResult {
+  override fun execute(scriptString: String, editor: VimEditor, context: ExecutionContext, skipHistory: Boolean, indicateErrors: Boolean, vimContext: VimLContext?): ExecutionResult {
     var finalResult: ExecutionResult = ExecutionResult.Success
 
-    val myScript = VimscriptParser.parse(script)
-    myScript.units.forEach { it.vimContext = vimContext ?: myScript }
+    val script = VimscriptParser.parse(scriptString)
+    script.units.forEach { it.vimContext = vimContext ?: script }
 
-    for (unit in myScript.units) {
+    for (unit in script.units) {
       try {
         val result = unit.execute(editor, context)
         if (result is ExecutionResult.Error) {
@@ -89,18 +89,18 @@ class Executor : VimScriptExecutorBase() {
     }
 
     if (!skipHistory) {
-      VimPlugin.getHistory().addEntry(HistoryConstants.COMMAND, script)
-      if (myScript.units.size == 1 && myScript.units[0] is Command && myScript.units[0] !is RepeatCommand) {
-        VimPlugin.getRegister().storeTextSpecial(LAST_COMMAND_REGISTER, script)
+      VimPlugin.getHistory().addEntry(HistoryConstants.COMMAND, scriptString)
+      if (script.units.size == 1 && script.units[0] is Command && script.units[0] !is RepeatCommand) {
+        VimPlugin.getRegister().storeTextSpecial(LAST_COMMAND_REGISTER, scriptString)
       }
     }
     return finalResult
   }
 
-  override fun execute(script: String, skipHistory: Boolean) {
+  override fun execute(scriptString: String, skipHistory: Boolean) {
     val editor = TextComponentEditorImpl(null, JTextArea()).vim
     val context = DataContext.EMPTY_CONTEXT.vim
-    execute(script, editor, context, skipHistory, indicateErrors = true, CommandLineVimLContext)
+    execute(scriptString, editor, context, skipHistory, indicateErrors = true, CommandLineVimLContext)
   }
 
   override fun executeFile(file: File, indicateErrors: Boolean) {

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/ActionListCommand.kt

@@ -23,7 +23,6 @@ import com.intellij.openapi.actionSystem.KeyboardShortcut
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.ex.ranges.Ranges
 import com.maddyhome.idea.vim.helper.MessageHelper
@@ -37,7 +36,7 @@ import java.util.*
 data class ActionListCommand(val ranges: Ranges, val argument: String) : Command.SingleExecution(ranges) {
   override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
 
-  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
+  override fun processCommand(editor: VimEditor, context: ExecutionContext): ExecutionResult {
     val lineSeparator = "\n"
     val searchPattern = argument.trim().lowercase(Locale.getDefault()).split("*")
     val actionManager = ActionManager.getInstance()

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/BufferCommand.kt

@@ -23,7 +23,6 @@ import com.intellij.openapi.fileEditor.FileEditorManager
 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.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ranges.Ranges
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.MessageHelper
@@ -39,7 +38,7 @@ import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 data class BufferCommand(val ranges: Ranges, val argument: String) : Command.SingleExecution(ranges) {
   override val argFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
 
-  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
+  override fun processCommand(editor: VimEditor, context: ExecutionContext): ExecutionResult {
     val arg = argument.trim()
     val overrideModified = arg.startsWith('!')
     val buffer = if (overrideModified) arg.replace(Regex("^!\\s*"), "") else arg

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/BufferListCommand.kt

@@ -26,7 +26,6 @@ import com.intellij.openapi.vfs.VirtualFile
 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.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.ex.ranges.Ranges
 import com.maddyhome.idea.vim.helper.EditorHelper
@@ -49,7 +48,7 @@ data class BufferListCommand(val ranges: Ranges, val argument: String) : Command
     val SUPPORTED_FILTERS = setOf('+', '=', 'a', '%', '#')
   }
 
-  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
+  override fun processCommand(editor: VimEditor, context: ExecutionContext): ExecutionResult {
     val arg = argument.trim()
     val filter = pruneUnsupportedFilters(arg)
     val bufferList = getBufferList(context, filter)

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/CmdFilterCommand.kt

@@ -24,7 +24,6 @@ import com.intellij.openapi.progress.ProcessCanceledException
 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.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ExException
 import com.maddyhome.idea.vim.ex.ExOutputModel
 import com.maddyhome.idea.vim.ex.ranges.Ranges
@@ -39,7 +38,7 @@ import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 data class CmdFilterCommand(val ranges: Ranges, val argument: String) : Command.SingleExecution(ranges) {
   override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.SELF_SYNCHRONIZED)
 
-  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
+  override fun processCommand(editor: VimEditor, context: ExecutionContext): ExecutionResult {
     logger.debug("execute")
     val command = buildString {
       var inBackslash = false

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/GlobalCommand.kt

@@ -23,7 +23,6 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ranges.LineRange
 import com.maddyhome.idea.vim.ex.ranges.Ranges
 import com.maddyhome.idea.vim.group.SearchGroup.RE_BOTH
@@ -43,7 +42,7 @@ import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 data class GlobalCommand(val ranges: Ranges, val argument: String, val invert: Boolean) : Command.SingleExecution(ranges, argument) {
   override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.SELF_SYNCHRONIZED)
 
-  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
+  override fun processCommand(editor: VimEditor, context: ExecutionContext): ExecutionResult {
     var result: ExecutionResult = ExecutionResult.Success
     editor.removeSecondaryCarets()
     val caret = editor.currentCaret()

src/main/java/com/maddyhome/idea/vim/vimscript/model/commands/HelpCommand.kt

@@ -21,7 +21,6 @@ package com.maddyhome.idea.vim.vimscript.model.commands
 import com.intellij.ide.BrowserUtil
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ranges.Ranges
 import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
 import org.jetbrains.annotations.NonNls
@@ -34,7 +33,7 @@ import java.net.URLEncoder
  */
 data class HelpCommand(val ranges: Ranges, val argument: String) : Command.SingleExecution(ranges, argument) {
   override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
-  override fun processCommand(editor: VimEditor, context: ExecutionContext, operatorArguments: OperatorArguments): ExecutionResult {
+  override fun processCommand(editor: VimEditor, context: ExecutionContext): ExecutionResult {
     BrowserUtil.browse(helpTopicUrl(argument))
     return ExecutionResult.Success
   }

src/main/java/com/maddyhome/idea/vim/vimscript/services/IjVimOptionService.kt

@@ -27,7 +27,7 @@ import com.maddyhome.idea.vim.options.StringOption
 internal class IjVimOptionService : VimOptionServiceBase() {
 
   private val customOptions = setOf(
-    ToggleOption(oldUndo, oldUndo, true),
+    ToggleOption(oldUndo, oldUndo, false),
     ToggleOption(ideajoinName, ideajoinAlias, false),
     ToggleOption(ideamarksName, ideamarksAlias, true),
     StringOption(ideName, ideAlias, ApplicationNamesInfo.getInstance().fullProductNameWithEdition),

src/main/resources/META-INF/plugin.xml

@@ -2,7 +2,55 @@
   <name>IdeaVim</name>
   <id>IdeaVIM</id>
   <change-notes><![CDATA[
-      <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">Changes</a>
+      <h3>Features:</h3>
+      <ul>
+        <li>Add register support to let command | <a href="https://youtrack.jetbrains.com/issue/VIM-749">VIM-749</a>, <a
+            href="https://youtrack.jetbrains.com/issue/VIM-1783">VIM-1783</a></li>
+        <li>Add tabmove command | <a href="https://youtrack.jetbrains.com/issue/VIM-1164">VIM-1164</a></li>
+      </ul>
+
+      <h3>Fixes:</h3>
+      <ul>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2502">VIM-2502</a> Fix the shape of new carets</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2499">VIM-2499</a> Fix mapping to esc</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2500">VIM-2500</a> Fix esc for normal mode</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2523">VIM-2523</a> <code>i</code> command for the folder in the
+          project tree
+        </li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2471">VIM-2471</a> Multiple [{ and ]} actions</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2504">VIM-2504</a> Fix esc with using python notebooks</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2540">VIM-2540</a> Fix option listeners</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2548">VIM-2548</a> Fix paste</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2470">VIM-2470</a> Fix incorrect reset of cursor shape</li>
+        <li><a href="https://youtrack.jetbrains.com/issue/VIM-2223">VIM-2223</a>, <a
+            href="https://youtrack.jetbrains.com/issue/VIM-1684">VIM-1684</a>, <a
+            href="https://youtrack.jetbrains.com/issue/VIM-2491">VIM-2491</a> Fix <code>gv</code></li>
+      </ul>
+
+      <h3>Merged PRs:</h3>
+      <ul>
+        <li><a href="https://github.com/JetBrains/ideavim/pull/441">441</a> by <a href="https://github.com/DanEEStar">DanEEStar</a>:
+          Add Matchit support for Vue.js files
+        </li>
+        <li><a href="https://github.com/JetBrains/ideavim/pull/440">440</a> by <a href="https://github.com/ksrb">Kevin
+          Suen</a>: Add matchit support for handlebars
+        </li>
+        <li><a href="https://github.com/JetBrains/ideavim/pull/448">448</a> by <a href="https://github.com/cravay">Michael
+          Schertenleib</a>: Support custom element names in vim-surround
+        </li>
+        <li><a href="https://github.com/JetBrains/ideavim/pull/435">435</a> by <a href="https://github.com/pmnoxx">Piotr
+          Mikulski</a>: Print stderr when running a command just like vim does
+        </li>
+        <li><a href="https://github.com/JetBrains/ideavim/pull/449">449</a> by <a href="https://github.com/lonre">Lonre
+          Wang</a>: Typo fix
+        </li>
+        <li><a href="https://github.com/JetBrains/ideavim/pull/453">453</a> by <a href="https://github.com/citizenmatt">Matt
+          Ellis</a>: fix(VIM-2470): Fix incorrect reset of cursor shape
+        </li>
+        <li><a href="https://github.com/JetBrains/ideavim/pull/461">461</a> by <a href="https://github.com/ddadon10">David
+          Dadon</a>: Add shortcut to ideajoin example
+        </li>
+      </ul>
     ]]>
   </change-notes>
   <description><![CDATA[
@@ -22,8 +70,8 @@
 
   <!-- Please search for "[VERSION UPDATE]" in project in case you update the since-build version -->
   <!-- Check for [Version Update] tag in YouTrack as well -->
-  <!-- Also, please update the value in build.gradle.kts file-->
-  <idea-version since-build="222"/>
+  <!-- Also, please update the value in gradle.build file-->
+  <idea-version since-build="213"/>
 
   <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform (including CWM) -->
   <depends>com.intellij.modules.platform</depends>

src/test/java/org/jetbrains/plugins/ideavim/NeovimTesting.kt

@@ -112,10 +112,7 @@ internal object NeovimTesting {
     when {
       keys.equals("<esc>", ignoreCase = true) -> neovimApi.input(escapeCommand).get()
       keys.equals("<C-C>", ignoreCase = true) -> neovimApi.input(ctrlcCommand).get()
-      else -> {
-        val replacedCodes = neovimApi.replaceTermcodes(keys, true, false, true).get()
-        neovimApi.input(replacedCodes).get()
-      }
+      else -> neovimApi.input(neovimApi.replaceTermcodes(keys, true, false, true).get()).get()
     }
   }
 
@@ -231,7 +228,6 @@ enum class SkipNeovimReason {
   VIM_SCRIPT,
 
   GUARDED_BLOCKS,
-  CTRL_CODES,
 }
 
 fun LogicalPosition.toVimCoords(): VimCoords {

src/test/java/org/jetbrains/plugins/ideavim/RegisterActionsTest.kt

@@ -23,9 +23,9 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.MappingMode
 import com.maddyhome.idea.vim.command.VimStateMachine
-import com.maddyhome.idea.vim.handler.ActionBeanClass
 import com.maddyhome.idea.vim.key.CommandNode
 import com.maddyhome.idea.vim.key.CommandPartNode
+import com.maddyhome.idea.vim.handler.ActionBeanClass
 import junit.framework.TestCase
 import javax.swing.KeyStroke
 
@@ -38,18 +38,14 @@ class RegisterActionsTest : VimTestCase() {
 
   @TestWithoutNeovim(reason = SkipNeovimReason.EDITOR_MODIFICATION)
   fun `test action in disabled plugin`() {
-    try {
-      setupChecks {
-        caretShape = false
-      }
-      val keys = injector.parser.parseKeys("jklwB") // just random keys
-      val before = "I ${c}found it in a legendary land"
-      val after = "I jklwB${c}found it in a legendary land"
-      doTest(keys, before, after, VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE) {
-        VimPlugin.setEnabled(false)
-      }
-    } finally {
-      VimPlugin.setEnabled(true)
+    setupChecks {
+      caretShape = false
+    }
+    val keys = injector.parser.parseKeys("jklwB") // just random keys
+    val before = "I ${c}found it in a legendary land"
+    val after = "I jklwB${c}found it in a legendary land"
+    doTest(keys, before, after, VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE) {
+      VimPlugin.setEnabled(false)
     }
   }
 

src/test/java/org/jetbrains/plugins/ideavim/VimTestCase.kt

@@ -34,6 +34,7 @@ import com.intellij.openapi.editor.LogicalPosition
 import com.intellij.openapi.editor.VisualPosition
 import com.intellij.openapi.editor.colors.EditorColors
 import com.intellij.openapi.editor.ex.EditorEx
+import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
 import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.fileTypes.PlainTextFileType
@@ -81,7 +82,6 @@ import org.junit.Assert
 import java.awt.event.KeyEvent
 import java.util.*
 import javax.swing.KeyStroke
-import kotlin.math.roundToInt
 
 /**
  * @author vlan
@@ -169,9 +169,7 @@ abstract class VimTestCase : UsefulTestCase() {
     get() = 35
 
   protected fun setEditorVisibleSize(width: Int, height: Int) {
-    val w = (width * EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)).roundToInt()
-    val h = height * myFixture.editor.lineHeight
-    EditorTestUtil.setEditorVisibleSizeInPixels(myFixture.editor, w, h)
+    EditorTestUtil.setEditorVisibleSize(myFixture.editor, width, height)
   }
 
   protected fun setEditorVirtualSpace() {
@@ -611,7 +609,7 @@ abstract class VimTestCase : UsefulTestCase() {
   // per platform (e.g. Windows is 7, Mac is 8) so we can't guarantee correct positioning for tests if we use hard coded
   // pixel widths
   protected fun addInlay(offset: Int, relatesToPrecedingText: Boolean, widthInColumns: Int): Inlay<*> {
-    val widthInPixels = (EditorHelper.getPlainSpaceWidthFloat(myFixture.editor) * widthInColumns).roundToInt()
+    val widthInPixels = EditorUtil.getPlainSpaceWidth(myFixture.editor) * widthInColumns
     return EditorTestUtil.addInlay(myFixture.editor, offset, relatesToPrecedingText, widthInPixels)
   }
 
@@ -621,7 +619,7 @@ abstract class VimTestCase : UsefulTestCase() {
   // float if necessary. We'd still be working scaled to the line height, so fractional values should still work.
   protected fun addBlockInlay(offset: Int, showAbove: Boolean, heightInRows: Int): Inlay<*> {
     val widthInColumns = 10 // Arbitrary width. We don't care.
-    val widthInPixels = (EditorHelper.getPlainSpaceWidthFloat(myFixture.editor) * widthInColumns).roundToInt()
+    val widthInPixels = EditorUtil.getPlainSpaceWidth(myFixture.editor) * widthInColumns
     val heightInPixels = myFixture.editor.lineHeight * heightInRows
     return EditorTestUtil.addBlockInlay(myFixture.editor, offset, false, showAbove, widthInPixels, heightInPixels)
   }

src/test/java/org/jetbrains/plugins/ideavim/action/ChangeActionTest.kt

@@ -71,7 +71,6 @@ class ChangeActionTest : VimTestCase() {
   }
 
   // VIM-620 |i_CTRL-O|
-  @TestWithoutNeovim(SkipNeovimReason.SELECT_MODE)
   fun testInsertSingleCommandAndNewLineInserting5() {
     doTest(
       listOf("i", "<C-O>", "v", "<C-G>"),
@@ -80,7 +79,6 @@ class ChangeActionTest : VimTestCase() {
   }
 
   // VIM-620 |i_CTRL-O|
-  @TestWithoutNeovim(SkipNeovimReason.SELECT_MODE)
   fun testInsertSingleCommandAndNewLineInserting6() {
     doTest(
       listOf("i", "<C-O>", "gh"),
@@ -89,7 +87,6 @@ class ChangeActionTest : VimTestCase() {
   }
 
   // VIM-620 |i_CTRL-O|
-  @TestWithoutNeovim(SkipNeovimReason.SELECT_MODE)
   fun testInsertSingleCommandAndNewLineInserting7() {
     doTest(
       listOf("i", "<C-O>", "gh", "<esc>"),
@@ -446,15 +443,14 @@ quux
     )
   }
 
-  @VimBehaviorDiffers(originalVimAfter = "foo  bar")
   fun testDeleteJoinLinesWithTrailingSpaceThenEmptyLine() {
     doTest(
       "3J",
       """
-        foo.
+        foo 
         
         bar
-      """.dotToSpace().trimIndent(),
+      """.trimIndent(),
       "foo bar", VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE
     )
   }
@@ -463,9 +459,9 @@ quux
     doTest(
       "J",
       """
-        foo..
+        foo  
         bar
-      """.dotToSpace().trimIndent(),
+      """.trimIndent(),
       "foo  bar", VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE
     )
   }

src/test/java/org/jetbrains/plugins/ideavim/action/MultipleCaretsTest.kt

@@ -2846,30 +2846,4 @@ rtyfg${c}hzxc"""
     """.trimIndent()
     assertState(after)
   }
-
-  // VIM-2703
-  @TestWithoutNeovim(reason = SkipNeovimReason.MULTICARET)
-  fun `test multicaret with unnamed clipboard`() {
-    injector.optionService.appendValue(OptionScope.GLOBAL, OptionConstants.clipboardName, OptionConstants.clipboard_unnamed)
-    val before = """
-            attach${c}Download(null)
-            attach${c}Download(null)
-            attach${c}Download(null)
-            attach${c}Download(null)
-            attach${c}Download(null)
-            
-    """.trimIndent()
-    configureByText(before)
-    typeText(injector.parser.parseKeys("diw"))
-    val after = """
-            ${c}(null)
-            ${c}(null)
-            ${c}(null)
-            ${c}(null)
-            ${c}(null)
-            
-    """.trimIndent()
-    assertState(after)
-    injector.optionService.resetDefault(OptionScope.GLOBAL, OptionConstants.clipboardName)
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/action/ResetModeActionTest.kt

@@ -111,7 +111,6 @@ class ResetModeActionTest : VimTestCase() {
     TestCase.assertFalse(myFixture.editor.selectionModel.hasSelection())
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.CTRL_CODES)
   fun `test delete command after resetting operator-pending mode with ctrl open bracket`() {
     val keys = listOf("d", "<C-[>", "dw")
     val before = "A Discovery"

src/test/java/org/jetbrains/plugins/ideavim/action/SpecialRegistersTest.java

@@ -140,7 +140,7 @@ public class SpecialRegistersTest extends VimTestCase {
 
     // Small deletes (less than a line) with register specified go to that register and to numbered registers
     assertRegisterChanged('a');
-    assertRegisterNotChanged('1');
+    assertRegisterChanged('1');
     assertRegisterNotChanged(SMALL_DELETION_REGISTER);
   }
 
@@ -155,7 +155,7 @@ public class SpecialRegistersTest extends VimTestCase {
     typeTextInFile(VimInjectorKt.getInjector().getParser().parseKeys("\"add"), "one <caret>two three\n");
 
     assertRegisterChanged('a');
-    assertRegisterNotChanged('1');
+    assertRegisterChanged('1');
   }
 
   public void testNumberedRegistersShifting() {

src/test/java/org/jetbrains/plugins/ideavim/action/change/RepeatChangeActionTest.kt

@@ -317,14 +317,6 @@ class RepeatChangeActionTest : VimTestCase() {
     doTest(keys, before, after, VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE)
   }
 
-  @VimBehaviorDiffers(
-    originalVimAfter = """
-    
-        Three
-        Two
-        One
-  """
-  )
   fun `test redo register feature`() {
     doTest(
       listOf("dd", "dd", "dd", "\"1p", ".", "."),

src/test/java/org/jetbrains/plugins/ideavim/action/change/UndoActionTest.kt

@@ -18,10 +18,7 @@
 
 package org.jetbrains.plugins.ideavim.action.change
 
-import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.VimStateMachine
-import com.maddyhome.idea.vim.options.OptionScope
-import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 import org.jetbrains.plugins.ideavim.VimTestCase
 
 class UndoActionTest : VimTestCase() {
@@ -79,27 +76,25 @@ class UndoActionTest : VimTestCase() {
   }
 
   fun `test cursor movements do not require additional undo`() {
-    if (!injector.optionService.isSet(OptionScope.GLOBAL, IjVimOptionService.oldUndo)) {
-      val keys = listOf("a1<Esc>ea2<Esc>ea3<Esc>", "uu")
-      val before = """
+    val keys = listOf("a1<Esc>ea2<Esc>ea3<Esc>", "uu")
+    val before = """
                 A Discovery
 
                 ${c}I found it in a legendary land
                 all rocks and lavender and tufted grass,
                 where it was settled on some sodden sand
                 hard by the torrent of a mountain pass.
-      """.trimIndent()
-      val after = """
+    """.trimIndent()
+    val after = """
                 A Discovery
 
                 I1 found$c it in a legendary land
                 all rocks and lavender and tufted grass,
                 where it was settled on some sodden sand
                 hard by the torrent of a mountain pass.
-      """.trimIndent()
-      doTest(keys, before, after, VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE)
-      assertFalse(hasSelection())
-    }
+    """.trimIndent()
+    doTest(keys, before, after, VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE)
+    assertFalse(hasSelection())
   }
 
   private fun hasSelection(): Boolean {

src/test/java/org/jetbrains/plugins/ideavim/action/change/delete/JoinNotificationTest.kt

@@ -20,11 +20,9 @@
 
 package org.jetbrains.plugins.ideavim.action.change.delete
 
-import com.intellij.notification.ActionCenter
 import com.intellij.notification.EventLog
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.group.NotificationService
 import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 import org.jetbrains.plugins.ideavim.OptionValueType
 import org.jetbrains.plugins.ideavim.VimOptionTestCase
@@ -35,6 +33,8 @@ import org.jetbrains.plugins.ideavim.VimTestOption
  * @author Alex Plate
  */
 class JoinNotificationTest : VimOptionTestCase(IjVimOptionService.ideajoinName) {
+  // [VERSION UPDATE] 221+: Uncomment
+/*
   @VimOptionTestConfiguration(VimTestOption(IjVimOptionService.ideajoinName, OptionValueType.NUMBER, "0"))
   fun `test notification shown for no ideajoin`() {
     val before = "I found${c} it\n in a legendary land"
@@ -45,14 +45,17 @@ class JoinNotificationTest : VimOptionTestCase(IjVimOptionService.ideajoinName)
     val notification = ActionCenter.getNotifications(myFixture.project, true).last()
     try {
       assertEquals(NotificationService.IDEAVIM_NOTIFICATION_TITLE, notification.title)
-      assertTrue(IjVimOptionService.ideajoinName in notification.content)
+      assertTrue(OptionConstants.ideajoinName in notification.content)
       assertEquals(3, notification.actions.size)
     } finally {
       notification.expire()
     }
   }
+*/
 
-  @VimOptionTestConfiguration(VimTestOption(IjVimOptionService.ideajoinName, OptionValueType.NUMBER, "1"))
+  // [VERSION UPDATE] 221+: Uncomment
+/*
+  @VimOptionTestConfiguration(VimTestOption(OptionConstants.ideajoinName, OptionValueType.NUMBER, "1"))
   fun `test notification not shown for ideajoin`() {
     val before = "I found${c} it\n in a legendary land"
     configureByText(before)
@@ -60,8 +63,9 @@ class JoinNotificationTest : VimOptionTestCase(IjVimOptionService.ideajoinName)
     typeText(injector.parser.parseKeys("J"))
 
     val notifications = ActionCenter.getNotifications(myFixture.project, true)
-    assertTrue(notifications.isEmpty() || notifications.last().isExpired || IjVimOptionService.ideajoinName !in notifications.last().content)
+    assertTrue(notifications.isEmpty() || notifications.last().isExpired || OptionConstants.ideajoinName !in notifications.last().content)
   }
+*/
 
   @VimOptionTestConfiguration(VimTestOption(IjVimOptionService.ideajoinName, OptionValueType.NUMBER, "0"))
   fun `test notification not shown if was shown already`() {

src/test/java/org/jetbrains/plugins/ideavim/action/change/insert/InsertEnterActionTest.kt

@@ -42,7 +42,6 @@ class InsertEnterActionTest : VimTestCase() {
     doTest(listOf("i", "<Enter>"), before, after, VimStateMachine.Mode.INSERT, VimStateMachine.SubMode.NONE)
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.CTRL_CODES)
   fun `test insert enter with C-M`() {
     val before = """I found it in a legendary land
         |${c}all rocks and lavender and tufted grass,

src/test/java/org/jetbrains/plugins/ideavim/action/copy/IdeaPutNotificationsTest.kt

@@ -18,12 +18,10 @@
 
 package org.jetbrains.plugins.ideavim.action.copy
 
-import com.intellij.notification.ActionCenter
 import com.intellij.notification.EventLog
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.SelectionType
-import com.maddyhome.idea.vim.group.NotificationService
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.options.OptionConstants
 import org.jetbrains.plugins.ideavim.OptionValueType
@@ -36,12 +34,14 @@ import org.jetbrains.plugins.ideavim.rangeOf
  * @author Alex Plate
  */
 class IdeaPutNotificationsTest : VimOptionTestCase(OptionConstants.clipboardName) {
+  // [VERSION UPDATE] 221+: Uncomment
+/*
   @VimOptionTestConfiguration(VimTestOption(OptionConstants.clipboardName, OptionValueType.STRING, ""))
   fun `test notification exists if no ideaput`() {
     val before = "${c}I found it in a legendary land"
     configureByText(before)
     appReadySetup(false)
-    VimPlugin.getRegister().storeText(myFixture.editor.vim, before rangeOf "legendary", SelectionType.CHARACTER_WISE, false)
+    VimPlugin.getRegister().storeText(myFixture.editor, before rangeOf "legendary", SelectionType.CHARACTER_WISE, false)
     typeText(injector.parser.parseKeys("p"))
 
     val notification = ActionCenter.getNotifications(myFixture.project, true).last()
@@ -53,7 +53,10 @@ class IdeaPutNotificationsTest : VimOptionTestCase(OptionConstants.clipboardName
       notification.expire()
     }
   }
+*/
 
+  // [VERSION UPDATE] 221+: Uncomment
+/*
   @VimOptionTestConfiguration(
     VimTestOption(
       OptionConstants.clipboardName,
@@ -65,12 +68,13 @@ class IdeaPutNotificationsTest : VimOptionTestCase(OptionConstants.clipboardName
     val before = "${c}I found it in a legendary land"
     configureByText(before)
     appReadySetup(false)
-    VimPlugin.getRegister().storeText(myFixture.editor.vim, before rangeOf "legendary", SelectionType.CHARACTER_WISE, false)
+    VimPlugin.getRegister().storeText(myFixture.editor, before rangeOf "legendary", SelectionType.CHARACTER_WISE, false)
     typeText(injector.parser.parseKeys("p"))
 
     val notifications = ActionCenter.getNotifications(myFixture.project, true)
     assertTrue(notifications.isEmpty() || notifications.last().isExpired || OptionConstants.clipboard_ideaput !in notifications.last().content)
   }
+*/
 
   @VimOptionTestConfiguration(VimTestOption(OptionConstants.clipboardName, OptionValueType.STRING, ""))
   fun `test no notification if already was`() {

src/test/java/org/jetbrains/plugins/ideavim/action/copy/PutTestAfterCursorActionTest.kt

@@ -24,8 +24,6 @@ import com.maddyhome.idea.vim.command.SelectionType
 import com.maddyhome.idea.vim.command.VimStateMachine
 import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
 import com.maddyhome.idea.vim.newapi.vim
-import org.jetbrains.plugins.ideavim.SkipNeovimReason
-import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.jetbrains.plugins.ideavim.rangeOf
 import org.junit.Test
@@ -33,13 +31,7 @@ import org.junit.Test
 class PutTestAfterCursorActionTest : VimTestCase() {
   fun `test put from number register`() {
     setRegister('4', "XXX ")
-    doTest(
-      "\"4p",
-      "This is my$c text",
-      "This is my XXX$c text",
-      VimStateMachine.Mode.COMMAND,
-      VimStateMachine.SubMode.NONE
-    )
+    doTest("\"4p", "This is my$c text", "This is my XXX$c text", VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE)
   }
 
   @VimBehaviorDiffers(
@@ -77,29 +69,4 @@ class PutTestAfterCursorActionTest : VimTestCase() {
     """.trimIndent()
     assertState(after)
   }
-
-  @TestWithoutNeovim(SkipNeovimReason.MULTICARET)
-  @Test
-  fun `test inserting same content to multiple carets`() {
-    val before = """
-            A Discovery
-
-            ${c}I found it in a legendary land
-            ${c}all rocks and lavender and tufted grass,
-            ${c}where it was settled on some sodden sand
-            ${c}hard by the torrent of a mountain pass.
-    """.trimIndent()
-    val editor = configureByText(before)
-    VimPlugin.getRegister().storeText(editor.vim, before rangeOf "Discovery", SelectionType.CHARACTER_WISE, false)
-    typeText(injector.parser.parseKeys("vep"))
-    val after = """
-            A Discovery
-
-            Discovery it in a legendary land
-            Discovery rocks and lavender and tufted grass,
-            Discovery it was settled on some sodden sand
-            Discovery by the torrent of a mountain pass.
-    """.trimIndent()
-    assertState(after)
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/action/copy/PutVisualTextMoveCursorActionTest.kt

@@ -171,7 +171,6 @@ class PutVisualTextMoveCursorActionTest : VimTestCase() {
     assertState(after)
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.CTRL_CODES)
   fun `test Put line in block selection`() {
     val file = """
             ${c}A Discovery

src/test/java/org/jetbrains/plugins/ideavim/action/motion/leftright/MotionLastColumnActionTest.kt

@@ -22,8 +22,6 @@ package org.jetbrains.plugins.ideavim.action.motion.leftright
 
 import com.maddyhome.idea.vim.command.VimStateMachine
 import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
-import org.jetbrains.plugins.ideavim.SkipNeovimReason
-import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimTestCase
 
 class MotionLastColumnActionTest : VimTestCase() {
@@ -142,7 +140,6 @@ class MotionLastColumnActionTest : VimTestCase() {
     doTest(keys, before, after, VimStateMachine.Mode.INSERT, VimStateMachine.SubMode.NONE)
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.CTRL_CODES)
   fun `test dollar motion from insert mode with deletion`() {
     val keys = "i<C-O>d$"
     val before = """

src/test/java/org/jetbrains/plugins/ideavim/action/motion/object/MotionInnerBlockDoubleQuoteActionTest.kt

@@ -1,28 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2022 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.jetbrains.plugins.ideavim.action.motion.`object`
-
-import com.maddyhome.idea.vim.command.VimStateMachine
-import org.jetbrains.plugins.ideavim.VimTestCase
-
-class MotionInnerBlockDoubleQuoteActionTest : VimTestCase() {
-  fun `test change outside quotes`() {
-    doTest("di\"", "${c}print(\"hello\")", "print(\"$c\")", VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE)
-  }
-}

src/test/java/org/jetbrains/plugins/ideavim/action/motion/object/MotionInnerBlockParenActionTest.kt

@@ -198,28 +198,4 @@ class MotionInnerBlockParenActionTest : VimTestCase() {
     )
     assertState("foo()\n")
   }
-
-  fun testOutside() {
-    typeTextInFile(
-      injector.parser.parseKeys("di)"),
-      "${c}foo(bar)\n"
-    )
-    assertState("foo()\n")
-  }
-
-  fun testOutsideInString() {
-    typeTextInFile(
-      injector.parser.parseKeys("di)"),
-      "\"1${c}23\"foo(bar)\n"
-    )
-    assertState("\"123\"foo()\n")
-  }
-
-  fun testOutsideInString2() {
-    typeTextInFile(
-      injector.parser.parseKeys("di)"),
-      "\"1${c}23(dsa)d\"foo(bar)\n"
-    )
-    assertState("\"123()d\"foo(bar)\n")
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/action/motion/object/MotionOuterBlockBraceActionTest.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2022 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package org.jetbrains.plugins.ideavim.action.motion.`object`
-
-import com.maddyhome.idea.vim.api.injector
-import org.jetbrains.plugins.ideavim.VimTestCase
-
-class MotionOuterBlockBraceActionTest : VimTestCase() {
-  fun testOutside() {
-    typeTextInFile(
-      injector.parser.parseKeys("di}"),
-      "${c}foo{bar}\n"
-    )
-    assertState("foo{}\n")
-  }
-
-  fun testOutsideInString() {
-    typeTextInFile(
-      injector.parser.parseKeys("di}"),
-      "\"1${c}23\"foo{bar}\n"
-    )
-    assertState("\"123\"foo{}\n")
-  }
-
-  fun testOutsideInString2() {
-    typeTextInFile(
-      injector.parser.parseKeys("di}"),
-      "\"1${c}23{dsa}d\"foo{bar}\n"
-    )
-    assertState("\"123{}d\"foo{bar}\n")
-  }
-}

src/test/java/org/jetbrains/plugins/ideavim/action/motion/updown/MotionPercentOrMatchActionTest.kt

@@ -84,7 +84,6 @@ class MotionPercentOrMatchActionTest : VimTestCase() {
     assertOffset(7)
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN, description = "Matchit plugin affects neovim")
   fun `test percent match parens in string`() {
     typeTextInFile(
       injector.parser.parseKeys("%"),
@@ -114,7 +113,6 @@ class MotionPercentOrMatchActionTest : VimTestCase() {
     assertState("$c<!-- foo -->")
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN, description = "Matchit plugin affects neovim")
   fun `test percent match java comment start`() {
     configureByJavaText("/$c* foo */")
     typeText(injector.parser.parseKeys("%"))
@@ -146,14 +144,12 @@ class MotionPercentOrMatchActionTest : VimTestCase() {
     assertState("$c/** foo */")
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN, description = "Matchit plugin affects neovim")
   fun `test percent doesnt match after comment start`() {
     configureByJavaText("/*$c foo */")
     typeText(injector.parser.parseKeys("%"))
     assertState("/*$c foo */")
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.UNCLEAR)
   fun `test percent doesnt match before comment end`() {
     configureByJavaText("/* foo $c */")
     typeText(injector.parser.parseKeys("%"))
@@ -236,12 +232,10 @@ class MotionPercentOrMatchActionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN, description = "Matchit plugin affects neovim")
   fun `test deleting with percent motion backward`() {
     doTest("d%", "(foo bar$c)", c, VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE)
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN, description = "Matchit plugin affects neovim")
   fun `test deleting with percent motion`() {
     doTest("d%", "$c(foo bar)", c, VimStateMachine.Mode.COMMAND, VimStateMachine.SubMode.NONE)
   }

src/test/java/org/jetbrains/plugins/ideavim/action/scroll/ScrollFirstScreenColumnActionTest.kt

@@ -19,16 +19,15 @@
 package org.jetbrains.plugins.ideavim.action.scroll
 
 import com.intellij.openapi.editor.Inlay
+import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
 import com.maddyhome.idea.vim.options.OptionConstants
 import com.maddyhome.idea.vim.options.OptionScope
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimInt
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.junit.Assert
-import kotlin.math.roundToInt
 
 /*
                                                        *zs*
@@ -78,7 +77,7 @@ class ScrollFirstScreenColumnActionTest : VimTestCase() {
     typeText(injector.parser.parseKeys("100|" + "zs"))
     val visibleArea = myFixture.editor.scrollingModel.visibleArea
     val textWidth = visibleArea.width - inlay.widthInPixels
-    val availableColumns = (textWidth / EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)).roundToInt()
+    val availableColumns = textWidth / EditorUtil.getPlainSpaceWidth(myFixture.editor)
 
     // The first visible text column will be 99, with the inlay positioned to the left of it
     assertVisibleLineBounds(0, 99, 99 + availableColumns - 1)
@@ -113,6 +112,6 @@ class ScrollFirstScreenColumnActionTest : VimTestCase() {
 
   private fun getAvailableColumns(inlay: Inlay<*>): Int {
     val textWidth = myFixture.editor.scrollingModel.visibleArea.width - inlay.widthInPixels
-    return (textWidth / EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)).roundToInt()
+    return textWidth / EditorUtil.getPlainSpaceWidth(myFixture.editor)
   }
 }

src/test/java/org/jetbrains/plugins/ideavim/action/scroll/ScrollLastScreenColumnActionTest.kt

@@ -19,15 +19,14 @@
 package org.jetbrains.plugins.ideavim.action.scroll
 
 import com.intellij.openapi.editor.Inlay
+import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.options.OptionConstants
 import com.maddyhome.idea.vim.options.OptionScope
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimInt
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.junit.Assert
-import kotlin.math.roundToInt
 
 /*
                                                        *ze*
@@ -110,15 +109,14 @@ class ScrollLastScreenColumnActionTest : VimTestCase() {
     typeText(injector.parser.parseKeys("100|" + "ze"))
     val visibleArea = myFixture.editor.scrollingModel.visibleArea
     val textWidth = visibleArea.width - inlay.widthInPixels
-    val availableColumns = (textWidth / EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)).roundToInt()
+    val availableColumns = textWidth / EditorUtil.getPlainSpaceWidth(myFixture.editor)
 
     // The last visible text column will be 99, but it will be positioned before the inlay
     assertVisibleLineBounds(0, 99 - availableColumns + 1, 99)
 
     // We have to assert the location of the inlay
-    val inlayX = myFixture.editor.visualPositionToPoint2D(inlay.visualPosition).x.roundToInt()
-    Assert.assertEquals(visibleArea.x + textWidth, inlayX)
-    Assert.assertEquals(visibleArea.x + visibleArea.width, inlayX + inlay.widthInPixels)
+    Assert.assertEquals(visibleArea.x + textWidth, inlay.bounds!!.x)
+    Assert.assertEquals(visibleArea.x + visibleArea.width, inlay.bounds!!.x + inlay.bounds!!.width)
   }
 
   fun `test last screen column does not include subsequent inline inlay associated with following text`() {
@@ -132,6 +130,6 @@ class ScrollLastScreenColumnActionTest : VimTestCase() {
 
   private fun getAvailableColumns(inlay: Inlay<*>): Int {
     val textWidth = myFixture.editor.scrollingModel.visibleArea.width - inlay.widthInPixels
-    return (textWidth / EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)).roundToInt()
+    return textWidth / EditorUtil.getPlainSpaceWidth(myFixture.editor)
   }
 }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/SetCommandTest.kt

@@ -134,18 +134,4 @@ class SetCommandTest : VimTestCase() {
     typeText(commandToKeys("set selection?"))
     assertExOutput("selection=exclusive \n")
   }
-
-  @TestWithoutNeovim(reason = SkipNeovimReason.OPTION)
-  fun `test show numbered value`() {
-    configureByText("\n")
-    typeText(commandToKeys("set so"))
-    assertExOutput("scrolloff=0         \n")
-  }
-
-  @TestWithoutNeovim(reason = SkipNeovimReason.OPTION)
-  fun `test show numbered value with questionmark`() {
-    configureByText("\n")
-    typeText(commandToKeys("set so?"))
-    assertExOutput("scrolloff=0         \n")
-  }
 }

src/test/java/org/jetbrains/plugins/ideavim/extension/commentary/CommentaryExtensionTest.kt

@@ -22,21 +22,17 @@ import com.intellij.ide.highlighter.HtmlFileType
 import com.intellij.ide.highlighter.JavaFileType
 import com.maddyhome.idea.vim.command.VimStateMachine
 import com.maddyhome.idea.vim.helper.VimBehaviorDiffers
-import org.jetbrains.plugins.ideavim.SkipNeovimReason
-import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.jetbrains.yaml.YAMLFileType
 
 @Suppress("SpellCheckingInspection")
 class CommentaryExtensionTest : VimTestCase() {
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   override fun setUp() {
     super.setUp()
     enableExtensions("commentary")
   }
 
   // |gc| |l| + move caret
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testBlockCommentSingle() {
     doTest(
       "gcll",
@@ -48,7 +44,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gc| |iw|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testBlockCommentInnerWord() {
     doTest(
       "gciw",
@@ -60,7 +55,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gc| |iw|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testBlockCommentTillForward() {
     doTest(
       "gct{",
@@ -71,7 +65,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gc| |ab|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testBlockCommentOuterParens() {
     doTest(
       "gcab",
@@ -86,7 +79,6 @@ class CommentaryExtensionTest : VimTestCase() {
    *  otherwise, they are incredibly difficult to undo
    */
 // |gc| |j|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineCommentDown() {
     doTest(
       "gcj",
@@ -97,7 +89,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineCommentDownPreservesAbsoluteCaretLocation() {
     doTest(
       "gcj",
@@ -109,7 +100,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gc| |ip|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineCommentInnerParagraph() {
     doTest(
       "gcip",
@@ -121,7 +111,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gc| |ip|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineCommentSingleLineInnerParagraph() {
     doTest(
       "gcip",
@@ -132,7 +121,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   /* Ensure uncommenting works as well */ // |gc| |ip|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineUncommentInnerParagraph() {
     doTest(
       "gcip",
@@ -145,7 +133,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gc| |ip|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineUncommentSingleLineInnerParagraph() {
     doTest(
       "gcip",
@@ -156,7 +143,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   /* Visual mode */ // |gc| |ip|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineCommentVisualInnerParagraph() {
     doTest(
       "vipgc",
@@ -168,7 +154,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gc| |ip|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineUncommentVisualInnerParagraph() {
     doTest(
       "vipgc",
@@ -180,7 +165,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   /* Special shortcut gcc is always linewise */ // |gcc|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineCommentShortcut() {
     doTest(
       "gccj",
@@ -193,7 +177,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gcc|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineCommentShortcutSetsCaretToMotionLocation() {
     doTest(
       "gcc",
@@ -205,7 +188,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gcc|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testLineUncommentShortcut() {
     doTest(
       "gcc",
@@ -218,7 +200,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   // |gcc|
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun testHTMLCommentShortcut() {
     doTest(
       "gcc",
@@ -231,7 +212,6 @@ class CommentaryExtensionTest : VimTestCase() {
     assertSelection(null)
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test comment motion repeat`() {
     doTest(
       "gcj" + "jj.",
@@ -251,7 +231,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test comment motion right repeat`() {
     doTest(
       "gciw" + "jj.",
@@ -271,7 +250,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test comment line repeat`() {
     doTest(
       "gcc" + "j.",
@@ -288,7 +266,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   @VimBehaviorDiffers(description = "IntelliJ's uncomment leaves the leading whitespace")
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test uncomment with gcgc`() {
     doTest(
       "gcgc",
@@ -309,7 +286,6 @@ class CommentaryExtensionTest : VimTestCase() {
   }
 
   @VimBehaviorDiffers(description = "IntelliJ's uncomment leaves the leading whitespace")
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test uncomment with gcu`() {
     doTest(
       "gcu",
@@ -329,7 +305,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test comment line with count`() {
     // Caret position is kept as the position *before* the commenting. This is how Vim works
     doTest(
@@ -354,7 +329,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comment`() {
     doTest(
       "dgc",
@@ -369,7 +343,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes multiple line comments`() {
     doTest(
       "dgc",
@@ -388,7 +361,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes multiple line comments 2`() {
     doTest(
       "dgc",
@@ -407,7 +379,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comment from leading whitespace`() {
     doTest(
       "dgc",
@@ -422,7 +393,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comment from leading whitespace 2`() {
     doTest(
       "dgc",
@@ -439,7 +409,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comment from leading whitespace 3`() {
     doTest(
       "dgc",
@@ -458,7 +427,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comment from trailing whitespace`() {
     doTest(
       "dgc",
@@ -476,7 +444,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comments separated by whitespace`() {
     doTest(
       "dgc",
@@ -493,7 +460,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes disjointed single line comments from whitespace`() {
     doTest(
       "dgc",
@@ -515,7 +481,6 @@ class CommentaryExtensionTest : VimTestCase() {
         final Int value = 42;
   """
   )
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comment from current line`() {
     doTest(
       "dgc",
@@ -531,7 +496,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes single line comment from current line 2`() {
     doTest(
       "dgc",
@@ -548,7 +512,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object does not delete line with comment and text`() {
     doTest(
       "dgc",
@@ -562,7 +525,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes block comment`() {
     doTest(
       "dgc",
@@ -577,7 +539,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes multi-line block comment`() {
     doTest(
       "dgc",
@@ -594,7 +555,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes adjoining multi-line block comments`() {
     doTest(
       "dgc",
@@ -614,7 +574,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes adjoining multi-line block comments 2`() {
     doTest(
       "dgc",
@@ -635,7 +594,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object does not delete line with text and block comment`() {
     doTest(
       "dgc",
@@ -649,7 +607,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes JavaDoc comment`() {
     doTest(
       "dgc",
@@ -670,7 +627,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes JavaDoc comment from leading whitespace`() {
     doTest(
       "dgc",
@@ -692,7 +648,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes JavaDoc comment and adjoining comments`() {
     doTest(
       "dgc",
@@ -714,7 +669,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test text object deletes JavaDoc comment and adjoining comments separated by whitespace`() {
     doTest(
       "dgc",
@@ -739,7 +693,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test Commentary command comments current line`() {
     doTest(
       ":Commentary<CR>",
@@ -757,7 +710,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test Commentary command comments simple line range`() {
     doTest(
       ":2Commentary<CR>",
@@ -775,7 +727,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test Commentary command comments line range`() {
     doTest(
       ":1,3Commentary<CR>",
@@ -804,7 +755,6 @@ class CommentaryExtensionTest : VimTestCase() {
       "Note that Escape exits Visual mode, but leaves the caret where it is",
     shouldBeFixed = true
   )
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test Commentary command comments visual range`() {
     doTest(
       "Vjj" + ":Commentary<CR>",
@@ -822,7 +772,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test Commentary command comments search range`() {
     doTest(
       ":g/value2/Commentary<CR>",
@@ -844,7 +793,6 @@ class CommentaryExtensionTest : VimTestCase() {
     )
   }
 
-  @TestWithoutNeovim(SkipNeovimReason.PLUGIN)
   fun `test block comment falls back to line comment when not available`() {
     doTest(
       "gcw",

src/test/java/org/jetbrains/plugins/ideavim/group/motion/MotionGroup_ScrollCaretIntoViewHorizontally_Test.kt

@@ -18,16 +18,15 @@
 
 package org.jetbrains.plugins.ideavim.group.motion
 
+import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.options.OptionConstants
 import com.maddyhome.idea.vim.options.OptionScope
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimInt
 import org.jetbrains.plugins.ideavim.SkipNeovimReason
 import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimTestCase
-import kotlin.math.roundToInt
 
 @Suppress("ClassName")
 class MotionGroup_ScrollCaretIntoViewHorizontally_Test : VimTestCase() {
@@ -111,7 +110,7 @@ class MotionGroup_ScrollCaretIntoViewHorizontally_Test : VimTestCase() {
     // These columns are hard to calculate, because the visible offset depends on the rendered width of the inlay
     // Also, because we're scrolling right (adding columns to the right) we make the right most column line up
     val textWidth = myFixture.editor.scrollingModel.visibleArea.width - inlay.widthInPixels
-    val availableColumns = (textWidth / EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)).roundToInt()
+    val availableColumns = textWidth / EditorUtil.getPlainSpaceWidth(myFixture.editor)
     assertVisibleLineBounds(0, 119 - availableColumns + 1, 119)
   }
 
@@ -186,7 +185,7 @@ class MotionGroup_ScrollCaretIntoViewHorizontally_Test : VimTestCase() {
     typeText(injector.parser.parseKeys("120|zs" + "20h"))
     // These columns are hard to calculate, because the visible offset depends on the rendered width of the inlay
     val textWidth = myFixture.editor.scrollingModel.visibleArea.width - inlay.widthInPixels
-    val availableColumns = (textWidth / EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)).roundToInt()
+    val availableColumns = textWidth / EditorUtil.getPlainSpaceWidth(myFixture.editor)
     assertVisibleLineBounds(0, 99, 99 + availableColumns - 1)
   }
 

src/test/java/org/jetbrains/plugins/ideavim/helper/EditorHelperTest.kt

@@ -23,7 +23,6 @@ import org.jetbrains.plugins.ideavim.SkipNeovimReason
 import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.junit.Assert
-import kotlin.math.roundToInt
 
 class EditorHelperTest : VimTestCase() {
   @TestWithoutNeovim(SkipNeovimReason.NOT_VIM_TESTING)
@@ -31,8 +30,8 @@ class EditorHelperTest : VimTestCase() {
     configureByColumns(100)
     EditorHelper.scrollColumnToLeftOfScreen(myFixture.editor, 0, 2)
     val visibleArea = myFixture.editor.scrollingModel.visibleArea
-    val columnWidth = EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)
-    Assert.assertEquals((2 * columnWidth).roundToInt(), visibleArea.x)
+    val columnWidth = visibleArea.width / screenWidth
+    Assert.assertEquals(2 * columnWidth, visibleArea.x)
   }
 
   @TestWithoutNeovim(SkipNeovimReason.NOT_VIM_TESTING)
@@ -41,8 +40,8 @@ class EditorHelperTest : VimTestCase() {
     val column = screenWidth + 2
     EditorHelper.scrollColumnToRightOfScreen(myFixture.editor, 0, column)
     val visibleArea = myFixture.editor.scrollingModel.visibleArea
-    val columnWidth = EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)
-    Assert.assertEquals(((column - screenWidth + 1) * columnWidth).roundToInt(), visibleArea.x)
+    val columnWidth = visibleArea.width / screenWidth
+    Assert.assertEquals((column - screenWidth + 1) * columnWidth, visibleArea.x)
   }
 
   @TestWithoutNeovim(SkipNeovimReason.NOT_VIM_TESTING)
@@ -53,8 +52,8 @@ class EditorHelperTest : VimTestCase() {
     // Put column 100 into position 41 -> offset is 59 columns
     EditorHelper.scrollColumnToMiddleOfScreen(myFixture.editor, 0, 99)
     val visibleArea = myFixture.editor.scrollingModel.visibleArea
-    val columnWidth = EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)
-    Assert.assertEquals((59 * columnWidth).roundToInt(), visibleArea.x)
+    val columnWidth = visibleArea.width / screenWidth
+    Assert.assertEquals(59 * columnWidth, visibleArea.x)
   }
 
   @TestWithoutNeovim(SkipNeovimReason.NOT_VIM_TESTING)
@@ -66,7 +65,7 @@ class EditorHelperTest : VimTestCase() {
     // Put column 100 into position 41 -> offset is 59 columns
     EditorHelper.scrollColumnToMiddleOfScreen(myFixture.editor, 0, 99)
     val visibleArea = myFixture.editor.scrollingModel.visibleArea
-    val columnWidth = EditorHelper.getPlainSpaceWidthFloat(myFixture.editor)
-    Assert.assertEquals((59 * columnWidth).roundToInt(), visibleArea.x)
+    val columnWidth = visibleArea.width / screenWidth
+    Assert.assertEquals(59 * columnWidth, visibleArea.x)
   }
 }

src/test/java/org/jetbrains/plugins/ideavim/longrunning/MacroTest.kt

@@ -20,14 +20,11 @@ package org.jetbrains.plugins.ideavim.longrunning
 
 import com.intellij.testFramework.PlatformTestUtil
 import com.maddyhome.idea.vim.api.injector
-import org.jetbrains.plugins.ideavim.SkipNeovimReason
-import org.jetbrains.plugins.ideavim.TestWithoutNeovim
 import org.jetbrains.plugins.ideavim.VimTestCase
 
 class MacroTest : VimTestCase() {
 
   // was a problem on revision affec9bb61ea5e1e635673a0041d61f7af3722b2
-  @TestWithoutNeovim(reason = SkipNeovimReason.NOT_VIM_TESTING)
   fun `test no StackOverflowException`() {
     configureByText("abc de${c}fg")
     typeText(injector.parser.parseKeys("qahlq"))