Update detekt configuration

.gitignore

@@ -10,4 +10,8 @@
 /out/
 /tmp/
 
-*.DS_Store
+*.DS_Store
+
+.teamcity/.idea
+.teamcity/target
+.teamcity/*.iml

.teamcity/_Self/Project.kt

@@ -0,0 +1,70 @@
+package _Self
+
+import _Self.buildTypes.*
+import _Self.vcsRoots.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+
+object Project : Project({
+    description = "Vim emulation plugin for the IntelliJ platform products"
+
+    vcsRoot(Branch_183)
+    vcsRoot(Branch_181)
+    vcsRoot(GitHubPullRequest)
+    vcsRoot(Branch_191_193)
+    vcsRoot(Branch_Nvim)
+
+    buildType(GitHubPullRequests)
+    buildType(Release)
+    buildType(TestsForIntelliJ20201)
+    buildType(TestsForIntelliJ20191)
+    buildType(TestsForIntelliJ20181)
+    buildType(TestsForIntelliJ20192)
+    buildType(TestsForIntelliJ20182)
+    buildType(TestsForIntelliJ20193)
+    buildType(TestsForIntelliJ20183)
+//    buildType(Nvim)
+    buildType(ReleaseEap)
+    buildType(TestsForIntelliJ20202)
+    buildType(TestsForIntelliJEAP)
+
+    features {
+        feature {
+            id = "PROJECT_EXT_768"
+            type = "CloudImage"
+            param("use-spot-instances", "true")
+            param("user-tags", "project=idea-vim")
+            param("agent_pool_id", "41")
+            param("image-instances-limit", "")
+            param("subnet-id", "subnet-58839511")
+            param("ebs-optimized", "false")
+            param("instance-type", "c5d.large")
+            param("amazon-id", "ami-0d1a6a32faa92923e")
+            param("spot-instance-price", "0.1")
+            param("source-id", "BuildAgentsIdeaVim")
+            param("image-name-prefix", "BuildAgentsIdeaVim")
+            param("key-pair-name", "teamcity-prod-pub")
+            param("security-group-ids", "sg-eda08696,sg-7332cf0f,")
+            param("profileId", "amazon-48")
+        }
+        feature {
+            id = "amazon-48"
+            type = "CloudProfile"
+            param("profileServerUrl", "")
+            param("secure:access-id", "credentialsJSON:dbcdb2a2-de5f-4bc9-9421-292b19e83947")
+            param("system.cloud.profile_id", "amazon-48")
+            param("total-work-time", "")
+            param("description", "")
+            param("cloud-code", "amazon")
+            param("enabled", "true")
+            param("max-running-instances", "10")
+            param("agentPushPreset", "")
+            param("profileId", "amazon-48")
+            param("name", "Cloud Agents")
+            param("next-hour", "")
+            param("secure:secret-key", "credentialsJSON:65a87fe7-0977-4af9-96f1-344f2b82d269")
+            param("region", "eu-west-1")
+            param("terminate-idle-time", "15")
+            param("not-checked", "")
+        }
+    }
+})

.teamcity/_Self/buildTypes/ActiveTests.kt

@@ -0,0 +1,45 @@
+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.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class ActiveTests(buildName: String, ijVersion: String) : BuildType({
+  name = buildName
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", ijVersion)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.ON_SERVER
+  }
+
+  steps {
+    gradle {
+      tasks = "clean check"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+})
+
+object TestsForIntelliJEAP : ActiveTests("Tests for IntelliJ Latest EAP", "LATEST-EAP-SNAPSHOT")
+object TestsForIntelliJ20202 : ActiveTests("Tests for IntelliJ 2020.2", "2020.2")
+object TestsForIntelliJ20201 : ActiveTests("Tests for IntelliJ 2020.1", "2020.1")

.teamcity/_Self/buildTypes/GitHubPullRequests.kt

@@ -0,0 +1,73 @@
+package _Self.buildTypes
+
+import _Self.vcsRoots.GitHubPullRequest
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object GitHubPullRequests : BuildType({
+    name = "GitHub Pull Requests"
+    description = "Test GitHub pull requests"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "2020.1")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.GitHubPullRequest)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+        branchFilter = """
+            +:*
+            -:<default>
+        """.trimIndent()
+    }
+
+    steps {
+        gradle {
+            tasks = "clean test"
+            buildFile = ""
+            enableStacktrace = true
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+    }
+
+    triggers {
+        vcs {
+            quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
+            branchFilter = ""
+        }
+    }
+
+    features {
+        pullRequests {
+            provider = github {
+                authType = token {
+                    token = "credentialsJSON:43afd6e5-6ad5-4d12-a218-cf1547717a7f"
+                }
+                filterTargetBranch = "refs/heads/master"
+                filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
+            }
+        }
+        commitStatusPublisher {
+            vcsRootExtId = "${GitHubPullRequest.id}"
+            publisher = github {
+                githubUrl = "https://api.github.com"
+                authType = personalToken {
+                    token = "credentialsJSON:43afd6e5-6ad5-4d12-a218-cf1547717a7f"
+                }
+            }
+            param("github_oauth_user", "AlexPl292")
+        }
+    }
+
+    requirements {
+        noLessThanVer("teamcity.agent.jvm.version", "1.8")
+    }
+})

.teamcity/_Self/buildTypes/Nvim.kt

@@ -0,0 +1,50 @@
+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.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object Nvim : BuildType({
+    name = "NVIM"
+    description = "branch EAP"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "LATEST-EAP-SNAPSHOT")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.Branch_Nvim)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    steps {
+        script {
+            scriptContent = "apt-get install neovim"
+        }
+        gradle {
+            tasks = "--version"
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+        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")
+    }
+})

.teamcity/_Self/buildTypes/Release.kt

@@ -0,0 +1,36 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+
+object Release : BuildType({
+    name = "Publish Release"
+    description = "Build and publish IdeaVim plugin"
+
+    artifactRules = "build/distributions/*"
+    buildNumberPattern = "0.60"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "2020.2")
+        password("env.ORG_GRADLE_PROJECT_publishToken", "credentialsJSON:ec1dc748-e289-47e1-88b6-f193d7999bf4", label = "Password")
+        param("env.ORG_GRADLE_PROJECT_publishUsername", "vlan")
+        param("env.ORG_GRADLE_PROJECT_version", "%build.number%")
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_publishChannels", "default,eap")
+    }
+
+    vcs {
+        root(DslContext.settingsRoot)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    steps {
+        gradle {
+            tasks = "clean publishPlugin"
+            buildFile = ""
+            enableStacktrace = true
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+    }
+})

.teamcity/_Self/buildTypes/ReleaseEap.kt

@@ -0,0 +1,67 @@
+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.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.vcsLabeling
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.ScheduleTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
+
+object ReleaseEap : BuildType({
+    name = "Publish EAP Build"
+    description = "Build and publish EAP of IdeaVim plugin"
+
+    artifactRules = "build/distributions/*"
+    buildNumberPattern = "0.60.%build.counter%"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "2020.2")
+        password("env.ORG_GRADLE_PROJECT_publishToken", "credentialsJSON:ec1dc748-e289-47e1-88b6-f193d7999bf4", label = "Token")
+        param("env.ORG_GRADLE_PROJECT_publishUsername", "vlan")
+        param("env.ORG_GRADLE_PROJECT_version", "%build.number%")
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_publishChannels", "eap")
+        password("env.ORG_GRADLE_PROJECT_slackUrl", "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5", label = "Slack Token")
+    }
+
+    vcs {
+        root(DslContext.settingsRoot)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    steps {
+        gradle {
+            tasks = "clean publishPlugin slackEapNotification"
+            buildFile = ""
+            enableStacktrace = true
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+    }
+
+    triggers {
+        schedule {
+            enabled = false
+            schedulingPolicy = daily {
+                hour = 22
+            }
+            branchFilter = ""
+            triggerBuild = onWatchedBuildChange {
+                buildType = "IdeaVim_TestsForIntelliJBranch146"
+                watchedBuildRule = ScheduleTrigger.WatchedBuildRule.LAST_SUCCESSFUL
+                watchedBuildBranchFilter = "<default>"
+                promoteWatchedBuild = false
+            }
+        }
+    }
+
+    features {
+        vcsLabeling {
+            vcsRootId = "${DslContext.settingsRoot.id}"
+            labelingPattern = "%system.build.number%-EAP"
+            successfulOnly = true
+            branchFilter = ""
+        }
+    }
+})

.teamcity/_Self/buildTypes/TestsForIntelliJ20181.kt

@@ -0,0 +1,42 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object TestsForIntelliJ20181 : BuildType({
+    name = "Tests for IntelliJ 2018.1"
+    description = "branch 181"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-2018.1")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+        param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.Branch_181)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    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")
+    }
+})

.teamcity/_Self/buildTypes/TestsForIntelliJ20182.kt

@@ -0,0 +1,42 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object TestsForIntelliJ20182 : BuildType({
+    name = "Tests for IntelliJ 2018.2"
+    description = "branch 182"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-2018.2")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+        param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.Branch_181)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    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")
+    }
+})

.teamcity/_Self/buildTypes/TestsForIntelliJ20183.kt

@@ -0,0 +1,43 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object TestsForIntelliJ20183 : BuildType({
+    name = "Tests for IntelliJ 2018.3"
+    description = "branch 183"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-2018.3")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+        param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.Branch_183)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    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")
+    }
+})

.teamcity/_Self/buildTypes/TestsForIntelliJ20191.kt

@@ -0,0 +1,43 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object TestsForIntelliJ20191 : BuildType({
+    name = "Tests for IntelliJ 2019.1"
+    description = "branch 191"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-2019.1")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+        param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.Branch_191_193)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    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")
+    }
+})

.teamcity/_Self/buildTypes/TestsForIntelliJ20192.kt

@@ -0,0 +1,43 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object TestsForIntelliJ20192 : BuildType({
+    name = "Tests for IntelliJ 2019.2"
+    description = "branch 192"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "false")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-2019.2")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+        param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.Branch_191_193)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    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")
+    }
+})

.teamcity/_Self/buildTypes/TestsForIntelliJ20193.kt

@@ -0,0 +1,43 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object TestsForIntelliJ20193 : BuildType({
+    name = "Tests for IntelliJ 2019.3"
+    description = "branch 193"
+
+    params {
+        param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+        param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "false")
+        param("env.ORG_GRADLE_PROJECT_ideaVersion", "2019.3")
+        param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+        param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+    }
+
+    vcs {
+        root(_Self.vcsRoots.Branch_191_193)
+
+        checkoutMode = CheckoutMode.ON_SERVER
+    }
+
+    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")
+    }
+})

.teamcity/_Self/vcsRoots/Branch_181.kt

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

.teamcity/_Self/vcsRoots/Branch_183.kt

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

.teamcity/_Self/vcsRoots/Branch_191_193.kt

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

.teamcity/_Self/vcsRoots/Branch_Nvim.kt

@@ -0,0 +1,11 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_Nvim : GitVcsRoot({
+    name = "https://github.com/JetBrains/ideavim (branch nvim)"
+    url = "https://github.com/JetBrains/ideavim.git"
+    branch = "neovim"
+})

.teamcity/_Self/vcsRoots/GitHubPullRequest.kt

@@ -0,0 +1,12 @@
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object GitHubPullRequest : GitVcsRoot({
+    name = "IdeaVim Pull Requests"
+    url = "git@github.com:JetBrains/ideavim.git"
+    branchSpec = "+:refs/(pull/*)/head"
+    authMethod = uploadedKey {
+      uploadedKey = "Alex Plate TeamCity key"
+    }
+})

.teamcity/pom.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <name>IdeaVim Config DSL Script</name>
+  <groupId>IdeaVim</groupId>
+  <artifactId>IdeaVim_dsl</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <parent>
+    <groupId>org.jetbrains.teamcity</groupId>
+    <artifactId>configs-dsl-kotlin-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <repositories>
+    <repository>
+      <id>jetbrains-all</id>
+      <url>https://download.jetbrains.com/teamcity-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>teamcity-server</id>
+      <url>https://teamcity.jetbrains.com/app/dsl-plugins-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>JetBrains</id>
+      <url>https://download.jetbrains.com/teamcity-repository</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <build>
+    <sourceDirectory>${basedir}</sourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>kotlin-maven-plugin</artifactId>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <version>${kotlin.version}</version>
+
+        <configuration/>
+        <executions>
+          <execution>
+            <id>compile</id>
+            <phase>process-sources</phase>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>test-compile</id>
+            <phase>process-test-sources</phase>
+            <goals>
+              <goal>test-compile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.jetbrains.teamcity</groupId>
+        <artifactId>teamcity-configs-maven-plugin</artifactId>
+        <version>${teamcity.dsl.version}</version>
+        <configuration>
+          <format>kotlin</format>
+          <dstDir>target/generated-configs</dstDir>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jetbrains.teamcity</groupId>
+      <artifactId>configs-dsl-kotlin</artifactId>
+      <version>${teamcity.dsl.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.teamcity</groupId>
+      <artifactId>configs-dsl-kotlin-plugins</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <type>pom</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-script-runtime</artifactId>
+      <version>${kotlin.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

.teamcity/settings.kts

@@ -0,0 +1,33 @@
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+
+/*
+The settings script is an entry point for defining a single
+TeamCity project. TeamCity looks for the 'settings.kts' file in a
+project directory and runs it if it's found, so the script name
+shouldn't be changed and its package should be the same as the
+project's id.
+
+The script should contain a single call to the project() function
+with a Project instance or an init function as an argument.
+
+VcsRoots, BuildTypes, and Templates of this project must be
+registered inside project using the vcsRoot(), buildType(), and
+template() methods respectively.
+
+Subprojects can be defined either in their own settings.kts or by
+calling the subProjects() method in this project.
+
+To debug settings scripts in command-line, run the
+
+    mvnDebug org.jetbrains.teamcity:teamcity-configs-maven-plugin:generate
+
+command and attach your debugger to the port 8000.
+
+To debug in IntelliJ Idea, open the 'Maven Projects' tool window (View ->
+Tool Windows -> Maven Projects), find the generate task
+node (Plugins -> teamcity-configs -> teamcity-configs:generate),
+the 'Debug' option is available in the context menu for the task.
+*/
+
+version = "2020.1"
+project(_Self.Project)

CHANGES.md

@@ -22,13 +22,33 @@ It is important to distinguish EAP from traditional pre-release software.
 Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
-To Be Released
------------
+## To Be Released
 
-**Features:**
+### Features:
+* Ability to map IDE actions via the `<Action>` keyword. E.g. `map <C-K> <Action>(CommentByLineComment)`.
+  Check out `README.md` for the details.
+* `IdeaVim: track action Ids` command to find action ids for the `:action` command.
+  Enable this option in "Search everywhere" (double shift).
+  
+### Changes:
+* Fix `<Esc>` for dialogs. Now `<Esc>` will exit insert / visual mode and close the dialog from normal mode.
+* Add option to disable IdeaVim
+in dialogs / single line editors. [VIM-765](https://youtrack.jetbrains.com/issue/VIM-765)  
+Use `set ideaenabledbufs=` to disable IdeaVim in dialog editors.  
+_Note for EAP users: the option name can be changed for the stable release_
+
+### Fixes:
+* [VIM-2150](https://youtrack.jetbrains.com/issue/VIM-2150) `Shift-D` should not delete an empty line
+* [VIM-2157](https://youtrack.jetbrains.com/issue/VIM-2157) Fix tab with an active template
+* [VIM-2156](https://youtrack.jetbrains.com/issue/VIM-2156) Correct up/down motions with inlays
+* [VIM-2144](https://youtrack.jetbrains.com/issue/VIM-2144) Correct text position after block insert with inlays
+
+## 0.60, 2020-10-09
+
+### Features:
 * Support of `virtualedit=onemore` ([VIM-844](https://youtrack.jetbrains.com/issue/VIM-844))
 
-**Fixes:**
+### Fixes:
 * [VIM-2097](https://youtrack.jetbrains.com/issue/VIM-2097) Do not apply mappings for register selecting
 * [VIM-2080](https://youtrack.jetbrains.com/issue/VIM-2080) Fix S command with count
 * [VIM-2099](https://youtrack.jetbrains.com/issue/VIM-2099) Fix operations with backward inclusive motions
@@ -38,22 +58,21 @@ To Be Released
 * [VIM-1770](https://youtrack.jetbrains.com/issue/VIM-1770) Fix goto end with large inline hints
 * [VIM-2110](https://youtrack.jetbrains.com/issue/VIM-2110) Fix scrolling for non-monospaced fonts
 
-**Changes:**
+### Changes:
 * `:w` works as `:wa` by default. This can be disabled with `ideawrite` option.
  
     Now features like `Prettier on save` or `Run on save for files` would work with `:w` command as well.
   
     See [VIM-1968](https://youtrack.jetbrains.com/issue/VIM-1968).
   
-**Merged PRs:**
+### Merged PRs:
 * [248](https://github.com/JetBrains/ideavim/pull/248) by [Yaohui Wang](https://github.com/yaohui-wyh): Check if project is disposed when editorDeinit
 * [242](https://github.com/JetBrains/ideavim/pull/242) by [Iain Ballard](https://github.com/i-e-b): Partial implementation of virtualedit config
 * [252](https://github.com/JetBrains/ideavim/pull/252) by [Matt Ellis](https://github.com/citizenmatt): Fixes for scrolling
 
-0.59, 2020-08-25
-------------
+## 0.59, 2020-08-25
 
-**Features:**
+### Features:
 * `vim-highlightedyank` plugin emulation ([VIM-1970](https://youtrack.jetbrains.com/issue/VIM-1970) | [vim-highlightedyank](https://github.com/machakann/vim-highlightedyank)).
 
     * <details>
@@ -63,22 +82,21 @@ To Be Released
 
 * [VIM-2068](https://youtrack.jetbrains.com/issue/VIM-2068) `:tabclose` command
 
-**Fixes:**
+### Fixes:
 * [VIM-1421](https://youtrack.jetbrains.com/issue/VIM-1421) Escape key finishes `t` and `f` motions
 * [VIM-2075](https://youtrack.jetbrains.com/issue/VIM-2075) Fix zR command
 * [VIM-2059](https://youtrack.jetbrains.com/issue/VIM-2059) Fixed macro editing
 
-**Merged PRs:**
+### Merged PRs:
 * [237](https://github.com/JetBrains/ideavim/pull/237) by [Adrià Farrés](https://github.com/adriafarres): Reset operator-pending commands on escape
 * [241](https://github.com/JetBrains/ideavim/pull/241) by [Patrick Elmquist](https://github.com/patrick-elmquist): Properly reset when pressing Esc in the middle of command
 * [244](https://github.com/JetBrains/ideavim/pull/244) by [Rieon Ke](https://github.com/rieonke): Implement tabc[lose] ex command
 * [240](https://github.com/JetBrains/ideavim/pull/240) by [Rieon Ke](https://github.com/rieonke): add support for putting & editing macros
 * [245](https://github.com/JetBrains/ideavim/pull/245) by [KostkaBrukowa](https://github.com/KostkaBrukowa): VIM-1970 | Working solution of plugin vim-highlightedyank
 
-0.58, 2020-07-07
--------------
+## 0.58, 2020-07-07
 
-**Features:**
+### Features:
 * `exchange` plugin emulation ([VIM-921](https://youtrack.jetbrains.com/issue/VIM-921) | [vim-exchange](https://github.com/tommcdo/vim-exchange)).
 * `~/.ideavimrc` file can be reloaded using the new floating action.
 
@@ -89,10 +107,10 @@ To Be Released
 
 * Add `:buffer` command.
 
-**Changes:**
+### Changes:
 * Support IntelliJ's smooth scrolling. Use "Enable smooth scrolling" checkbox in _Preferences | Editor | General_ to disable.
 
-**Fixes:**
+### Fixes:
 * [VIM-1994](https://youtrack.jetbrains.com/issue/VIM-1994) Correct paste after `y}P` command.
 * [VIM-1924](https://youtrack.jetbrains.com/issue/VIM-1924) Select next occurrence doesn't become block selection.
 * [VIM-2038](https://youtrack.jetbrains.com/issue/VIM-2038) Last line is now accessible in normal mode
@@ -102,7 +120,7 @@ To Be Released
 * Fix mappings to `"\<SPACE>"` including `let mapleader="\<SPACE>"`
 
 
-**Merged PRs:**
+### Merged PRs:
 * [233](https://github.com/JetBrains/ideavim/pull/233) by [valis](https://github.com/valis): [VIM-1994] Correct paste after `y}P` command.
 * [224](https://github.com/JetBrains/ideavim/pull/224) by [pmnoxx](https://github.com/pmnoxx): Populate intelij navigation history together with ideavim jumplist.
 * [227](https://github.com/JetBrains/ideavim/pull/227) by [angelbot](https://github.com/angelbot): Add support for buffer command.
@@ -110,33 +128,31 @@ To Be Released
 * [231](https://github.com/JetBrains/ideavim/pull/231) by [citizenmatt](https://github.com/citizenmatt): Support smooth scrolling.
 * [239](https://github.com/JetBrains/ideavim/pull/239) by [citizenmatt](https://github.com/citizenmatt): Use new API for relative line numbers
 
-0.57, 2020-04-28
--------------
+## 0.57, 2020-04-28
 
-**Fixes:**
+### Fixes:
 * [VIM-1992](https://youtrack.jetbrains.com/issue/VIM-1992) Fix mappings to `<S-Letter>`
 * [VIM-1991](https://youtrack.jetbrains.com/issue/VIM-1991) Fix working with number registers
 
-**Merged PRs:**
+### Merged PRs:
 * [234](https://github.com/JetBrains/ideavim/pull/234) by [runforprogram](https://github.com/runforprogram): [VIM-1991] fix >0 number register not work
 
-0.56, 2020-04-09
---------------
+## 0.56, 2020-04-09
 
-**Features:**
+### Features:
 * `ReplaceWithRegister` plugin emulation ([ReplaceWithRegister](https://www.vim.org/scripts/script.php?script_id=2703)).
 * `argtextobj.vim` plugin emulation ([argtextobj.vim](https://vim.sourceforge.io/scripts/script.php?script_id=2699)).
 * `vim-textobj-entire` plugin emulation ([vim-textobj-entire](https://github.com/kana/vim-textobj-entire)).
 * [VIM-434](https://youtrack.jetbrains.com/issue/VIM-434) Add `'showcmd'` support, on by default.
 * Support `ls/buffers/files` commands.
 
-**Changes:**
+### Changes:
 * Replace `ideastatusbar` option with `ideastatusicon`. Now you can make the icon gray.
 
-**Deprecations:**
+### Deprecations:
 * `ideastatusbar` option is deprecated now. See `ideastatusicon`.
 
-**Fixes:**
+### Fixes:
 * [VIM-1284](https://youtrack.jetbrains.com/issue/VIM-1284) Fix mapping of digits.
 * Fix handling of counts on both operator and motion, e.g. `3d2w` deletes 6 words, instead of 32.
 * Allow mapping of `<C-K>` and `<C-V>`/`<C-Q>`.
@@ -149,15 +165,14 @@ To Be Released
 * [VIM-1911](https://youtrack.jetbrains.com/issue/VIM-1911) Lookup keys respect `IDE` handler.
 * [VIM-1008](https://youtrack.jetbrains.com/issue/VIM-1008) Correct `ci{` behavior.
 
-0.55, 2020-01-20
---------------
+## 0.55, 2020-01-20
 
-**Features:**
+### Features:
 * Surround and Commentary extensions support repeating with a dot command ([VIM-1118](https://youtrack.jetbrains.com/issue/VIM-1118))
 * Support XDG settings standard ([VIM-664](https://youtrack.jetbrains.com/issue/VIM-664))
 * Add option to remove the status bar icon ([VIM-1847](https://youtrack.jetbrains.com/issue/VIM-1847))
 
-**Fixes:**
+### Fixes:
 * [VIM-1823](https://youtrack.jetbrains.com/issue/VIM-1823) Fix multiple carets with ignorecase
 * [VIM-1053](https://youtrack.jetbrains.com/issue/VIM-1053)
   [VIM-1038](https://youtrack.jetbrains.com/issue/VIM-1038)
@@ -180,21 +195,20 @@ To Be Released
 * [VIM-1884](https://youtrack.jetbrains.com/issue/VIM-1884) Show quickDoc during popup with `CTRL-J`
 * [VIM-987](https://youtrack.jetbrains.com/issue/VIM-987) Fix arrow keys for the NEO keyboard
 
-0.54, 2019-11-20
---------------
+## 0.54, 2019-11-20
 
-**Features:**
+### Features:
 * EasyMotion plugin emulation ([VIM-820](https://youtrack.jetbrains.com/issue/VIM-820) | [Instructions](https://github.com/JetBrains/ideavim#emulated-vim-plugins))
 * Support surrounding with a function name ([link](https://github.com/tpope/vim-surround/blob/master/doc/surround.txt#L138))
 * Add `:delmarks` command ([VIM-1720](https://youtrack.jetbrains.com/issue/VIM-1720))
 * Add IdeaVim icon to the status bar ([VIM-943](https://youtrack.jetbrains.com/issue/VIM-943))
 
-**Changes:**
+### Changes:
 * Remove the default IdeaVim toggle shortcut (<kbd>CTRL</kbd><kbd>ALT</kbd><kbd>V</kbd>)
 * Rename `refactoring` value of `selectmode` option to `ideaselection`
 * Remove `template` value of `selectmode` option and replace it with `idearefactormode` option.
 
-**Fixes:**
+### Fixes:
 * [VIM-1766](https://youtrack.jetbrains.com/issue/VIM-1766) Fix disappearing caret in ex entry on Linux
 * [VIM-1032](https://youtrack.jetbrains.com/issue/VIM-1032) Annotations work well with relative line numbers enabled
 * [VIM-1762](https://youtrack.jetbrains.com/issue/VIM-1762) Relative line numbers respect line number theme
@@ -221,8 +235,7 @@ To Be Released
 * [VIM-1604](https://youtrack.jetbrains.com/issue/VIM-1604) Add IdeaVim logo
 
 
-0.53, 2019-08-07
---------------
+## 0.53, 2019-08-07
 * [VIM-1711](https://youtrack.jetbrains.com/issue/VIM-1711) Search is not triggered during surround action
 * [VIM-1712](https://youtrack.jetbrains.com/issue/VIM-1712) Fix `Y` command for visual mode
 * [VIM-1713](https://youtrack.jetbrains.com/issue/VIM-1713) Surround in visual mode put caret in correct position
@@ -233,8 +246,7 @@ To Be Released
 * [VIM-1736](https://youtrack.jetbrains.com/issue/VIM-1736) Fix `` for ex panel
 * [VIM-1739](https://youtrack.jetbrains.com/issue/VIM-1739) Fix full-width characters for ex pane
 
-0.52, 2019-07-23
---------------
+## 0.52, 2019-07-23
 
 * Introduce [Select Mode](https://github.com/JetBrains/ideavim/wiki/Select-mode).
 
@@ -327,8 +339,7 @@ To Be Released
 * [VIM-1698](https://youtrack.jetbrains.com/issue/VIM-1698) Paste doesn't clear clipboard
 * [VIM-1359](https://youtrack.jetbrains.com/issue/VIM-1359) Fix behavior of i_CTRL-W action
 
-0.51, 2019-02-12
-----------------
+## 0.51, 2019-02-12
 
 * [VIM-1558](https://youtrack.jetbrains.com/issue/VIM-1558) Fixed scrolling for code with block inlays in Rider 2018.3 
 * [VIM-1187](https://youtrack.jetbrains.com/issue/VIM-1187) Improved performance of `set relativelinenumber` on large files
@@ -336,8 +347,7 @@ To Be Released
 * [VIM-798](https://youtrack.jetbrains.com/issue/VIM-798) Allow arrow keys for window navigation commands
 
 
-0.50, 2018-10-18
-----------------
+## 0.50, 2018-10-18
 
 Moved "Vim Emulation" settings into "File | Settings | Vim Emulation". Support
 for vim-multiple-cursors commands `<A-n>`, `<A-x>`, `<A-p>`, `g<A-n>` (put `set
@@ -363,8 +373,7 @@ Vim commands for multiple cursors. Various bug fixes.
 * [VIM-1274](https://youtrack.jetbrains.com/issue/VIM-1274) Correctly process escaping when `smartcase` is on
 
 
-0.49, 2017-12-12
-----------------
+## 0.49, 2017-12-12
 
 Enabled zero-latency typing for Vim emulation. Added support for `iskeyword` option. Various bug fixes.
 
@@ -372,8 +381,7 @@ Enabled zero-latency typing for Vim emulation. Added support for `iskeyword` opt
 * [VIM-1367](https://youtrack.jetbrains.com/issue/VIM-1367) Support `iskeyword` option
 * [VIM-523](https://youtrack.jetbrains.com/issue/VIM-523) Fixed global mark remembering only the line number
 
-0.48, 2017-01-15
-----------------
+## 0.48, 2017-01-15
 
 A bugfix release.
 
@@ -387,8 +395,7 @@ Features:
 * Support for zero-latency rendering
 
 
-0.47, 2016-10-19
-----------------
+## 0.47, 2016-10-19
 
 A bugfix release.
 
@@ -398,8 +405,7 @@ Bug fixes:
 * VIM-1190 Fixed exception "Write access is allowed from write-safe contexts only"
 
 
-0.46, 2016-07-07
-----------------
+## 0.46, 2016-07-07
 
 Added `incsearch` option for incremental search. Added support for `it` and
 `at` tag block selection. Added `vim-surround` commands `ys`, `cs`, `ds`,
@@ -427,8 +433,7 @@ Bug fixes:
 * VIM-1126 Fixed warning about modifying shortcuts of global actions for 2016.2
 
 
-0.44, 2015-11-02
-----------------
+## 0.44, 2015-11-02
 
 A bugfix release.
 
@@ -437,16 +442,14 @@ A bugfix release.
   plugin disabled
 
 
-0.43, 2015-11-02
-----------------
+## 0.43, 2015-11-02
 
 A bugfix release.
 
 * VIM-1039 Fixed running the plugin with Java 6
 
 
-0.42, 2015-11-01
-----------------
+## 0.42, 2015-11-01
 
 This release is compatible with IntelliJ 15+ and other IDEs based on the
 IntelliJ platform branch 143+.
@@ -454,8 +457,7 @@ IntelliJ platform branch 143+.
 * VIM-970 Fixed move commands in read-only files
 
 
-0.41, 2015-06-10
-----------------
+## 0.41, 2015-06-10
 
 A bugfix release.
 
@@ -463,8 +465,7 @@ A bugfix release.
   IntelliJ
 
 
-0.40, 2015-06-09
-----------------
+## 0.40, 2015-06-09
 
 Added support for `mapleader`. Support comments in `%` brace matching. Various
 bug fixes.
@@ -491,8 +492,7 @@ Bug fixes:
 * VIM-930 Fixed editor focus issues after closing Ex entry box on Oracle Java 6
 
 
-0.39, 2014-12-03
-----------------
+## 0.39, 2014-12-03
 
 A bugfix release.
 
@@ -504,8 +504,7 @@ Bug fixes:
 * EA-63022 Don't update line numbers in the caret movement event listener
 
 
-0.38, 2014-12-01
-----------------
+## 0.38, 2014-12-01
 
 Added support for `number` and `relativenumber` options, `clipboard=unnamed`
 option. Added `:action` and `:actionlist` commands for executing arbitrary
@@ -537,8 +536,7 @@ Bug fixes:
 * VIM-723 Fix pasting to an empty line
 
 
-0.37, 2014-10-15
-----------------
+## 0.37, 2014-10-15
 
 A bugfix release.
 
@@ -549,8 +547,7 @@ Bug fixes:
 * VIM-407 Fixed `>>` to work if a line contains only one character
 
 
-0.36, 2014-10-14
-----------------
+## 0.36, 2014-10-14
 
 Added support for common window splitting and navigation commands. Various bug
 fixes.
@@ -569,8 +566,7 @@ Bug fixes:
 * VIM-569 Fixed `<C-W>` when the caret is at the end of a line
 
 
-0.35, 2014-05-15
-----------------
+## 0.35, 2014-05-15
 
 The `~/.vimrc` initialization file is no longer read by default, use
 `~/.ideavimrc` instead.
@@ -591,8 +587,7 @@ Bug fixes:
   selection
 
 
-0.34, 2014-04-29
-----------------
+## 0.34, 2014-04-29
 
 A bugfix release.
 
@@ -606,8 +601,7 @@ Bug fixes:
 * VIM-667 Ignore potentially nested lines of .vimrc based on leading whitespace
 
 
-0.33, 2014-04-28
-----------------
+## 0.33, 2014-04-28
 
 Added support for `:map` key mapping commands. New keyboard shortcuts handler
 that doesn't require a separate keymap for Vim emulation. Added support for
@@ -626,14 +620,12 @@ Bug fixes:
 * VIM-281 Don't disable global reformat code action for Vim emulation
 
 
-0.32, 2013-11-15
-----------------
+## 0.32, 2013-11-15
 
 Fixed API compatibility with IntelliJ platform builds 132.1052+.
 
 
-0.31, 2013-11-12
-----------------
+## 0.31, 2013-11-12
 
 A bugfix release.
 
@@ -642,8 +634,7 @@ Bug fixes:
 * VIM-582 Fixed line comment and reformat commands with no visual selection
 
 
-0.30, 2013-11-11
-----------------
+## 0.30, 2013-11-11
 
 Added support for a separate `.ideavimrc` config file. Fixed long-standing
 issues with merged undo/redo commands and `<Esc>` during code completion.
@@ -663,8 +654,7 @@ Bug fixes:
 * Fixed several reported exceptions
 
 
-0.29, 2013-05-15
-----------------
+## 0.29, 2013-05-15
 
 A bugfix release.
 
@@ -675,8 +665,7 @@ Bug fixes:
 * VIM-121 Don't move cursor while scrolling
 
 
-0.28, 2013-04-06
-----------------
+## 0.28, 2013-04-06
 
 A bugfix release.
 
@@ -686,8 +675,7 @@ Bug fixes:
 * VIM-479 Don't try to activate insert mode for diff view
 
 
-0.27, 2013-04-03
-----------------
+## 0.27, 2013-04-03
 
 New Vim keymap generator creates better keymaps, especially for Mac OS X.
 Restart after reconfiguring the keymap is no longer required.
@@ -708,8 +696,7 @@ Bug fixes:
 * Fixed command window font size to match editor font size
 
 
-0.26, 2012-12-26
-----------------
+## 0.26, 2012-12-26
 
 Added support for paste in the command mode: from a register using `<C-R>`,
 from the clipboard using `<S-Insert>` or `<M-V>`. Added support for the last
@@ -728,8 +715,7 @@ Bug fixes:
 * VIM-302 Fixed tab switching order for `gt` and `gT`
 
 
-0.25, 2012-12-19
-----------------
+## 0.25, 2012-12-19
 
 A bugfix release.
 
@@ -738,8 +724,7 @@ A bugfix release.
   character
 
 
-0.24, 2012-12-03
-----------------
+## 0.24, 2012-12-03
 
 Added Vim string object selection motions (see help topics `v_i"`, `v_a"`).
 Various bug fixes.
@@ -778,8 +763,7 @@ Bug fixes:
 * VIM-157 Fixed regression in moving the cursor after `~`
 
 
-0.23.115, 2012-11-14
---------------------
+## 0.23.115, 2012-11-14
 
 A bugfix release.
 
@@ -788,8 +772,7 @@ A bugfix release.
 * VIM-112 Delete a single previous word with <C-W> in insert mode, not all inserted words
 
 
-0.23.111, 2012-11-12
---------------------
+## 0.23.111, 2012-11-12
 
 A bugfix release.
 
@@ -808,8 +791,7 @@ A bugfix release.
   found
 
 
-0.23.93, 2012-03-21
--------------------
+## 0.23.93, 2012-03-21
 
 A bugfix release. Vim.xml was fixed to use Command+C, Command+V on Mac OS.
 Unfortunately you need to update Vim.xml manually this time.

README.md

@@ -195,18 +195,35 @@ Ex commands or via `:map` command mappings:
     * Find IDE actions by name or keymap pattern (E.g. `:actionlist extract`, `:actionlist <C-D`)
 * `:action {name}`
     * Execute an action named `NAME`
+    
+In addition to `:actionlist` command, IdeaVim provides `IdeaVim: track action Ids` option to 
+extract the ids of executed command. This option can be found in "Search everywhere" (double `shift`). **[To Be Released]**
+
+<details>
+    <summary><strong>"Track aciton Ids" Details</strong> (click to see)</summary>
+    <img src="resources/readme/track_action_id.gif" alt="track actioin ids"/>
+</details>
+
+For the mappings you can use a special `<Action>` keyword. Use `<Action>(*action_id*)` to map keys to some action. Don't
+forget the parentheses. This keyword works for insert mode as well. **[To Be Released]**
 
 Examples:
 
 ```vim
 " Map \r to the Reformat Code action
-:map \r :action ReformatCode<CR>
+    :map \r :action ReformatCode<CR>
+" or
+    :map \r <Action>(ReformatCode)   " [To Be Released]
 
 " Map <leader>d to start debug
-:map <leader>d :action Debug<CR>
+    :map <leader>d :action Debug<CR>
+" or
+    :map <leader>d <Action>(Debug)   " [To Be Released]
 
 " Map \b to toggle the breakpoint on the current line
-:map \b :action ToggleLineBreakpoint<CR>
+    :map \b :action ToggleLineBreakpoint<CR>
+" or
+    :map \b <Action>(ToggleLineBreakpoint)   " [To Be Released]
 ```
 
 ### Undo/Redo

build.gradle

@@ -1,15 +1,21 @@
+import dev.feedforward.markdownto.DownParser
+
 buildscript {
   repositories {
     mavenCentral()
+    maven { url 'https://jitpack.io' }
   }
 
   dependencies {
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+    classpath "com.github.AlexPl292:mark-down-to-slack:1.0.1"
   }
 }
 
 plugins {
-  id 'org.jetbrains.intellij' version '0.4.18'
+  id 'org.jetbrains.intellij' version '0.5.0'
+  id 'io.gitlab.arturbosch.detekt' version '1.14.1'
+  id "org.jetbrains.changelog" version "0.6.2"
 }
 
 apply plugin: 'java'
@@ -48,6 +54,7 @@ intellij {
 
 repositories {
   mavenCentral()
+  jcenter()
 }
 
 dependencies {
@@ -69,20 +76,44 @@ compileTestKotlin {
   }
 }
 
-task testWithNeovim(type : Test) {
+detekt {
+  config = files("./detekt/config.yaml")
+  baseline = file("${rootProject.projectDir}/detekt/baseline.xml")
+  input = files("src")
+
+  buildUponDefaultConfig = true
+
+  reports {
+    html.enabled = false
+    xml.enabled = false
+    txt.enabled = false
+  }
+}
+
+tasks.detekt.jvmTarget = javaVersion
+
+task testWithNeovim(type: Test) {
   group = "verification"
   systemProperty "ideavim.neovim.test", 'true'
 }
 
+changelog {
+  groups = ["Features:", "Changes:", "Deprecations:", "Fixes:", "Merged PRs:"]
+  itemPrefix = "*"
+  path = "${project.projectDir}/CHANGES.md"
+  unreleasedTerm = "To Be Released"
+  headerParserRegex = /0\.\d{2}(.\d+)?/
+//  header = { "${project.version}" }
+//  version = "0.60"
+}
+
 tasks.register("slackEapNotification") {
   doLast {
     if (!slackUrl) return
     def post = new URL(slackUrl).openConnection()
-    def changeLog = extractChangelog()
-    changeLog = changeLog.replace("* ", "• ") // Replace stars with bullets
-    changeLog = changeLog.replace("**", "*") // Enable bold text
-    changeLog = changeLog.replaceAll("\\[([^]]+)]\\(([^)]+)\\)", '<$2|$1>') // Enable links
-    def message ="""
+    def changeLog = changelog.getUnreleased().toText()
+    def slackDown = new DownParser(changeLog).toSlack().toString()
+    def message = """
       {
           "text": "New version of IdeaVim",
           "blocks": [
@@ -90,7 +121,7 @@ tasks.register("slackEapNotification") {
                     "type": "section",
                     "text": {
                       "type": "mrkdwn",
-                      "text": "IdeaVim EAP $version has been released\\n$changeLog"
+                      "text": "IdeaVim EAP $version has been released\\n$slackDown"
                     }
                   }
           ]
@@ -102,32 +133,8 @@ tasks.register("slackEapNotification") {
     post.getOutputStream().write(message.getBytes("UTF-8"))
     def postRC = post.getResponseCode()
     println(postRC)
-    if(postRC == 200) {
+    if (postRC == 200) {
       println(post.getInputStream().getText())
     }
   }
 }
-
-// Very primitive changelog extraction code
-def extractChangelog() {
-  def startLine = "_Available since $version EAP:_"
-  def endLine = "_To Be Released..._"
-  def startSaving = false
-  def res = new StringBuilder()
-  new File("./CHANGES.md").eachLine { line ->
-    if (startSaving) {
-      if (line == endLine) {
-        startSaving = false
-      }
-      else {
-        res.append(line).append('\n')
-      }
-    }
-    else {
-      if (line == startLine) {
-        startSaving = true
-      }
-    }
-  }
-  return res.toString()
-}

detekt/baseline.xml

@@ -0,0 +1,151 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues>
+    <ID>ComplexMethod:CmdHandler.kt$CmdHandler$private fun addAlias(cmd: ExCommand, editor: Editor?): Boolean</ID>
+    <ID>ComplexMethod:CommandHandler.kt$CommandHandler$ @Throws(ExException::class) fun process(editor: Editor, context: DataContext, cmd: ExCommand, count: Int): Boolean</ID>
+    <ID>ComplexMethod:CommandState.kt$CommandState$ fun toVimNotation(): String</ID>
+    <ID>ComplexMethod:CommandState.kt$CommandState$private fun getStatusString(pos: Int): String</ID>
+    <ID>ComplexMethod:HistoryHandler.kt$HistoryHandler$override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>ComplexMethod:OptionsManager.kt$OptionsManager$ fun parseOptionLine(editor: Editor?, args: String, failOnBad: Boolean): Boolean</ID>
+    <ID>ComplexMethod:OptionsManager.kt$OptionsManager$ private fun showOptions(editor: Editor?, opts: Collection&lt;Option&lt;*&gt;&gt;, showIntro: Boolean)</ID>
+    <ID>ComplexMethod:PutGroup.kt$PutGroup$private fun moveCaretToEndPosition( editor: Editor, caret: Caret, startOffset: Int, endOffset: Int, typeInRegister: SelectionType, modeInEditor: CommandState.SubMode, caretAfterInsertedText: Boolean )</ID>
+    <ID>ComplexMethod:PutGroup.kt$PutGroup$private fun prepareDocumentAndGetStartOffsets(editor: Editor, caret: Caret, typeInRegister: SelectionType, data: PutData, additionalData: Map&lt;String, Any&gt;): List&lt;Int&gt;</ID>
+    <ID>ComplexMethod:SearchHelperKt.kt$// bounds are considered inside corresponding quotes fun checkInString(chars: CharSequence, currentPos: Int, str: Boolean): Boolean</ID>
+    <ID>ComplexMethod:TabCloseHandler.kt$TabCloseHandler$ private fun getTabIndexToClose(arg: String, current: Int, last: Int): Int?</ID>
+    <ID>ComplexMethod:VimExchangeExtension.kt$VimExchangeExtension.Operator$private fun compareExchanges(x: Exchange, y: Exchange): ExchangeCompareResult</ID>
+    <ID>ComplexMethod:VimExtensionFacade.kt$VimExtensionFacade$ @JvmStatic fun inputString(editor: Editor, prompt: String, finishOn: Char?): String</ID>
+    <ID>ComplexMethod:VimMultipleCursorsExtension.kt$VimMultipleCursorsExtension.NextOccurrenceHandler$override fun executeInWriteAction(editor: Editor, context: DataContext)</ID>
+    <ID>ComplexMethod:VimShortcutKeyAction.kt$VimShortcutKeyAction$private fun isEnabled(e: AnActionEvent): Boolean</ID>
+    <ID>ComplexMethod:VisualGroup.kt$private fun setVisualSelection(selectionStart: Int, selectionEnd: Int, caret: Caret)</ID>
+    <ID>LongMethod:CmdHandler.kt$CmdHandler$private fun addAlias(cmd: ExCommand, editor: Editor?): Boolean</ID>
+    <ID>LongMethod:HistoryHandler.kt$HistoryHandler$override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>LongMethod:OptionsManager.kt$OptionsManager$ fun parseOptionLine(editor: Editor?, args: String, failOnBad: Boolean): Boolean</ID>
+    <ID>MagicNumber:ActionListHandler.kt$ActionListHandler$50</ID>
+    <ID>MagicNumber:AddBlockInlaysAction.kt$AddBlockInlaysAction$0.9f</ID>
+    <ID>MagicNumber:AddBlockInlaysAction.kt$AddBlockInlaysAction$1.75f</ID>
+    <ID>MagicNumber:AddBlockInlaysAction.kt$AddBlockInlaysAction$10</ID>
+    <ID>MagicNumber:AddBlockInlaysAction.kt$AddBlockInlaysAction$3</ID>
+    <ID>MagicNumber:AddBlockInlaysAction.kt$AddBlockInlaysAction$5</ID>
+    <ID>MagicNumber:AddBlockInlaysAction.kt$AddBlockInlaysAction$6</ID>
+    <ID>MagicNumber:AddBlockInlaysAction.kt$AddBlockInlaysAction$7</ID>
+    <ID>MagicNumber:AddInlineInlaysAction.kt$AddInlineInlaysAction$10</ID>
+    <ID>MagicNumber:AddInlineInlaysAction.kt$AddInlineInlaysAction$20</ID>
+    <ID>MagicNumber:AddInlineInlaysAction.kt$AddInlineInlaysAction$5</ID>
+    <ID>MagicNumber:AddInlineInlaysAction.kt$AddInlineInlaysAction$7</ID>
+    <ID>MagicNumber:BufferListHandler.kt$3</ID>
+    <ID>MagicNumber:CmdHandler.kt$CmdHandler$11</ID>
+    <ID>MagicNumber:CmdHandler.kt$CmdHandler$12</ID>
+    <ID>MagicNumber:CommandBuilder.kt$CommandBuilder$10</ID>
+    <ID>MagicNumber:CommandBuilder.kt$CommandBuilder$999999999</ID>
+    <ID>MagicNumber:ConfigurationMigrators.kt$Version 6 to 7 config migration$6</ID>
+    <ID>MagicNumber:ConfigurationMigrators.kt$Version 6 to 7 config migration$7</ID>
+    <ID>MagicNumber:EditorHelper.kt$10</ID>
+    <ID>MagicNumber:ExKeyBindings.kt$ExKeyBindings$0x05</ID>
+    <ID>MagicNumber:ExKeyBindings.kt$ExKeyBindings$0x08</ID>
+    <ID>MagicNumber:HistoryHandler.kt$HistoryHandler$7</ID>
+    <ID>MagicNumber:JumpsHandler.kt$JumpsHandler$200</ID>
+    <ID>MagicNumber:JumpsHandler.kt$JumpsHandler$3</ID>
+    <ID>MagicNumber:JumpsHandler.kt$JumpsHandler$5</ID>
+    <ID>MagicNumber:MarksHandler.kt$MarksHandler$200</ID>
+    <ID>MagicNumber:MarksHandler.kt$MarksHandler$3</ID>
+    <ID>MagicNumber:MarksHandler.kt$MarksHandler$5</ID>
+    <ID>MagicNumber:OptionsManager.kt$OptionsManager$100</ID>
+    <ID>MagicNumber:OptionsManager.kt$OptionsManager$1000</ID>
+    <ID>MagicNumber:OptionsManager.kt$OptionsManager$19</ID>
+    <ID>MagicNumber:OptionsManager.kt$OptionsManager$20</ID>
+    <ID>MagicNumber:OptionsManager.kt$OptionsManager$3</ID>
+    <ID>MagicNumber:OptionsManager.kt$OptionsManager$80</ID>
+    <ID>MagicNumber:ProcessExEntryAction.kt$ProcessExEntryAction$0x0a</ID>
+    <ID>MagicNumber:RegistersHandler.kt$RegistersHandler$200</ID>
+    <ID>MagicNumber:SearchHelperKt.kt$3</ID>
+    <ID>MagicNumber:SelectLastFileHandler.kt$SelectLastFileHandler$999</ID>
+    <ID>MagicNumber:SelectionType.kt$SelectionType.BLOCK_WISE$3</ID>
+    <ID>MagicNumber:ShiftLeftHandler.kt$ShiftLeftHandler$31</ID>
+    <ID>MagicNumber:ShiftRightHandler.kt$ShiftRightHandler$31</ID>
+    <ID>MagicNumber:VimHighlightedYank.kt$VimHighlightedYank.HighlightHandler$3</ID>
+    <ID>MagicNumber:VimHighlightedYank.kt$VimHighlightedYank.HighlightHandler$4</ID>
+    <ID>MatchingDeclarationName:CommandDefinition.kt$CommandName</ID>
+    <ID>MaxLineLength:ExBeanClass.kt$ExBeanClass$logger&lt;ExBeanClass&gt;().error("IdeaVim doesn't accept contributions to `vimActions` extension points. Please create a plugin using `VimExtension`. Plugin to blame: $pluginId")</ID>
+    <ID>MaxLineLength:ExRanges.kt$SearchRange$override</ID>
+    <ID>MaxLineLength:NotificationService.kt$NotificationService$notification.addAction(AppendToIdeaVimRcAction(notification, "set clipboard+=ideaput", "ideaput") { OptionsManager.clipboard.append(ClipboardOptionsData.ideaput) })</ID>
+    <ID>MaxLineLength:NotificationService.kt$NotificationService.AppendToIdeaVimRcAction$private inner</ID>
+    <ID>MaxLineLength:NotificationService.kt$NotificationService.AppendToIdeaVimRcAction$val successNotification = Notification(IDEAVIM_NOTIFICATION_ID, IDEAVIM_NOTIFICATION_TITLE, "&lt;code&gt;$optionName&lt;/code&gt; is enabled", NotificationType.INFORMATION)</ID>
+    <ID>MaxLineLength:OptionsManager.kt$OptionsManager$val clipboard = addOption(ListOption(ClipboardOptionsData.name, ClipboardOptionsData.abbr, arrayOf(ClipboardOptionsData.ideaput, "autoselect,exclude:cons\\|linux"), null))</ID>
+    <ID>MaxLineLength:PutGroup.kt$PutGroup$private</ID>
+    <ID>MaxLineLength:PutLinesHandler.kt$PutLinesHandler$val textData = registerGroup.lastRegister?.let { PutData.TextData(it.text ?: StringHelper.toKeyNotation(it.keys), SelectionType.LINE_WISE, it.transferableData) }</ID>
+    <ID>MaxLineLength:PutTextAction.kt$PutTextBaseAction$val textData = if (lastRegister != null) TextData(lastRegister.text ?: StringHelper.toKeyNotation(lastRegister.keys), lastRegister.type, lastRegister.transferableData) else null</ID>
+    <ID>MaxLineLength:ReplaceWithRegister.kt$ReplaceWithRegister.Operator$val visualSelection = PutData.VisualSelection(mapOf(editor.caretModel.primaryCaret to VimSelection.create(range.startOffset, range.endOffset - 1, selectionType, editor)), selectionType)</ID>
+    <ID>MaxLineLength:StatisticReporter.kt$StatisticReporter$val url = "https://plugins.jetbrains.com/plugins/list?pluginId=${VimPlugin.getPluginId().idString}&amp;build=$buildNumber&amp;pluginVersion=$version&amp;os=$os&amp;uuid=$uid"</ID>
+    <ID>MaxLineLength:VimShortcutKeyAction.kt$VimShortcutKeyAction.Companion$@JvmField val VIM_ONLY_EDITOR_KEYS: Set&lt;KeyStroke&gt; = ImmutableSet.builder&lt;KeyStroke&gt;().addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0)).addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0)) .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0)).addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0)).addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)).addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_LEFT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_RIGHT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_HOME, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_END, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_PAGE_UP, 0, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_PAGE_DOWN, 0, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)).build()</ID>
+    <ID>MaxLineLength:VimShortcutKeyAction.kt$VimShortcutKeyAction.Companion$ImmutableSet.builder&lt;KeyStroke&gt;().addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0)).addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0)) .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0)).addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0)).addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK))</ID>
+    <ID>MaxLineLength:VimShortcutKeyAction.kt$VimShortcutKeyAction.Companion$ImmutableSet.builder&lt;KeyStroke&gt;().addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0)).addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0)) .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0)).addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0)).addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)).addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_LEFT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))</ID>
+    <ID>MaxLineLength:VimShortcutKeyAction.kt$VimShortcutKeyAction.Companion$ImmutableSet.builder&lt;KeyStroke&gt;().addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0)).addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0)) .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0)).addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0)).addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)).addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_LEFT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_RIGHT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))</ID>
+    <ID>MaxLineLength:VimShortcutKeyAction.kt$VimShortcutKeyAction.Companion$ImmutableSet.builder&lt;KeyStroke&gt;().addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0)).addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0)) .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0)).addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0)).addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)).addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_LEFT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_RIGHT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)) .addAll(getKeyStrokes(KeyEvent.VK_HOME, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))</ID>
+    <ID>MemberNameEqualsClassName:Ranges.kt$Ranges$private val ranges: MutableList&lt;Range&gt; = mutableListOf()</ID>
+    <ID>NestedBlockDepth:OptionsManager.kt$OptionsManager$ fun parseOptionLine(editor: Editor?, args: String, failOnBad: Boolean): Boolean</ID>
+    <ID>ReturnCount:ActionBeanClass.kt$ActionBeanClass$fun getParsedModes(): Set&lt;MappingMode&gt;?</ID>
+    <ID>ReturnCount:Alias.kt$Alias$fun getCommand(input: String, count: Int): String</ID>
+    <ID>ReturnCount:CmdFilterHandler.kt$CmdFilterHandler$override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>ReturnCount:CmdHandler.kt$CmdHandler$private fun addAlias(cmd: ExCommand, editor: Editor?): Boolean</ID>
+    <ID>ReturnCount:CommandGroup.kt$CommandGroup$fun isAlias(command: String): Boolean</ID>
+    <ID>ReturnCount:DeleteJoinLinesAction.kt$DeleteJoinLinesAction$override fun execute(editor: Editor, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Boolean</ID>
+    <ID>ReturnCount:DeleteJoinLinesSpacesAction.kt$DeleteJoinLinesSpacesAction$override fun execute(editor: Editor, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Boolean</ID>
+    <ID>ReturnCount:DeleteJoinVisualLinesAction.kt$DeleteJoinVisualLinesAction$override fun executeForAllCarets(editor: Editor, context: DataContext, cmd: Command, caretsAndSelections: Map&lt;Caret, VimSelection&gt;): Boolean</ID>
+    <ID>ReturnCount:DeleteJoinVisualLinesSpacesAction.kt$DeleteJoinVisualLinesSpacesAction$override fun executeForAllCarets(editor: Editor, context: DataContext, cmd: Command, caretsAndSelections: Map&lt;Caret, VimSelection&gt;): Boolean</ID>
+    <ID>ReturnCount:DeleteMotionAction.kt$DeleteMotionAction$override fun execute(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Boolean</ID>
+    <ID>ReturnCount:EditFileHandler.kt$EditFileHandler$override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>ReturnCount:EditorHelper.kt$ fun Editor.isPrimaryEditor(): Boolean</ID>
+    <ID>ReturnCount:ExRanges.kt$Range.Companion$ @JvmStatic fun createRange(str: String, offset: Int, move: Boolean): Array&lt;Range&gt;?</ID>
+    <ID>ReturnCount:FilterMotionAction.kt$FilterMotionAction$override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean</ID>
+    <ID>ReturnCount:GotoCharacterHandler.kt$GotoCharacterHandler$override fun execute(editor: Editor, caret: Caret, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>ReturnCount:Helper.kt$@Suppress("IncorrectParentDisposable") fun Editor.isTemplateActive(): Boolean</ID>
+    <ID>ReturnCount:HistoryHandler.kt$HistoryHandler$override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>ReturnCount:IdeaSelectionControl.kt$IdeaSelectionControl$ fun predictMode(editor: Editor, selectionSource: VimListenerManager.SelectionSource): CommandState.Mode</ID>
+    <ID>ReturnCount:MapHandler.kt$MapHandler$@Throws(ExException::class) private fun executeCommand(cmd: ExCommand, editor: Editor?): Boolean</ID>
+    <ID>ReturnCount:Marks.kt$IntellijMark$private fun getProject(): Project?</ID>
+    <ID>ReturnCount:Marks.kt$VimMark.Companion$@JvmStatic fun create(key: Char?, logicalLine: Int?, col: Int?, filename: String?, protocol: String?): VimMark?</ID>
+    <ID>ReturnCount:ModalEntry.kt$ModalEntry.&lt;no name provided&gt;$override fun dispatchKeyEvent(e: KeyEvent): Boolean</ID>
+    <ID>ReturnCount:MotionScrollLastScreenLinePageStartAction.kt$MotionScrollLastScreenLinePageStartAction$override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean</ID>
+    <ID>ReturnCount:OperatorAction.kt$OperatorAction$override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean</ID>
+    <ID>ReturnCount:OptionsManager.kt$OptionsManager$ fun parseOptionLine(editor: Editor?, args: String, failOnBad: Boolean): Boolean</ID>
+    <ID>ReturnCount:PutGroup.kt$PutGroup$private fun getProviderForPasteViaIde(context: DataContext, typeInRegister: SelectionType, data: PutData): PasteProvider?</ID>
+    <ID>ReturnCount:PutGroup.kt$PutGroup$private fun prepareDocumentAndGetStartOffsets(editor: Editor, caret: Caret, typeInRegister: SelectionType, data: PutData, additionalData: Map&lt;String, Any&gt;): List&lt;Int&gt;</ID>
+    <ID>ReturnCount:PutLinesHandler.kt$PutLinesHandler$override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>ReturnCount:ReloadVimRc.kt$VimRcFileState$fun equalTo(document: Document): Boolean</ID>
+    <ID>ReturnCount:RepeatHandler.kt$RepeatHandler$@Throws(ExException::class) override fun execute(editor: Editor, caret: Caret, context: DataContext, cmd: ExCommand): Boolean</ID>
+    <ID>ReturnCount:SelectMotionRightAction.kt$SelectMotionRightAction$override fun getOffset(editor: Editor, caret: Caret, context: DataContext, count: Int, rawCount: Int, argument: Argument?): Int</ID>
+    <ID>ReturnCount:ShowCmd.kt$ShowCmd$fun getFullText(editor: Editor?): String</ID>
+    <ID>ReturnCount:TabCloseHandler.kt$TabCloseHandler$ private fun getTabIndexToClose(arg: String, current: Int, last: Int): Int?</ID>
+    <ID>ReturnCount:TextObjectActionHandler.kt$TextObjectActionHandler$ final override fun baseExecute(editor: Editor, caret: Caret, context: DataContext, cmd: Command): Boolean</ID>
+    <ID>ReturnCount:UndoRedoHelper.kt$UndoRedoHelper$fun redo(context: DataContext): Boolean</ID>
+    <ID>ReturnCount:UndoRedoHelper.kt$UndoRedoHelper$fun undo(context: DataContext): Boolean</ID>
+    <ID>ReturnCount:VimExchangeExtension.kt$VimExchangeExtension.Operator$override fun apply(editor: Editor, context: DataContext, selectionType: SelectionType): Boolean</ID>
+    <ID>ReturnCount:VimExtensionFacade.kt$VimExtensionFacade$ @JvmStatic fun inputString(editor: Editor, prompt: String, finishOn: Char?): String</ID>
+    <ID>ReturnCount:VimMultipleCursorsExtension.kt$VimMultipleCursorsExtension.AllOccurrencesHandler$override fun executeInWriteAction(editor: Editor, context: DataContext)</ID>
+    <ID>ReturnCount:VimMultipleCursorsExtension.kt$VimMultipleCursorsExtension.NextOccurrenceHandler$override fun executeInWriteAction(editor: Editor, context: DataContext)</ID>
+    <ID>ReturnCount:VimMultipleCursorsExtension.kt$VimMultipleCursorsExtension.SkipOccurrenceHandler$override fun executeInWriteAction(editor: Editor, context: DataContext)</ID>
+    <ID>ReturnCount:VimScriptParser.kt$VimScriptParser$@Throws(ExException::class) fun evaluate(expression: String, globals: Map&lt;String?, Any?&gt;): Any</ID>
+    <ID>ReturnCount:VimScriptParser.kt$VimScriptParser$fun findOrCreateIdeaVimRc(): File?</ID>
+    <ID>ReturnCount:VimShortcutKeyAction.kt$VimShortcutKeyAction$private fun getKeyStroke(e: AnActionEvent): KeyStroke?</ID>
+    <ID>ReturnCount:VimShortcutKeyAction.kt$VimShortcutKeyAction$private fun isEnabled(e: AnActionEvent): Boolean</ID>
+    <ID>ReturnCount:VimSurroundExtension.kt$VimSurroundExtension.CSurroundHandler$override fun execute(editor: Editor, context: DataContext)</ID>
+    <ID>ReturnCount:VimSurroundExtension.kt$VimSurroundExtension.Operator$override fun apply(editor: Editor, context: DataContext, selectionType: SelectionType): Boolean</ID>
+    <ID>ReturnCount:VisualBlockAppendAction.kt$VisualBlockAppendAction$override fun executeForAllCarets(editor: Editor, context: DataContext, cmd: Command, caretsAndSelections: Map&lt;Caret, VimSelection&gt;): Boolean</ID>
+    <ID>ReturnCount:VisualBlockInsertAction.kt$VisualBlockInsertAction$override fun executeForAllCarets(editor: Editor, context: DataContext, cmd: Command, caretsAndSelections: Map&lt;Caret, VimSelection&gt;): Boolean</ID>
+    <ID>ReturnCount:VisualMotionGroup.kt$VisualMotionGroup$ fun toggleVisual(editor: Editor, count: Int, rawCount: Int, subMode: CommandState.SubMode): Boolean</ID>
+    <ID>ReturnCount:VisualMotionGroup.kt$VisualMotionGroup$fun autodetectVisualSubmode(editor: Editor): CommandState.SubMode</ID>
+    <ID>ReturnCount:VisualMotionGroup.kt$VisualMotionGroup$fun selectPreviousVisualMode(editor: Editor): Boolean</ID>
+    <ID>ReturnCount:VisualMotionGroup.kt$VisualMotionGroup$fun swapVisualSelections(editor: Editor): Boolean</ID>
+    <ID>ReturnCount:VisualMotionGroup.kt$VisualMotionGroup$private fun seemsLikeBlockMode(editor: Editor): Boolean</ID>
+    <ID>ReturnCount:VisualOperatorActionHandler.kt$VisualOperatorActionHandler$final override fun baseExecute(editor: Editor, caret: Caret, context: DataContext, cmd: Command): Boolean</ID>
+    <ID>ReturnCount:YankGroup.kt$YankGroup$ fun yankMotion(editor: Editor, context: DataContext, count: Int, rawCount: Int, argument: Argument): Boolean</ID>
+    <ID>ThrowsCount:CommandHandler.kt$CommandHandler$ @Throws(ExException::class) fun process(editor: Editor, context: DataContext, cmd: ExCommand, count: Int): Boolean</ID>
+    <ID>TooManyFunctions:CommandBuilder.kt$CommandBuilder</ID>
+    <ID>TooManyFunctions:CommandState.kt$CommandState</ID>
+    <ID>TooManyFunctions:PutGroup.kt$PutGroup</ID>
+    <ID>TooManyFunctions:Ranges.kt$Ranges</ID>
+    <ID>TooManyFunctions:VisualGroup.kt$com.maddyhome.idea.vim.group.visual.VisualGroup.kt</ID>
+    <ID>TooManyFunctions:VisualMotionGroup.kt$VisualMotionGroup</ID>
+  </CurrentIssues>
+</SmellBaseline>

detekt/config.yaml

@@ -0,0 +1,27 @@
+formatting:
+  Indentation:
+    indentSize: 2
+    continuationIndentSize: 8
+  ParameterListWrapping:
+    indentSize: 8
+complexity:
+  LongParameterList:
+    functionThreshold: 12
+  NestedBlockDepth:
+    threshold: 6
+  ComplexCondition:
+    threshold: 6
+exceptions:
+  TooGenericExceptionCaught:
+    active: false
+naming:
+  ClassNaming:
+    excludes: "**/ConfigurationMigrators.kt, **/VersionDetectors.kt"
+performance:
+  SpreadOperator:
+    active: false
+style:
+  ForbiddenComment:
+    active: false
+  MaxLineLength:
+    maxLineLength: 160

doc/set-commands.md

@@ -59,12 +59,6 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
                    ideaselection   when IDE sets a selection      - IdeaVim ONLY
                                    (examples: extend selection, wrap with while, etc.)
 
-                   Deprecated values:
-                   template        ~~please use `idearefactormode` option~~
-                                   when starting a template       - IdeaVim ONLY
-                   refactoring     ~~please use ideaselection~~
-                                   same as ideaselection          - IdeaVim ONLY
-
     'showmode'       'smd'       message on the status line to show current mode
     'showcmd'        'sc'        show (partial) command in the status bar
     'sidescroll'     'ss'        minimum number of columns to scroll horizontally
@@ -104,12 +98,6 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
     
                   If true, join command will be performed via IDE
                   See wiki/`ideajoin` examples
-
-    `ideastatusbar`  `ideastatusbar` Boolean (default true)
-                  DEPRECATED. Please use `ideastatusicon`
-    
-                  If false, IdeaVim icon won't be shown in the status bar.
-                  Works only from `~/.ideavimrc` after the IDE restart.
                   
     `ideastatusicon`  `ideastatusicon` String(default "enabled")
     
@@ -120,7 +108,7 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
                  - gray - use the gray version of the icon
                  - disabled - hide the icon
 
-    `ideawrite`     `ideawrite` String (default "all") [To Be Released]
+    `ideawrite`     `ideawrite` String (default "all")
                   "file" or "all". Defines the behaviour of ":w" command.
                   Value "all" enables execution of ":wa" (save all) command on ":w" (save).
                   This feature exists because some IJ options like "Prettier on save" or "ESlint on save"
@@ -136,6 +124,13 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
                         "<Tab>", "<Down>", "<Up>", "<Enter>", "<Left>", "<Right>",
                         "<C-Down>", "<C-Up>", "<PageUp>", "<PageDown>",
                         "<C-J>", "<C-Q>"
+                     
+    `ideaenabledbufs`  `ideaenabledbufs`  List of strings (default "dialog")   [To Be Released]
+                  
+                  Define the list of additional buffers where IdeaVim is enabled.
+                  
+                  - dialog - enable IdeaVim in dialogs
+                  - singleline - enable IdeaVim in single line editors (not suggested)
 
     ----------
     [1] - cursor keys, <End>, <Home>, <PageUp> and <PageDown>

gradle.properties

@@ -4,7 +4,7 @@ ideaVersion=LATEST-EAP-SNAPSHOT
 downloadIdeaSources=true
 instrumentPluginCode=true
 version=SNAPSHOT
-javaVersion=11
+javaVersion=1.8
 kotlinVersion=1.3.71
 publishUsername=username
 publishToken=token

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Thu Jun 25 19:36:41 MSK 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

resources/META-INF/plugin.xml

@@ -3,8 +3,11 @@
   <id>IdeaVIM</id>
   <change-notes><![CDATA[
       <ul>
-        <li>Support of `virtualedit=onemore`</li>
-        <li>A lot of fixes for scrolling</li>
+        <li>Fix ESC in dialogs</li>
+        <li>Add option to disable IdeaVim in dialogs and single line editors</li>
+        <li>Ability to map IDE actions via the &lt;Action&gt; keyword.</li>
+        <li>"IdeaVim: track action Ids" command to find action ids for the :action command.
+  Enable this option in &quot;Search everywhere&quot; (double shift).</li>
       </ul>
       <p>See also the complete <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">changelog</a>.</p>
     ]]></change-notes>

src/com/maddyhome/idea/vim/DynamicLoaderStopper.kt

@@ -21,4 +21,4 @@ package com.maddyhome.idea.vim
 /**
  * This class prevents dynamic loading of IdeaVim plugin
  */
-class DynamicLoaderStopper
+class DynamicLoaderStopper

src/com/maddyhome/idea/vim/KeyHandler.java

@@ -29,6 +29,7 @@ import com.intellij.openapi.command.UndoConfirmationPolicy;
 import com.intellij.openapi.editor.Caret;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.actionSystem.ActionPlan;
+import com.intellij.openapi.editor.actionSystem.CaretSpecificDataContext;
 import com.intellij.openapi.editor.actionSystem.DocCommandGroupId;
 import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
 import com.intellij.openapi.project.Project;
@@ -300,7 +301,7 @@ public class KeyHandler {
     return node;
   }
 
-  private static <T> boolean isPrefix(@NotNull List<T> list1, @NotNull List<T> list2) {
+  public static <T> boolean isPrefix(@NotNull List<T> list1, @NotNull List<T> list2) {
     if (list1.size() > list2.size()) {
       return false;
     }
@@ -392,7 +393,7 @@ public class KeyHandler {
         }
 
         for (KeyStroke keyStroke : unhandledKeys) {
-          handleKey(editor, keyStroke, new EditorDataContext(editor), false);
+          handleKey(editor, keyStroke, new EditorDataContext(editor, null), false);
         }
       }, ModalityState.stateForComponent(editor.getComponent())));
     }
@@ -435,80 +436,9 @@ public class KeyHandler {
 
     mappingState.resetMappingSequence();
 
-    final EditorDataContext currentContext = new EditorDataContext(editor);
+    final EditorDataContext currentContext = new EditorDataContext(editor, context);
 
-    if (mappingInfo instanceof ToKeysMappingInfo) {
-      final List<KeyStroke> toKeys = ((ToKeysMappingInfo)mappingInfo).getToKeys();
-      final boolean fromIsPrefix = isPrefix(mappingInfo.getFromKeys(), toKeys);
-      boolean first = true;
-      for (KeyStroke keyStroke : toKeys) {
-        final boolean recursive = mappingInfo.isRecursive() && !(first && fromIsPrefix);
-        handleKey(editor, keyStroke, currentContext, recursive);
-        first = false;
-      }
-    }
-    else if (mappingInfo instanceof ToHandlerMappingInfo) {
-      final VimExtensionHandler extensionHandler = ((ToHandlerMappingInfo)mappingInfo).getExtensionHandler();
-      final CommandProcessor processor = CommandProcessor.getInstance();
-
-      // Cache isOperatorPending in case the extension changes the mode while moving the caret
-      // See CommonExtensionTest
-      // TODO: Is this legal? Should we assert in this case?
-      final boolean shouldCalculateOffsets = commandState.isOperatorPending();
-
-      Map<Caret, Integer> startOffsets =
-        editor.getCaretModel().getAllCarets().stream().collect(Collectors.toMap(Function.identity(), Caret::getOffset));
-
-      if (extensionHandler.isRepeatable()) {
-        VimRepeater.Extension.INSTANCE.clean();
-      }
-
-      processor.executeCommand(editor.getProject(), () -> extensionHandler.execute(editor, context),
-        "Vim " + extensionHandler.getClass().getSimpleName(), null);
-
-      if (extensionHandler.isRepeatable()) {
-        VimRepeater.Extension.INSTANCE.setLastExtensionHandler(extensionHandler);
-        VimRepeater.Extension.INSTANCE.setArgumentCaptured(null);
-        VimRepeater.INSTANCE.setRepeatHandler(true);
-      }
-
-      if (shouldCalculateOffsets && !commandState.getCommandBuilder().hasCurrentCommandPartArgument()) {
-        Map<Caret, VimSelection> offsets = new HashMap<>();
-
-        for (Caret caret : editor.getCaretModel().getAllCarets()) {
-          @Nullable Integer startOffset = startOffsets.get(caret);
-          if (caret.hasSelection()) {
-            final VimSelection vimSelection = VimSelection.Companion
-              .create(UserDataManager.getVimSelectionStart(caret), caret.getOffset(),
-                SelectionType.fromSubMode(CommandStateHelper.getSubMode(editor)), editor);
-            offsets.put(caret, vimSelection);
-            commandState.popModes();
-          }
-          else if (startOffset != null && startOffset != caret.getOffset()) {
-            // Command line motions are always characterwise exclusive
-            int endOffset = caret.getOffset();
-            if (startOffset < endOffset) {
-              endOffset -= 1;
-            } else {
-              startOffset -= 1;
-            }
-            final VimSelection vimSelection = VimSelection.Companion
-              .create(startOffset, endOffset, SelectionType.CHARACTER_WISE, editor);
-            offsets.put(caret, vimSelection);
-
-            try (VimListenerSuppressor.Locked ignored = SelectionVimListenerSuppressor.INSTANCE.lock()) {
-              // Move caret to the initial offset for better undo action
-              //  This is not a necessary thing, but without it undo action look less convenient
-              editor.getCaretModel().moveToOffset(startOffset);
-            }
-          }
-        }
-
-        if (!offsets.isEmpty()) {
-          commandState.getCommandBuilder().completeCommandPart(new Argument(offsets));
-        }
-      }
-    }
+    mappingInfo.execute(editor, context);
 
     // If we've just evaluated the previous key sequence, make sure to also handle the current key
     if (mappingInfo != currentMappingInfo) {

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

@@ -42,4 +42,4 @@ class PluginStartup : StartupActivity.DumbAware {
     // This code should be executed once
     VimPlugin.getInstance().initialize()
   }
-}
+}

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

@@ -25,7 +25,9 @@ import com.intellij.openapi.project.Project
 
 @Service
 class VimProjectService(val project: Project) : Disposable {
-  override fun dispose() {}
+  override fun dispose() {
+    // Nothing
+  }
 
   companion object {
     @JvmStatic
@@ -36,4 +38,4 @@ class VimProjectService(val project: Project) : Disposable {
 }
 
 val Project.vimDisposable
-  get() = VimProjectService.getInstance(this)
+  get() = VimProjectService.getInstance(this)

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

@@ -61,7 +61,7 @@ class VimTypedActionHandler(origHandler: TypedActionHandler?) : TypedActionHandl
     try {
       val modifiers = if (charTyped == ' ' && VimKeyListener.isSpaceShift) KeyEvent.SHIFT_DOWN_MASK else 0
       val keyStroke = KeyStroke.getKeyStroke(charTyped, modifiers)
-      handler.handleKey(editor, keyStroke, EditorDataContext(editor))
+      handler.handleKey(editor, keyStroke, EditorDataContext(editor, context))
     } catch (e: Throwable) {
       logger.error(e)
     }

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

@@ -39,6 +39,7 @@ import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.helper.inNormalMode
 import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
 import com.maddyhome.idea.vim.helper.isPrimaryEditor
+import com.maddyhome.idea.vim.helper.isTemplateActive
 import com.maddyhome.idea.vim.key.ShortcutOwner
 import com.maddyhome.idea.vim.listener.IdeaSpecifics.aceJumpActive
 import com.maddyhome.idea.vim.option.OptionsManager
@@ -63,7 +64,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware {
       }
       // Should we use HelperKt.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
       try {
-        KeyHandler.getInstance().handleKey(editor, keyStroke, EditorDataContext(editor))
+        KeyHandler.getInstance().handleKey(editor, keyStroke, EditorDataContext(editor, e.dataContext))
       } catch (ignored: ProcessCanceledException) {
         // Control-flow exceptions (like ProcessCanceledException) should never be logged
         // See {@link com.intellij.openapi.diagnostic.Logger.checkException}
@@ -84,7 +85,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware {
     if (editor != null && keyStroke != null) {
       if (editor.isIdeaVimDisabledHere) return false
       // Workaround for smart step into
-      @Suppress("DEPRECATION")
+      @Suppress("DEPRECATION", "LocalVariableName", "VariableNaming")
       val SMART_STEP_INPLACE_DATA = Key.findKeyByName("SMART_STEP_INPLACE_DATA")
       if (SMART_STEP_INPLACE_DATA != null && editor.getUserData(SMART_STEP_INPLACE_DATA) != null) return false
 
@@ -96,6 +97,8 @@ class VimShortcutKeyAction : AnAction(), DumbAware {
 
       if (keyCode == KeyEvent.VK_ESCAPE) return isEnabledForEscape(editor)
 
+      if (keyCode == KeyEvent.VK_TAB && editor.isTemplateActive()) return false
+
       if (editor.inInsertMode) { // XXX: <Tab> won't be recorded in macros
         if (keyCode == KeyEvent.VK_TAB) {
           VimPlugin.getChange().tabAction = true
@@ -123,8 +126,9 @@ class VimShortcutKeyAction : AnAction(), DumbAware {
   }
 
   private fun isEnabledForEscape(editor: Editor): Boolean {
-    return (editor.isPrimaryEditor() || EditorHelper.isFileEditor(editor) && !editor.inNormalMode) ||
-      (OptionsManager.dialogescape.value == "on" && !editor.inNormalMode)
+    return editor.isPrimaryEditor()
+      || EditorHelper.isFileEditor(editor) && !editor.inNormalMode
+      || OptionsManager.ideaenabledbufs.contains("dialog") && !editor.inNormalMode
   }
 
   private fun isShortcutConflict(keyStroke: KeyStroke): Boolean {

src/com/maddyhome/idea/vim/action/change/change/ChangeCharactersAction.kt

@@ -24,6 +24,8 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MULTIKEY_UNDO
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_NO_REPEAT_INSERT
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
@@ -31,14 +33,16 @@ import java.util.*
 class ChangeCharactersAction : ChangeEditorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.CHANGE
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_NO_REPEAT_INSERT, CommandFlags.FLAG_MULTIKEY_UNDO)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_NO_REPEAT_INSERT, FLAG_MULTIKEY_UNDO)
 
-  override fun execute(editor: Editor,
-                       caret: Caret,
-                       context: DataContext,
-                       count: Int,
-                       rawCount: Int,
-                       argument: Argument?): Boolean {
+  override fun execute(
+    editor: Editor,
+    caret: Caret,
+    context: DataContext,
+    count: Int,
+    rawCount: Int,
+    argument: Argument?
+  ): Boolean {
     return VimPlugin.getChange().changeCharacters(editor, caret, count)
   }
 }

src/com/maddyhome/idea/vim/action/change/change/ChangeEndOfLineAction.kt

@@ -24,6 +24,8 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MULTIKEY_UNDO
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_NO_REPEAT_INSERT
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
@@ -31,7 +33,7 @@ import java.util.*
 class ChangeEndOfLineAction : ChangeEditorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.CHANGE
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_NO_REPEAT_INSERT, CommandFlags.FLAG_MULTIKEY_UNDO)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_NO_REPEAT_INSERT, FLAG_MULTIKEY_UNDO)
 
   override fun execute(editor: Editor,
                        caret: Caret,

src/com/maddyhome/idea/vim/action/change/change/ChangeLineAction.kt

@@ -25,6 +25,8 @@ import com.maddyhome.idea.vim.action.motion.updown.MotionDownLess1FirstNonSpaceA
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MULTIKEY_UNDO
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_NO_REPEAT_INSERT
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.util.*
@@ -32,14 +34,16 @@ import java.util.*
 class ChangeLineAction : ChangeEditorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.CHANGE
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_NO_REPEAT_INSERT, CommandFlags.FLAG_MULTIKEY_UNDO)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_NO_REPEAT_INSERT, FLAG_MULTIKEY_UNDO)
 
-  override fun execute(editor: Editor,
-                       caret: Caret,
-                       context: DataContext,
-                       count: Int,
-                       rawCount: Int,
-                       argument: Argument?): Boolean {
+  override fun execute(
+    editor: Editor,
+    caret: Caret,
+    context: DataContext,
+    count: Int,
+    rawCount: Int,
+    argument: Argument?
+  ): Boolean {
     // `S` command is a synonym of `cc`
     val motion = MotionDownLess1FirstNonSpaceAction()
     val command = Command(1, motion, motion.type, motion.flags)

src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesAction.kt

@@ -23,6 +23,9 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_EXIT_VISUAL
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MOT_LINEWISE
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MULTIKEY_UNDO
 import com.maddyhome.idea.vim.command.SelectionType
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.group.visual.VimSelection
@@ -37,7 +40,7 @@ import java.util.*
 class ChangeVisualLinesAction : VisualOperatorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.CHANGE
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_MOT_LINEWISE, CommandFlags.FLAG_MULTIKEY_UNDO, CommandFlags.FLAG_EXIT_VISUAL)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_MOT_LINEWISE, FLAG_MULTIKEY_UNDO, FLAG_EXIT_VISUAL)
 
   override fun executeAction(editor: Editor,
                              caret: Caret,

src/com/maddyhome/idea/vim/action/change/change/ChangeVisualLinesEndAction.kt

@@ -23,6 +23,9 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_EXIT_VISUAL
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MOT_LINEWISE
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_MULTIKEY_UNDO
 import com.maddyhome.idea.vim.command.SelectionType
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.group.visual.VimSelection
@@ -37,7 +40,7 @@ import java.util.*
 class ChangeVisualLinesEndAction : VisualOperatorActionHandler.ForEachCaret() {
   override val type: Command.Type = Command.Type.CHANGE
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_MOT_LINEWISE, CommandFlags.FLAG_MULTIKEY_UNDO, CommandFlags.FLAG_EXIT_VISUAL)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_MOT_LINEWISE, FLAG_MULTIKEY_UNDO, FLAG_EXIT_VISUAL)
 
   override fun executeAction(editor: Editor,
                              caret: Caret,

src/com/maddyhome/idea/vim/action/internal/AddInlineInlaysAction.kt

@@ -55,4 +55,4 @@ class AddInlineInlaysAction : AnAction() {
   private fun getEditor(dataContext: DataContext): Editor? {
     return CommonDataKeys.EDITOR.getData(dataContext)
   }
-}
+}

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollHalfWidthLeftAction.kt

@@ -50,4 +50,4 @@ class MotionScrollHalfWidthLeftAction : VimActionHandler.SingleExecution() {
     // Vim's screen width is the full screen width, including columns used for gutters.
     return VimPlugin.getMotion().scrollColumns(editor, cmd.count * (EditorHelper.getApproximateScreenWidth(editor) / 2));
   }
-}
+}

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollHalfWidthRightAction.kt

@@ -50,4 +50,4 @@ class MotionScrollHalfWidthRightAction : VimActionHandler.SingleExecution() {
     // Vim's screen width is the full screen width, including columns used for gutters.
     return VimPlugin.getMotion().scrollColumns(editor, -cmd.count * (EditorHelper.getApproximateScreenWidth(editor) / 2));
   }
-}
+}

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollPageDownAction.kt

@@ -24,6 +24,8 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.action.ComplicatedKeysAction
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_CLEAR_STROKES
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_IGNORE_SCROLL_JUMP
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.awt.event.KeyEvent
@@ -35,7 +37,7 @@ class MotionScrollPageDownAction : VimActionHandler.SingleExecution() {
 
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
     return VimPlugin.getMotion().scrollFullPage(editor, cmd.count)
@@ -52,7 +54,7 @@ class MotionScrollPageDownInsertModeAction : VimActionHandler.SingleExecution(),
 
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP, CommandFlags.FLAG_CLEAR_STROKES)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP, FLAG_CLEAR_STROKES)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
     return VimPlugin.getMotion().scrollFullPage(editor, cmd.count)

src/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollPageUpAction.kt

@@ -24,6 +24,8 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.action.ComplicatedKeysAction
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_CLEAR_STROKES
+import com.maddyhome.idea.vim.command.CommandFlags.FLAG_IGNORE_SCROLL_JUMP
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
 import java.awt.event.KeyEvent
@@ -35,7 +37,7 @@ class MotionScrollPageUpAction : VimActionHandler.SingleExecution() {
 
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
     return VimPlugin.getMotion().scrollFullPage(editor, -cmd.count)
@@ -52,7 +54,7 @@ class MotionScrollPageUpInsertModeAction : VimActionHandler.SingleExecution(), C
 
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP, CommandFlags.FLAG_CLEAR_STROKES)
+  override val flags: EnumSet<CommandFlags> = enumSetOf(FLAG_IGNORE_SCROLL_JUMP, FLAG_CLEAR_STROKES)
 
   override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
     return VimPlugin.getMotion().scrollFullPage(editor, -cmd.count)

src/com/maddyhome/idea/vim/action/motion/updown/MotionShiftDownAction.kt

@@ -24,7 +24,8 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.group.MotionGroup
 import com.maddyhome.idea.vim.handler.ShiftedArrowKeyHandler
-import com.maddyhome.idea.vim.helper.*
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.vimForEachCaret
 
 /**
  * @author Alex Plate

src/com/maddyhome/idea/vim/action/motion/updown/MotionShiftUpAction.kt

@@ -24,7 +24,8 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.group.MotionGroup
 import com.maddyhome.idea.vim.handler.ShiftedArrowKeyHandler
-import com.maddyhome.idea.vim.helper.*
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.vimForEachCaret
 
 /**
  * @author Alex Plate

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

@@ -21,11 +21,12 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.debug
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.action.motion.updown.*
-import com.maddyhome.idea.vim.helper.*
+import com.maddyhome.idea.vim.helper.DigraphResult
+import com.maddyhome.idea.vim.helper.DigraphSequence
+import com.maddyhome.idea.vim.helper.noneOfEnum
+import com.maddyhome.idea.vim.helper.vimCommandState
 import com.maddyhome.idea.vim.key.CommandPartNode
 import com.maddyhome.idea.vim.option.OptionsManager.showmode
-import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.annotations.Contract
 import java.util.*
 import javax.swing.KeyStroke
@@ -58,12 +59,6 @@ class CommandState private constructor() {
   var executingCommand: Command? = null
     private set
 
-  // Keep the compatibility with the IdeaVim-EasyMotion plugin before the stable release
-  @get:Deprecated("")
-  @get:ApiStatus.ScheduledForRemoval(inVersion = "0.58")
-  val mappingMode: MappingMode
-    get() = mappingState.mappingMode
-
   val isOperatorPending: Boolean
     get() = mappingState.mappingMode == MappingMode.OP_PENDING && !commandBuilder.isEmpty
 
@@ -196,11 +191,11 @@ class CommandState private constructor() {
    * :h mode()
    *
    * - mode([expr])          Return a string that indicates the current mode.
-   * 
+   *
    *   If [expr] is supplied and it evaluates to a non-zero Number or
    *   a non-empty String (|non-zero-arg|), then the full mode is
    *   returned, otherwise only the first letter is returned.
-   *  
+   *
    *   n          Normal
    *   no         Operator-pending
    *   nov        Operator-pending (forced characterwise |o_v|)

src/com/maddyhome/idea/vim/command/CurrentCommandState.kt

@@ -4,4 +4,4 @@ enum class CurrentCommandState {
   NEW_COMMAND,
   READY,
   BAD_COMMAND
-}
+}

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

@@ -64,4 +64,4 @@ class IndentConfig private constructor(indentOptions: IndentOptions) {
       return IndentConfig(indentOptions)
     }
   }
-}
+}

src/com/maddyhome/idea/vim/common/Register.kt

@@ -87,4 +87,4 @@ class Register {
       return ORDER.indexOf(o1.name.toLowerCase()) - ORDER.indexOf(o2.name.toLowerCase())
     }
   }
-}
+}

src/com/maddyhome/idea/vim/common/TextRange.kt

@@ -104,4 +104,4 @@ class TextRange(val startOffsets: IntArray, val endOffsets: IntArray) {
     sb.append('}')
     return sb.toString()
   }
-}
+}

src/com/maddyhome/idea/vim/config/migration/VersionDetectors.kt

@@ -52,4 +52,4 @@ object `Detect versions 3, 4, 5, 6` : VersionDetector {
     }
     return null
   }
-}
+}

src/com/maddyhome/idea/vim/ex/ExCommand.kt

@@ -58,4 +58,4 @@ class ExCommand(val ranges: Ranges, val command: String, var argument: String) {
 
   private val countArgument: Int
     get() = argument.toIntOrNull() ?: -1
-}
+}

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

@@ -54,4 +54,4 @@ class ExOutputModel private constructor(private val myEditor: Editor) {
       return model
     }
   }
-}
+}

src/com/maddyhome/idea/vim/ex/handler/ActionHandler.kt

@@ -26,7 +26,10 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
 import com.maddyhome.idea.vim.ex.CommandHandler.Flag.SAVE_VISUAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_OPTIONAL
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.flags
@@ -37,7 +40,7 @@ import com.maddyhome.idea.vim.helper.runAfterGotFocus
  */
 class ActionHandler : CommandHandler.SingleExecution() {
 
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY, SAVE_VISUAL)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_OPTIONAL, ARGUMENT_OPTIONAL, READ_ONLY, SAVE_VISUAL)
 
   override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
     val actionName = cmd.argument.trim()

src/com/maddyhome/idea/vim/ex/handler/ActionListHandler.kt

@@ -23,6 +23,9 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.KeyboardShortcut
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_FORBIDDEN
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.ExOutputModel
@@ -33,7 +36,7 @@ import com.maddyhome.idea.vim.helper.StringHelper
  * @author smartbomb
  */
 class ActionListHandler : CommandHandler.SingleExecution() {
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_FORBIDDEN, ARGUMENT_OPTIONAL, READ_ONLY)
 
   override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
     val lineSeparator = "\n"

src/com/maddyhome/idea/vim/ex/handler/AsciiHandler.kt

@@ -22,12 +22,15 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_FORBIDDEN
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_FORBIDDEN
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.flags
 
 class AsciiHandler : CommandHandler.SingleExecution() {
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_FORBIDDEN, Access.READ_ONLY)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_FORBIDDEN, ARGUMENT_FORBIDDEN, READ_ONLY)
 
   override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
     VimPlugin.getDigraph().displayAsciiInfo(editor)

src/com/maddyhome/idea/vim/ex/handler/CmdClearHandler.kt

@@ -22,12 +22,15 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_FORBIDDEN
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_FORBIDDEN
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.flags
 
 class CmdClearHandler : CommandHandler.SingleExecution() {
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_FORBIDDEN, Access.READ_ONLY)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_FORBIDDEN, ARGUMENT_FORBIDDEN, READ_ONLY)
 
   override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
     VimPlugin.getCommand().resetAliases()

src/com/maddyhome/idea/vim/ex/handler/CmdHandler.kt

@@ -23,6 +23,9 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.common.Alias
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_FORBIDDEN
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.ExOutputModel
@@ -34,7 +37,7 @@ import com.maddyhome.idea.vim.group.CommandGroup.Companion.BLACKLISTED_ALIASES
  * @author Elliot Courant
  */
 class CmdHandler : CommandHandler.SingleExecution(), VimScriptCommandHandler {
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_FORBIDDEN, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_FORBIDDEN, ARGUMENT_OPTIONAL, READ_ONLY)
 
   // Static definitions needed for aliases.
   private companion object {

src/com/maddyhome/idea/vim/ex/handler/CopyTextHandler.kt

@@ -31,6 +31,7 @@ import com.maddyhome.idea.vim.helper.EditorHelper
 
 class CopyTextHandler : CommandHandler.SingleExecution() {
   override val argFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_REQUIRED, Access.WRITABLE)
+
   override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
     val carets = EditorHelper.getOrderedCaretsList(editor)
     for (caret in carets) {
@@ -42,7 +43,7 @@ class CopyTextHandler : CommandHandler.SingleExecution() {
 
       val transferableData = VimPlugin.getRegister().getTransferableData(editor, range, text)
       val textData = PutData.TextData(text, SelectionType.LINE_WISE, transferableData)
-      val putData = PutData(textData, null, 1, insertTextBeforeCaret = false, _indent = true, caretAfterInsertedText = false, putToLine = line)
+      val putData = PutData(textData, null, 1, insertTextBeforeCaret = false, rawIndent = true, caretAfterInsertedText = false, putToLine = line)
       VimPlugin.getPut().putTextForCaret(editor, caret, context, putData)
     }
     return true

src/com/maddyhome/idea/vim/ex/handler/EditFileHandler.kt

@@ -45,7 +45,7 @@ class EditFileHandler : CommandHandler.SingleExecution() {
     }
 
     // Don't open a choose file dialog under a write action
-    ApplicationManager.getApplication().invokeLater { KeyHandler.executeAction("OpenFile", EditorDataContext(editor)) }
+    ApplicationManager.getApplication().invokeLater { KeyHandler.executeAction("OpenFile", EditorDataContext(editor, context)) }
 
     return true
   }

src/com/maddyhome/idea/vim/ex/handler/GotoCharacterHandler.kt

@@ -23,13 +23,16 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_IS_COUNT
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.flags
 import com.maddyhome.idea.vim.group.MotionGroup
 
 class GotoCharacterHandler : CommandHandler.ForEachCaret() {
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_IS_COUNT, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_IS_COUNT, ARGUMENT_OPTIONAL, READ_ONLY)
 
   override fun execute(editor: Editor, caret: Caret, context: DataContext, cmd: ExCommand): Boolean {
     val count = cmd.getCount(editor, caret, 1, true)

src/com/maddyhome/idea/vim/ex/handler/GotoLineHandler.kt

@@ -23,6 +23,9 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_REQUIRED
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.flags
@@ -35,7 +38,7 @@ import kotlin.math.min
  * range.
  */
 class GotoLineHandler : CommandHandler.ForEachCaret() {
-    override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_REQUIRED, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
+    override val argFlags: CommandHandlerFlags = flags(RANGE_REQUIRED, ARGUMENT_OPTIONAL, READ_ONLY)
 
   /**
    * Moves the cursor to the line entered by the user

src/com/maddyhome/idea/vim/ex/handler/MarksHandler.kt

@@ -22,6 +22,9 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_OPTIONAL
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.ExOutputModel
@@ -31,7 +34,7 @@ import com.maddyhome.idea.vim.helper.StringHelper.stringToKeys
 import com.maddyhome.idea.vim.helper.StringHelper.toPrintableCharacters
 
 class MarksHandler : CommandHandler.SingleExecution() {
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_OPTIONAL, ARGUMENT_OPTIONAL, READ_ONLY)
 
   override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
 

src/com/maddyhome/idea/vim/ex/handler/MoveTextHandler.kt

@@ -74,7 +74,7 @@ class MoveTextHandler : CommandHandler.SingleExecution() {
       val text = texts[i]
 
       val textData = PutData.TextData(text, SelectionType.LINE_WISE, emptyList())
-      val putData = PutData(textData, null, 1, insertTextBeforeCaret = false, _indent = true, caretAfterInsertedText = false, putToLine = line)
+      val putData = PutData(textData, null, 1, insertTextBeforeCaret = false, rawIndent = true, caretAfterInsertedText = false, putToLine = line)
       VimPlugin.getPut().putTextForCaret(editor, caret, context, putData)
     }
 

src/com/maddyhome/idea/vim/ex/handler/OnlyHandler.kt

@@ -22,12 +22,15 @@ import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.READ_ONLY
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_OPTIONAL
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.ExCommand
 import com.maddyhome.idea.vim.ex.flags
 
 class OnlyHandler : CommandHandler.SingleExecution() {
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.READ_ONLY)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_OPTIONAL, ARGUMENT_OPTIONAL, READ_ONLY)
 
   override fun execute(editor: Editor, context: DataContext, cmd: ExCommand): Boolean {
     VimPlugin.getWindow().closeAllExceptCurrent(context)

src/com/maddyhome/idea/vim/ex/handler/PutLinesHandler.kt

@@ -45,7 +45,7 @@ class PutLinesHandler : CommandHandler.SingleExecution() {
 
     val line = if (cmd.ranges.size() == 0) -1 else cmd.getLine(editor)
     val textData = registerGroup.lastRegister?.let { PutData.TextData(it.text ?: StringHelper.toKeyNotation(it.keys), SelectionType.LINE_WISE, it.transferableData) }
-    val putData = PutData(textData, null, 1, insertTextBeforeCaret = false, _indent = false, caretAfterInsertedText = false, putToLine = line)
+    val putData = PutData(textData, null, 1, insertTextBeforeCaret = false, rawIndent = false, caretAfterInsertedText = false, putToLine = line)
     return VimPlugin.getPut().putText(editor, context, putData)
   }
 }

src/com/maddyhome/idea/vim/ex/handler/ShiftLeftHandler.kt

@@ -24,6 +24,9 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.WRITABLE
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_OPTIONAL
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.CommandName
 import com.maddyhome.idea.vim.ex.ComplicatedNameExCommand
@@ -33,7 +36,7 @@ import com.maddyhome.idea.vim.ex.flags
 
 class ShiftLeftHandler : CommandHandler.ForEachCaret(), ComplicatedNameExCommand {
   override val names: Array<CommandName> = commands("<[${"<".repeat(31)}]")
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.WRITABLE)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_OPTIONAL, ARGUMENT_OPTIONAL, WRITABLE)
 
   override fun execute(editor: Editor, caret: Caret, context: DataContext, cmd: ExCommand): Boolean {
     val range = cmd.getTextRange(editor, caret, true)

src/com/maddyhome/idea/vim/ex/handler/ShiftRightHandler.kt

@@ -24,6 +24,9 @@ import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.common.TextRange
 import com.maddyhome.idea.vim.ex.CommandHandler
+import com.maddyhome.idea.vim.ex.CommandHandler.Access.WRITABLE
+import com.maddyhome.idea.vim.ex.CommandHandler.ArgumentFlag.ARGUMENT_OPTIONAL
+import com.maddyhome.idea.vim.ex.CommandHandler.RangeFlag.RANGE_OPTIONAL
 import com.maddyhome.idea.vim.ex.CommandHandlerFlags
 import com.maddyhome.idea.vim.ex.CommandName
 import com.maddyhome.idea.vim.ex.ComplicatedNameExCommand
@@ -33,7 +36,7 @@ import com.maddyhome.idea.vim.ex.flags
 
 class ShiftRightHandler : CommandHandler.ForEachCaret(), ComplicatedNameExCommand {
   override val names: Array<CommandName> = commands(">[${">".repeat(31)}]")
-  override val argFlags: CommandHandlerFlags = flags(RangeFlag.RANGE_OPTIONAL, ArgumentFlag.ARGUMENT_OPTIONAL, Access.WRITABLE)
+  override val argFlags: CommandHandlerFlags = flags(RANGE_OPTIONAL, ARGUMENT_OPTIONAL, WRITABLE)
 
   override fun execute(editor: Editor, caret: Caret, context: DataContext, cmd: ExCommand): Boolean {
     val range = cmd.getTextRange(editor, caret, true)

src/com/maddyhome/idea/vim/ex/ranges/LineRange.kt

@@ -33,4 +33,4 @@ class LineRange(startLine: Int, endLine: Int) {
       this.endLine = startLine
     }
   }
-}
+}

src/com/maddyhome/idea/vim/ex/ranges/Ranges.kt

@@ -187,4 +187,4 @@ class Ranges {
   private var defaultLine = -1
   private var done = false
   private val ranges: MutableList<Range> = mutableListOf()
-}
+}

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

@@ -32,7 +32,6 @@ import com.maddyhome.idea.vim.key.MappingOwner
 import com.maddyhome.idea.vim.key.OperatorFunction
 import com.maddyhome.idea.vim.ui.ExEntryPanel
 import com.maddyhome.idea.vim.ui.ModalEntry
-import org.jetbrains.annotations.ApiStatus.ScheduledForRemoval
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
 
@@ -44,22 +43,6 @@ import javax.swing.KeyStroke
  * @author vlan
  */
 object VimExtensionFacade {
-  /** The 'map' command for mapping keys to handlers defined in extensions. */
-  @JvmStatic
-  @ScheduledForRemoval(inVersion = "0.58")
-  @Deprecated("Only for EasyMotion support")
-  fun putExtensionHandlerMapping(modes: Set<MappingMode>, fromKeys: List<KeyStroke>, extensionHandler: VimExtensionHandler, recursive: Boolean) {
-    VimPlugin.getKey().putKeyMapping(modes, fromKeys, MappingOwner.Plugin.get("easymotion"), extensionHandler, recursive)
-  }
-
-  @ScheduledForRemoval(inVersion = "0.58")
-  @Deprecated("Only for EasyMotion support")
-  @JvmStatic
-  fun putKeyMapping(modes: Set<MappingMode>, fromKeys: List<KeyStroke>,
-                    toKeys: List<KeyStroke>, recursive: Boolean) {
-    VimPlugin.getKey().putKeyMapping(modes, fromKeys, MappingOwner.Plugin.get("easymotion"), toKeys, recursive)
-  }
-
   /** The 'map' command for mapping keys to handlers defined in extensions. */
   @JvmStatic
   fun putExtensionHandlerMapping(modes: Set<MappingMode>, fromKeys: List<KeyStroke>,
@@ -98,8 +81,7 @@ object VimExtensionFacade {
   fun inputKeyStroke(editor: Editor): KeyStroke {
     if (editor.commandState.isDotRepeatInProgress) {
       val input = VimRepeater.Extension.consumeKeystroke()
-      return input
-        ?: throw RuntimeException("Not enough keystrokes saved: ${VimRepeater.Extension.lastExtensionHandler}")
+      return input ?: error("Not enough keystrokes saved: ${VimRepeater.Extension.lastExtensionHandler}")
     }
 
     val key: KeyStroke? = if (ApplicationManager.getApplication().isUnitTestMode) {
@@ -122,7 +104,7 @@ object VimExtensionFacade {
   fun inputString(editor: Editor, prompt: String, finishOn: Char?): String {
     if (editor.commandState.isDotRepeatInProgress) {
       val input = VimRepeater.Extension.consumeString()
-      return input ?: throw RuntimeException("Not enough strings saved: ${VimRepeater.Extension.lastExtensionHandler}")
+      return input ?: error("Not enough strings saved: ${VimRepeater.Extension.lastExtensionHandler}")
     }
 
     if (ApplicationManager.getApplication().isUnitTestMode) {

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

@@ -43,9 +43,13 @@ import com.maddyhome.idea.vim.extension.VimExtensionFacade.setOperatorFunction
 import com.maddyhome.idea.vim.extension.VimExtensionFacade.setRegister
 import com.maddyhome.idea.vim.extension.VimExtensionHandler
 import com.maddyhome.idea.vim.group.MarkGroup
-import com.maddyhome.idea.vim.helper.*
+import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.StringHelper.parseKeys
 import com.maddyhome.idea.vim.helper.StringHelper.stringToKeys
+import com.maddyhome.idea.vim.helper.fileSize
+import com.maddyhome.idea.vim.helper.moveToInlayAwareLogicalPosition
+import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
+import com.maddyhome.idea.vim.helper.subMode
 import com.maddyhome.idea.vim.key.OperatorFunction
 
 /**
@@ -59,7 +63,7 @@ import com.maddyhome.idea.vim.key.OperatorFunction
  *        It just won't work if the binding is defined after `set exchange`.
  */
 
-class VimExchangeExtension: VimExtension {
+class VimExchangeExtension : VimExtension {
   override fun getName() = "exchange"
 
   override fun init() {
@@ -105,17 +109,17 @@ class VimExchangeExtension: VimExtension {
 
     override fun execute(editor: Editor, context: DataContext) {
       setOperatorFunction(Operator(false))
-      executeNormalWithoutMapping(parseKeys(if(isLine) "g@_" else "g@"), editor)
+      executeNormalWithoutMapping(parseKeys(if (isLine) "g@_" else "g@"), editor)
     }
   }
 
-  private class ExchangeClearHandler: VimExtensionHandler {
+  private class ExchangeClearHandler : VimExtensionHandler {
     override fun execute(editor: Editor, context: DataContext) {
       clearExchange(editor)
     }
   }
 
-  private class VExchangeHandler: VimExtensionHandler {
+  private class VExchangeHandler : VimExtensionHandler {
     override fun execute(editor: Editor, context: DataContext) {
       runWriteAction {
         val subMode = editor.subMode
@@ -126,19 +130,19 @@ class VimExchangeExtension: VimExtension {
     }
   }
 
-  private class Operator(private val isVisual: Boolean): OperatorFunction {
+  private class Operator(private val isVisual: Boolean) : OperatorFunction {
     fun Editor.getMarkOffset(mark: Mark) = EditorHelper.getOffset(this, mark.logicalLine, mark.col)
-    fun CommandState.SubMode.getString() = when(this) {
+    fun CommandState.SubMode.getString() = when (this) {
       CommandState.SubMode.VISUAL_CHARACTER -> "v"
       CommandState.SubMode.VISUAL_LINE -> "V"
       CommandState.SubMode.VISUAL_BLOCK -> "\\<C-V>"
-      else -> throw Error("Invalid SubMode: $this")
+      else -> error("Invalid SubMode: $this")
     }
 
     override fun apply(editor: Editor, context: DataContext, selectionType: SelectionType): Boolean {
       fun highlightExchange(ex: Exchange): RangeHighlighter {
         val attributes = editor.colorsScheme.getAttributes(EditorColors.TEXT_SEARCH_RESULT_ATTRIBUTES)
-        val hlArea = when(ex.type) {
+        val hlArea = when (ex.type) {
           CommandState.SubMode.VISUAL_LINE -> HighlighterTargetArea.LINES_IN_RANGE
           // TODO: handle other modes
           else -> HighlighterTargetArea.EXACT_RANGE
@@ -151,6 +155,7 @@ class VimExchangeExtension: VimExtension {
           hlArea
         )
       }
+
       val currentExchange = getExchange(editor, isVisual, selectionType)
       val exchange1 = editor.getUserData(EXCHANGE_KEY)
       if (exchange1 == null) {
@@ -162,7 +167,7 @@ class VimExchangeExtension: VimExtension {
         val cmp = compareExchanges(exchange1, currentExchange)
         var reverse = false
         var expand = false
-        val (ex1, ex2) = when(cmp) {
+        val (ex1, ex2) = when (cmp) {
           ExchangeCompareResult.OVERLAP -> return false
           ExchangeCompareResult.OUTER -> {
             reverse = true
@@ -189,25 +194,27 @@ class VimExchangeExtension: VimExtension {
 
     private fun exchange(editor: Editor, ex1: Exchange, ex2: Exchange, reverse: Boolean, expand: Boolean) {
       fun pasteExchange(sourceExchange: Exchange, targetExchange: Exchange) {
-        VimPlugin.getMark().setChangeMarks(editor, TextRange(editor.getMarkOffset(targetExchange.start), editor.getMarkOffset(targetExchange.end)+1))
+        VimPlugin.getMark().setChangeMarks(editor, TextRange(editor.getMarkOffset(targetExchange.start), editor.getMarkOffset(targetExchange.end) + 1))
         // do this instead of direct text manipulation to set change marks
         setRegister('z', stringToKeys(sourceExchange.text), SelectionType.fromSubMode(sourceExchange.type))
         executeNormalWithoutMapping(stringToKeys("`[${targetExchange.type.getString()}`]\"zp"), editor)
       }
+
       fun fixCursor(ex1: Exchange, ex2: Exchange, reverse: Boolean) {
         val primaryCaret = editor.caretModel.primaryCaret
-        if(reverse) {
+        if (reverse) {
           primaryCaret.moveToInlayAwareOffset(editor.getMarkOffset(ex1.start))
         } else {
           if (ex1.start.logicalLine == ex2.start.logicalLine) {
             val horizontalOffset = ex1.end.col - ex2.end.col
             primaryCaret.moveToInlayAwareLogicalPosition(LogicalPosition(ex1.start.logicalLine, ex1.start.col - horizontalOffset))
-          } else if(ex1.end.logicalLine - ex1.start.logicalLine != ex2.end.logicalLine - ex2.start.logicalLine) {
+          } else if (ex1.end.logicalLine - ex1.start.logicalLine != ex2.end.logicalLine - ex2.start.logicalLine) {
             val verticalOffset = ex1.end.logicalLine - ex2.end.logicalLine
             primaryCaret.moveToInlayAwareLogicalPosition(LogicalPosition(ex1.start.logicalLine - verticalOffset, ex1.start.col))
           }
         }
       }
+
       val zRegText = getRegister('z')
       val unnRegText = getRegister('"')
       val startRegText = getRegister('*')
@@ -247,24 +254,24 @@ class VimExchangeExtension: VimExtension {
 
       return if (x.type == CommandState.SubMode.VISUAL_BLOCK && y.type == CommandState.SubMode.VISUAL_BLOCK) {
         when {
-            intersects(x, y) -> {
-              ExchangeCompareResult.OVERLAP
-            }
-            x.start.col <= y.start.col -> {
-              ExchangeCompareResult.LT
-            }
-            else -> {
-              ExchangeCompareResult.GT
-            }
+          intersects(x, y) -> {
+            ExchangeCompareResult.OVERLAP
+          }
+          x.start.col <= y.start.col -> {
+            ExchangeCompareResult.LT
+          }
+          else -> {
+            ExchangeCompareResult.GT
+          }
         }
-      } else if (comparePos(x.start, y.start) <=0 && comparePos(x.end, y.end) >=0) {
+      } else if (comparePos(x.start, y.start) <= 0 && comparePos(x.end, y.end) >= 0) {
         ExchangeCompareResult.OUTER
-      } else if (comparePos(y.start, x.start) <=0 && comparePos(y.end, x.end) >=0) {
+      } else if (comparePos(y.start, x.start) <= 0 && comparePos(y.end, x.end) >= 0) {
         ExchangeCompareResult.INNER
-      } else if (comparePos(x.start, y.end) <=0 && comparePos(y.start, x.end) <=0 ||
-          comparePos(y.start, x.end) <=0 && comparePos(x.start, y.end) <=0
-        ) {
-          ExchangeCompareResult.OVERLAP
+      } else if (comparePos(x.start, y.end) <= 0 && comparePos(y.start, x.end) <= 0 ||
+        comparePos(y.start, x.end) <= 0 && comparePos(x.start, y.end) <= 0
+      ) {
+        ExchangeCompareResult.OVERLAP
       } else {
         val cmp = comparePos(x.start, y.start)
         when {
@@ -291,6 +298,7 @@ class VimExchangeExtension: VimExtension {
           selectionEnd.col
         }
       }
+
       // TODO: improve KeyStroke list to sting conversion
       fun getRegisterText(reg: Char): String = getRegister(reg)?.map { it.keyChar }?.joinToString("") ?: ""
       fun getMarks(isVisual: Boolean): Pair<Mark, Mark> {

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

@@ -140,11 +140,11 @@ class ReplaceWithRegister : VimExtension {
 
       val textData = PutData.TextData(usedText, usedType, savedRegister.transferableData)
 
-      val putData = PutData(textData, visualSelection, 1, insertTextBeforeCaret = true, _indent = true, caretAfterInsertedText = false, putToLine = -1)
+      val putData = PutData(textData, visualSelection, 1, insertTextBeforeCaret = true, rawIndent = true, caretAfterInsertedText = false, putToLine = -1)
       VimPlugin.getPut().putText(editor, EditorDataContext(editor), putData)
 
       VimPlugin.getRegister().saveRegister(savedRegister.name, savedRegister)
       VimPlugin.getRegister().saveRegister(RegisterGroup.DEFAULT_REGISTER, savedRegister)
     }
   }
-}
+}

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

@@ -251,4 +251,4 @@ class VimSurroundExtension : VimExtension {
       } else keyChar
     }
   }
-}
+}

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

@@ -636,7 +636,9 @@ public class ChangeGroup {
             repeatInsertText(editor, context, started ? (i == 0 ? count : count + 1) : count);
           }
           else if (EditorHelper.getVisualLineLength(editor, visualLine + i) >= repeatColumn) {
-            caret.moveToVisualPosition(new VisualPosition(visualLine + i, repeatColumn));
+            VisualPosition visualPosition = new VisualPosition(visualLine + i, repeatColumn);
+            int inlaysCount = InlayHelperKt.amountOfInlaysBeforeVisualPosition(editor, visualPosition);
+            caret.moveToVisualPosition(new VisualPosition(visualLine + i, repeatColumn + inlaysCount));
             repeatInsertText(editor, context, started ? (i == 0 ? count : count + 1) : count);
           }
         }
@@ -768,9 +770,10 @@ public class ChangeGroup {
   public boolean deleteEndOfLine(@NotNull Editor editor, @NotNull Caret caret, int count) {
     int initialOffset = caret.getOffset();
     int offset = VimPlugin.getMotion().moveCaretToLineEndOffset(editor, caret, count - 1, true);
+    int lineStart = VimPlugin.getMotion().moveCaretToLineStart(editor, caret);
 
     int startOffset = initialOffset;
-    if (offset == initialOffset) startOffset--; // handle delete from virtual space
+    if (offset == initialOffset && offset != lineStart) startOffset--; // handle delete from virtual space
 
     if (offset != -1) {
       final TextRange rangeToDelete = new TextRange(startOffset, offset);

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

@@ -214,7 +214,7 @@ public class EditorGroup implements PersistentStateComponent<Element> {
     if (!EditorHelper.isFileEditor(editor) &&
         editor.getDocument().isWritable() &&
         !CommandStateHelper.inInsertMode(editor)) {
-      VimPlugin.getChange().insertBeforeCursor(editor, new EditorDataContext(editor));
+      VimPlugin.getChange().insertBeforeCursor(editor, new EditorDataContext(editor, null));
       KeyHandler.getInstance().reset(editor);
     }
     editor.getSettings().setBlockCursor(!CommandStateHelper.inInsertMode(editor));

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

@@ -130,7 +130,7 @@ public class FileGroup {
       return res;
     }
     final Ref<VirtualFile> result = Ref.create();
-    final VirtualFileVisitor<Object> visitor = new VirtualFileVisitor<>() {
+    final VirtualFileVisitor<Object> visitor = new VirtualFileVisitor<Object>() {
       @Override
       public boolean visitFile(@NotNull VirtualFile file) {
         if (file.getName().equals(filename)) {

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

@@ -105,15 +105,7 @@ public class KeyGroup implements PersistentStateComponent<Element> {
       builder.append(" ");
       builder.append(mappingInfo.isRecursive() ? " " : "*");
       builder.append(" ");
-      if (mappingInfo instanceof ToKeysMappingInfo) {
-        List<KeyStroke> toKeys = ((ToKeysMappingInfo)mappingInfo).getToKeys();
-        builder.append(toKeyNotation(toKeys));
-      }
-      else if (mappingInfo instanceof ToHandlerMappingInfo) {
-        final VimExtensionHandler extensionHandler = ((ToHandlerMappingInfo)mappingInfo).getExtensionHandler();
-        builder.append("call ");
-        builder.append(extensionHandler.getClass().getCanonicalName());
-      }
+      builder.append(mappingInfo.getPresentableString());
       builder.append("\n");
     }
     ExOutputModel.getInstance(editor).output(builder.toString());

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

@@ -304,7 +304,7 @@ public class MotionGroup {
     final int oldOffset = caret.getOffset();
     InlayHelperKt.moveToInlayAwareOffset(caret, offset);
     if (oldOffset != offset) {
-      UserDataManager.setVimLastColumn(caret, caret.getVisualPosition().column);
+      UserDataManager.setVimLastColumn(caret, InlayHelperKt.getInlayAwareVisualColumn(caret));
       if (caret == editor.getCaretModel().getPrimaryCaret()) {
         scrollCaretIntoView(editor);
       }
@@ -1257,7 +1257,7 @@ public class MotionGroup {
         col = normalizeVisualColumn(editor, line, col, CommandStateHelper.isEndAllowedIgnoringOnemore(CommandStateHelper.getMode(editor)));
       }
       else {
-        int newInlineElements = EditorHelperRt.amountOfInlaysBeforeVisualPosition(editor, new VisualPosition(line, col));
+        int newInlineElements = InlayHelperKt.amountOfInlaysBeforeVisualPosition(editor, new VisualPosition(line, col));
 
         col = normalizeVisualColumn(editor, line, col, CommandStateHelper.isEndAllowed(CommandStateHelper.getMode(editor)));
         col += newInlineElements;

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

@@ -162,11 +162,10 @@ class NotificationService(private val project: Project?) {
         it.whenExpired { notification = null }
         it.setContent(it.content + "<br><br><small>Use Event Log to see previous ids</small>")
 
-        val copyActionId = CopyActionId(id, project)
-        copyActionId.templatePresentation.isEnabled = id != null
-        it.addAction(copyActionId)
-
         it.addAction(StopTracking())
+
+        if (id != null) it.addAction(CopyActionId(id, project))
+
         it.notify(project)
       }
     }

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

@@ -209,7 +209,7 @@ public class SearchGroup implements PersistentStateComponent<Element> {
     else {
       // XXX: The Ex entry panel is used only for UI here, its logic might be inappropriate for this method
       final ExEntryPanel exEntryPanel = ExEntryPanel.getInstanceWithoutShortcuts();
-      exEntryPanel.activate(editor, new EditorDataContext(editor), "Replace with " + match + " (y/n/a/q/l)?", "", 1);
+      exEntryPanel.activate(editor, new EditorDataContext(editor, null), "Replace with " + match + " (y/n/a/q/l)?", "", 1);
       MotionGroup.moveCaret(editor, caret, startoff);
       ModalEntry.INSTANCE.activate(keyStrokeProcessor);
       exEntryPanel.deactivate(true, false);

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

@@ -64,12 +64,12 @@ data class PutData(
   val visualSelection: VisualSelection?,
   val count: Int,
   val insertTextBeforeCaret: Boolean,
-  private val _indent: Boolean,
+  private val rawIndent: Boolean,
   val caretAfterInsertedText: Boolean,
   val putToLine: Int = -1
 ) {
   val indent: Boolean =
-    if (_indent && textData?.typeInRegister != SelectionType.LINE_WISE && visualSelection?.typeInEditor != SelectionType.LINE_WISE) false else _indent
+    if (rawIndent && textData?.typeInRegister != SelectionType.LINE_WISE && visualSelection?.typeInEditor != SelectionType.LINE_WISE) false else rawIndent
 
   data class VisualSelection(
     val caretsAndSelections: Map<Caret, VimSelection>,

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

@@ -32,6 +32,7 @@ import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.helper.inNormalMode
 import com.maddyhome.idea.vim.helper.inSelectMode
 import com.maddyhome.idea.vim.helper.inVisualMode
+import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
 import com.maddyhome.idea.vim.helper.isTemplateActive
 import com.maddyhome.idea.vim.helper.mode
 import com.maddyhome.idea.vim.helper.popAllModes
@@ -52,6 +53,8 @@ object IdeaSelectionControl {
   fun controlNonVimSelectionChange(editor: Editor, selectionSource: VimListenerManager.SelectionSource = VimListenerManager.SelectionSource.OTHER) {
     VimVisualTimer.singleTask(editor.mode) { initialMode ->
 
+      if (editor.isIdeaVimDisabledHere) return@singleTask
+
       logger.info("Adjust non-vim selection. Source: $selectionSource")
 
       // Perform logic in one of the next cases:
@@ -112,7 +115,7 @@ object IdeaSelectionControl {
       CommandState.Mode.SELECT -> VimPlugin.getVisualMotion().enterSelectMode(editor, VimPlugin.getVisualMotion().autodetectVisualSubmode(editor))
       CommandState.Mode.INSERT -> VimPlugin.getChange().insertBeforeCursor(editor, EditorDataContext(editor))
       CommandState.Mode.COMMAND -> Unit
-      else -> throw RuntimeException("Unexpected mode: $mode")
+      else -> error("Unexpected mode: $mode")
     }
   }
 

src/com/maddyhome/idea/vim/group/visual/VimSelection.kt

@@ -110,7 +110,7 @@ sealed class VimSimpleSelection : VimSelection() {
       when (type) {
         CHARACTER_WISE -> VimCharacterSelection(vimStart, vimEnd, nativeStart, nativeEnd, editor)
         LINE_WISE -> VimLineSelection(vimStart, vimEnd, nativeStart, nativeEnd, editor)
-        BLOCK_WISE -> throw RuntimeException("This method works only for line and character selection")
+        BLOCK_WISE -> error("This method works only for line and character selection")
       }
   }
 }

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

@@ -28,7 +28,18 @@ import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.command.CommandState
 import com.maddyhome.idea.vim.group.ChangeGroup
 import com.maddyhome.idea.vim.group.MotionGroup
-import com.maddyhome.idea.vim.helper.*
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.fileSize
+import com.maddyhome.idea.vim.helper.inBlockSubMode
+import com.maddyhome.idea.vim.helper.inSelectMode
+import com.maddyhome.idea.vim.helper.inVisualMode
+import com.maddyhome.idea.vim.helper.isEndAllowed
+import com.maddyhome.idea.vim.helper.mode
+import com.maddyhome.idea.vim.helper.moveToInlayAwareOffset
+import com.maddyhome.idea.vim.helper.sort
+import com.maddyhome.idea.vim.helper.subMode
+import com.maddyhome.idea.vim.helper.vimLastColumn
+import com.maddyhome.idea.vim.helper.vimSelectionStart
 
 /**
  * @author Alex Plate
@@ -51,10 +62,8 @@ fun Caret.vimSetSelection(start: Int, end: Int = start, moveCaretToSelectionEnd:
  * @see vimMoveBlockSelectionToOffset for blockwise selection
  */
 fun Caret.vimMoveSelectionToCaret() {
-  if (!editor.inVisualMode && !editor.inSelectMode)
-    throw RuntimeException("Attempt to extent selection in non-visual mode")
-  if (editor.inBlockSubMode)
-    throw RuntimeException("Move caret with [vimMoveBlockSelectionToOffset]")
+  if (!editor.inVisualMode && !editor.inSelectMode) error("Attempt to extent selection in non-visual mode")
+  if (editor.inBlockSubMode) error("Move caret with [vimMoveBlockSelectionToOffset]")
 
   val startOffsetMark = vimSelectionStart
 
@@ -114,11 +123,11 @@ val Caret.vimLeadSelectionOffset: Int
         val selections = editor.caretModel.allCarets.map { it.selectionStart to it.selectionEnd }.sortedBy { it.first }
         val pCaret = editor.caretModel.primaryCaret
         when (pCaret.offset) {
-            selections.first().first -> (selections.last().second - selectionAdj).coerceAtLeast(0)
-            selections.first().second -> selections.last().first
-            selections.last().first -> (selections.first().second - selectionAdj).coerceAtLeast(0)
-            selections.last().second -> selections.first().first
-            else -> selections.first().first
+          selections.first().first -> (selections.last().second - selectionAdj).coerceAtLeast(0)
+          selections.first().second -> selections.last().first
+          selections.last().first -> (selections.first().second - selectionAdj).coerceAtLeast(0)
+          selections.last().second -> selections.first().first
+          else -> selections.first().first
         }
       } else {
         if (caretOffset == selectionStart) (selectionEnd - selectionAdj).coerceAtLeast(0) else selectionStart

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

@@ -267,8 +267,7 @@ class VisualMotionGroup {
 
   private fun blockModeStartAndEnd(editor: Editor): Pair<Int, Int> {
     val selections = editor.caretModel.allCarets.map { it.selectionStart to it.selectionEnd }.sortedBy { it.first }
-    val maxColumn = selections.map { editor.offsetToLogicalPosition(it.second).column }.max()
-      ?: throw RuntimeException("No carets")
+    val maxColumn = selections.map { editor.offsetToLogicalPosition(it.second).column }.max() ?: error("No carets")
     val lastLine = editor.offsetToLogicalPosition(selections.last().first).line
     return selections.first().first to editor.logicalPositionToOffset(LogicalPosition(lastLine, maxColumn))
   }

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

@@ -90,7 +90,7 @@ class ActionBeanClass : AbstractExtensionPointBean() {
         'O' -> res += MappingMode.OP_PENDING
         'I' -> res += MappingMode.INSERT
         'C' -> res += MappingMode.CMD_LINE
-        else -> throw RuntimeException("Wrong mapping mode: $c")
+        else -> error("Wrong mapping mode: $c")
       }
     }
     return res.toSet()

src/com/maddyhome/idea/vim/handler/EditorActionHandlerBase.kt

@@ -25,11 +25,13 @@ import com.intellij.openapi.editor.Caret
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.actionSystem.CaretSpecificDataContext
 import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.action.motion.updown.*
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.helper.*
+import com.maddyhome.idea.vim.helper.StringHelper
+import com.maddyhome.idea.vim.helper.commandState
+import com.maddyhome.idea.vim.helper.getTopLevelEditor
+import com.maddyhome.idea.vim.helper.noneOfEnum
 import java.util.*
 import javax.swing.KeyStroke
 
@@ -77,18 +79,18 @@ abstract class EditorActionHandlerBase(private val myRunForEachCaret: Boolean) {
     }
   }
 
-  private fun doExecute(_editor: Editor, caret: Caret, context: DataContext) {
+  private fun doExecute(editor: Editor, caret: Caret, context: DataContext) {
     if (!VimPlugin.isEnabled()) return
 
-    val editor = _editor.getTopLevelEditor()
+    val topLevelEditor = editor.getTopLevelEditor()
     logger.debug("Execute command with handler: " + this.javaClass.name)
 
-    val cmd = editor.commandState.executingCommand ?: run {
+    val cmd = topLevelEditor.commandState.executingCommand ?: run {
       VimPlugin.indicateError()
       return
     }
 
-    if (!baseExecute(editor, caret, CaretSpecificDataContext(context, caret), cmd)) VimPlugin.indicateError()
+    if (!baseExecute(topLevelEditor, caret, CaretSpecificDataContext(context, caret), cmd)) VimPlugin.indicateError()
   }
 
   open fun process(cmd: Command) {

src/com/maddyhome/idea/vim/handler/MotionActionHandler.kt

@@ -24,13 +24,17 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.event.CaretEvent
 import com.intellij.openapi.editor.event.CaretListener
 import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.action.motion.updown.*
 import com.maddyhome.idea.vim.command.Argument
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.MotionType
 import com.maddyhome.idea.vim.group.MotionGroup
-import com.maddyhome.idea.vim.helper.*
+import com.maddyhome.idea.vim.helper.EditorHelper
+import com.maddyhome.idea.vim.helper.commandState
+import com.maddyhome.idea.vim.helper.inBlockSubMode
+import com.maddyhome.idea.vim.helper.inVisualMode
+import com.maddyhome.idea.vim.helper.isEndAllowed
+import com.maddyhome.idea.vim.helper.vimSelectionStart
 
 /**
  * @author Alex Plate
@@ -191,10 +195,11 @@ sealed class MotionActionHandler : EditorActionHandlerBase(false) {
       val caretToDelete = event.caret ?: return
       if (editor.inVisualMode) {
         for (caret in editor.caretModel.allCarets) {
-          if (caretToDelete.selectionStart < caret.selectionEnd &&
-            caretToDelete.selectionStart >= caret.selectionStart ||
-            caretToDelete.selectionEnd <= caret.selectionEnd &&
-            caretToDelete.selectionEnd > caret.selectionStart) {
+          val curCaretStart = caret.selectionStart
+          val curCaretEnd = caret.selectionEnd
+          val caretStartBetweenCur = caretToDelete.selectionStart in curCaretStart until curCaretEnd
+          val caretEndBetweenCur = caretToDelete.selectionEnd in curCaretStart + 1..curCaretEnd
+          if (caretStartBetweenCur || caretEndBetweenCur) {
             // Okay, caret is being removed because of merging
             val vimSelectionStart = caretToDelete.vimSelectionStart
             caret.vimSelectionStart = vimSelectionStart

src/com/maddyhome/idea/vim/handler/SpecialKeyHandlers.kt

@@ -76,11 +76,12 @@ abstract class ShiftedArrowKeyHandler : VimActionHandler.SingleExecution() {
   final override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
     val keymodelOption = OptionsManager.keymodel
     val startSel = KeyModelOptionData.startsel in keymodelOption
-    val continueselect = KeyModelOptionData.continueselect in keymodelOption
-    val continuevisual = KeyModelOptionData.continuevisual in keymodelOption
     val inVisualMode = editor.inVisualMode
     val inSelectMode = editor.inSelectMode
-    if (startSel || continueselect && inSelectMode || continuevisual && inVisualMode) {
+
+    val continueSelectSelection = KeyModelOptionData.continueselect in keymodelOption && inSelectMode
+    val continueVisualSelection = KeyModelOptionData.continuevisual in keymodelOption && inVisualMode
+    if (startSel || continueSelectSelection || continueVisualSelection) {
       if (!inVisualMode && !inSelectMode) {
         if (SelectModeOptionData.key in OptionsManager.selectmode) {
           VimPlugin.getVisualMotion().enterSelectMode(editor, CommandState.SubMode.VISUAL_CHARACTER)

src/com/maddyhome/idea/vim/handler/VimActionHandler.kt

@@ -55,4 +55,4 @@ sealed class VimActionHandler(myRunForEachCaret: Boolean) : EditorActionHandlerB
       is SingleExecution -> execute(editor, context, cmd)
     }
   }
-}
+}

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

@@ -21,21 +21,19 @@
 package com.maddyhome.idea.vim.helper
 
 import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.action.motion.updown.*
-import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandState
 import com.maddyhome.idea.vim.option.OptionsManager
 
 val usesVirtualSpace
   get() = OptionsManager.virtualedit.value == "onemore"
 
-val CommandState.Mode.isEndAllowed : Boolean
+val CommandState.Mode.isEndAllowed: Boolean
   get() = when (this) {
     CommandState.Mode.INSERT, CommandState.Mode.VISUAL, CommandState.Mode.SELECT -> true
     CommandState.Mode.COMMAND, CommandState.Mode.CMD_LINE, CommandState.Mode.REPLACE, CommandState.Mode.OP_PENDING -> usesVirtualSpace
   }
 
-val CommandState.Mode.isEndAllowedIgnoringOnemore : Boolean
+val CommandState.Mode.isEndAllowedIgnoringOnemore: Boolean
   get() = when (this) {
     CommandState.Mode.INSERT, CommandState.Mode.VISUAL, CommandState.Mode.SELECT -> true
     CommandState.Mode.COMMAND, CommandState.Mode.CMD_LINE, CommandState.Mode.REPLACE, CommandState.Mode.OP_PENDING -> false

src/com/maddyhome/idea/vim/helper/EditorDataContext.kt

@@ -15,40 +15,24 @@
  * 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 com.maddyhome.idea.vim.helper
 
-package com.maddyhome.idea.vim.helper;
-
-import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.editor.Editor;
-import org.jetbrains.annotations.NotNull;
-
-public class EditorDataContext implements DataContext {
-  public EditorDataContext(Editor editor) {
-    this.editor = editor;
-  }
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.actionSystem.PlatformDataKeys
+import com.intellij.openapi.editor.Editor
 
+class EditorDataContext(private val editor: Editor, private val contextDelegate: DataContext? = null) : DataContext {
   /**
    * Returns the object corresponding to the specified data identifier. Some of the supported data identifiers are
-   * defined in the {@link PlatformDataKeys} class.
+   * defined in the [PlatformDataKeys] class.
    *
    * @param dataId the data identifier for which the value is requested.
    * @return the value, or null if no value is available in the current context for this identifier.
    */
-  @Override
-  public Object getData(@NotNull String dataId) {
-    if (PlatformDataKeys.EDITOR.getName().equals(dataId)) {
-      return editor;
-    }
-    else if (PlatformDataKeys.PROJECT.getName().equals(dataId)) {
-      return editor.getProject();
-    }
-    else if (PlatformDataKeys.VIRTUAL_FILE.getName().equals(dataId)) {
-      return EditorHelper.getVirtualFile(editor);
-    }
-
-    return null;
+  override fun getData(dataId: String): Any? = when {
+    PlatformDataKeys.EDITOR.name == dataId -> editor
+    PlatformDataKeys.PROJECT.name == dataId -> editor.project
+    PlatformDataKeys.VIRTUAL_FILE.name == dataId -> EditorHelper.getVirtualFile(editor)
+    else -> contextDelegate?.getData(dataId)
   }
-
-  private final Editor editor;
 }

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

@@ -736,7 +736,7 @@ public class EditorHelper {
     // a visual position). If it is an inlay and is related to preceding text, we want to display it, so use it as the
     // target column. If it's an inlay related to following text, we don't want to display it at the right of the
     // screen, show the previous column
-    var inlay = editor.getInlayModel().getInlineElementAt(new VisualPosition(visualLine, visualColumn));
+    Inlay inlay = editor.getInlayModel().getInlineElementAt(new VisualPosition(visualLine, visualColumn));
     if (inlay != null && !inlay.isRelatedToPrecedingText()) {
       targetVisualColumn = visualColumn - 1;
     }
@@ -784,7 +784,8 @@ public class EditorHelper {
     VisualPosition visualPosition = caret.getVisualPosition();
 
     // Current column equals to vimLastColumn. It's great, everything is okay.
-    if (visualPosition.column == vimLastColumn) return vimLastColumn;
+    int inlayAwareOffset = InlayHelperKt.toInlayAwareOffset(visualPosition, caret);
+    if (inlayAwareOffset == vimLastColumn) return vimLastColumn;
 
     Editor editor = caret.getEditor();
     boolean isEndAllowed = CommandStateHelper.isEndAllowedIgnoringOnemore(CommandStateHelper.getMode(editor));
@@ -802,8 +803,7 @@ public class EditorHelper {
     }
 
     // Okay here we know that something is definitely wrong. We set vimLastColumn to the current column.
-    int updatedCol = visualPosition.column;
-    updatedCol -= EditorHelperRt.getAmountOfInlaysBeforeCaret(caret);
+    int updatedCol = InlayHelperKt.getInlayAwareVisualColumn(caret);
     UserDataManager.setVimLastColumn(caret, updatedCol);
     return updatedCol;
   }