Fix(VIM-308) Undo requires one more step if the cursor is not at the position where it was after undo

Actually, it was removed for some time already.
Caused this exception: https://web.ea.pages.jetbrains.team/#/issue/533401

.gitignore

@@ -10,9 +10,9 @@
 !/.idea/runConfigurations
 !/.idea/codeStyles
 
-/build/
+**/build/
-/out/
+**/out/
-/tmp/
+**/tmp/
 
 *.DS_Store
 

.teamcity/_Self/Constants.kt

@@ -5,11 +5,10 @@ object Constants {
   const val EAP_CHANNEL = "eap"
   const val DEV_CHANNEL = "Dev"
 
-  const val VERSION = "1.9.3"
+  const val VERSION = "1.10.3"
-  const val DEV_VERSION = "1.10.0"
+  const val DEV_VERSION = "1.11.0"
 
   const val GITHUB_TESTS = "LATEST-EAP-SNAPSHOT"
-  const val LINTING_TESTS = "LATEST-EAP-SNAPSHOT"
   const val NVIM_TESTS = "LATEST-EAP-SNAPSHOT"
   const val PROPERTY_TESTS = "LATEST-EAP-SNAPSHOT"
   const val LONG_RUNNING_TESTS = "LATEST-EAP-SNAPSHOT"

.teamcity/_Self/Project.kt

@@ -9,6 +9,8 @@ import _Self.vcsRoots.Branch_183
 import _Self.vcsRoots.Branch_191_193
 import _Self.vcsRoots.Branch_201
 import _Self.vcsRoots.Branch_202
+import _Self.vcsRoots.Branch_203_212
+import _Self.vcsRoots.Branch_Release
 import _Self.vcsRoots.GitHubPullRequest
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
@@ -23,12 +25,12 @@ object Project : Project({
   vcsRoot(Branch_191_193)
   vcsRoot(Branch_201)
   vcsRoot(Branch_202)
+  vcsRoot(Branch_203_212)
+  vcsRoot(Branch_Release)
   vcsRoot(GitHubPullRequest)
 
   // Builds
-  buildType(TestsForIntelliJ20203)
+  buildType(TestsForIntelliJ20213)
-  buildType(TestsForIntelliJ20211)
-  buildType(TestsForIntelliJ20212)
   buildType(TestsForIntelliJEAP)
 
   buildType(PropertyBased)

.teamcity/_Self/buildTypes/ActiveTests.kt

@@ -55,6 +55,4 @@ sealed class ActiveTests(buildName: String, ijVersion: String) : BuildType({
 })
 
 object TestsForIntelliJEAP : ActiveTests("Tests for IntelliJ Latest EAP", "LATEST-EAP-SNAPSHOT")
-object TestsForIntelliJ20212 : ActiveTests("Tests for IntelliJ 2021.2", "2021.2.2")
+object TestsForIntelliJ20213 : ActiveTests("Tests for IntelliJ 2021.3", "2021.3.2")
-object TestsForIntelliJ20211 : ActiveTests("Tests for IntelliJ 2021.1", "2021.1")
-object TestsForIntelliJ20203 : ActiveTests("Tests for IntelliJ 2020.3", "2020.3")

.teamcity/_Self/buildTypes/Qodana.kt

@@ -28,11 +28,15 @@ object Qodana : BuildType({
   steps {
     qodana {
       name = "Qodana"
+/*
       reportAsTestsEnable = ""
       failBuildOnErrors = ""
       codeInspectionXmlConfig = "Custom"
       codeInspectionCustomXmlConfigPath = ".idea/inspectionProfiles/Qodana.xml"
       reportAsTestsEnable = "true"
+*/
+      clearConditions()
+      param("licenseaudit-enable", "true")
       param("clonefinder-languages", "Java")
       param("clonefinder-mode", "")
       param("report-version", "")

.teamcity/_Self/buildTypes/Release.kt

@@ -5,6 +5,7 @@ import _Self.Constants.DEV_CHANNEL
 import _Self.Constants.EAP_CHANNEL
 import _Self.Constants.RELEASE
 import _Self.Constants.VERSION
+import _Self.vcsRoots.Branch_Release
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
@@ -38,7 +39,7 @@ object Release : BuildType({
   }
 
   vcs {
-    root(DslContext.settingsRoot)
+    root(Branch_Release)
 
     checkoutMode = CheckoutMode.AUTO
   }

.teamcity/_Self/buildTypes/TestsForIntelliJ_203-212.kt

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

.teamcity/_Self/subprojects/OldTests.kt

@@ -8,18 +8,24 @@ import _Self.buildTypes.TestsForIntelliJ20192
 import _Self.buildTypes.TestsForIntelliJ20193
 import _Self.buildTypes.TestsForIntelliJ20201
 import _Self.buildTypes.TestsForIntelliJ20202
+import _Self.buildTypes.TestsForIntelliJ20203
+import _Self.buildTypes.TestsForIntelliJ20211
+import _Self.buildTypes.TestsForIntelliJ20212
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
 object OldTests : Project({
   name = "Old IdeaVim tests"
   description = "Tests for older versions of IJ"
 
-  buildType(TestsForIntelliJ20202)
-  buildType(TestsForIntelliJ20201)
-  buildType(TestsForIntelliJ20191)
   buildType(TestsForIntelliJ20181)
-  buildType(TestsForIntelliJ20192)
   buildType(TestsForIntelliJ20182)
-  buildType(TestsForIntelliJ20193)
   buildType(TestsForIntelliJ20183)
+  buildType(TestsForIntelliJ20191)
+  buildType(TestsForIntelliJ20192)
+  buildType(TestsForIntelliJ20193)
+  buildType(TestsForIntelliJ20201)
+  buildType(TestsForIntelliJ20202)
+  buildType(TestsForIntelliJ20203)
+  buildType(TestsForIntelliJ20211)
+  buildType(TestsForIntelliJ20212)
 })

.teamcity/_Self/vcsRoots/Branch_203_212.kt

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

.teamcity/_Self/vcsRoots/Branch_Release.kt

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

.teamcity/patches/buildTypes/Nvim.kts

@@ -0,0 +1,25 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'Nvim'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("Nvim")) {
+    triggers {
+        val trigger1 = find<VcsTrigger> {
+            vcs {
+                branchFilter = ""
+            }
+        }
+        trigger1.apply {
+            enabled = false
+
+        }
+    }
+}

.teamcity/patches/buildTypes/PluginVerifier.kts

@@ -0,0 +1,25 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'PluginVerifier'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("PluginVerifier")) {
+    triggers {
+        val trigger1 = find<VcsTrigger> {
+            vcs {
+                branchFilter = ""
+            }
+        }
+        trigger1.apply {
+            enabled = false
+
+        }
+    }
+}

.teamcity/patches/buildTypes/Qodana.kts

@@ -3,6 +3,8 @@ package patches.buildTypes
 import jetbrains.buildServer.configs.kotlin.v2019_2.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.Qodana
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.ScheduleTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
 
 /*
@@ -14,16 +16,18 @@ changeBuildType(RelativeId("Qodana")) {
     expectSteps {
         qodana {
             name = "Qodana"
-            reportAsTestsEnable = "true"
+            reportAsTests = true
-            failBuildOnErrors = ""
+            inspectionProfile = customProfile {
-            codeInspectionXmlConfig = "Custom"
+                path = ".idea/inspectionProfiles/Qodana.xml"
-            codeInspectionCustomXmlConfigPath = ".idea/inspectionProfiles/Qodana.xml"
+            }
             param("clonefinder-enable", "true")
             param("clonefinder-languages", "Java")
             param("clonefinder-languages-container", "Java Kotlin")
             param("clonefinder-mode", "")
             param("clonefinder-queried-project", "src")
             param("clonefinder-reference-projects", "src")
+            param("fail-build-on-errors", "")
+            param("licenseaudit-enable", "true")
             param("namesAndTagsCustom", "repo.labs.intellij.net/static-analyser/qodana")
             param("report-version", "")
             param("yaml-configuration", "")
@@ -32,7 +36,25 @@ changeBuildType(RelativeId("Qodana")) {
     steps {
         update<Qodana>(0) {
             clearConditions()
-            param("licenseaudit-enable", "true")
+            linter = jvm {
+                version = Qodana.JVMVersion.LATEST
+            }
+        }
+    }
+
+    triggers {
+        val trigger1 = find<ScheduleTrigger> {
+            schedule {
+                schedulingPolicy = weekly {
+                    dayOfWeek = ScheduleTrigger.DAY.Tuesday
+                }
+                branchFilter = ""
+                triggerBuild = always()
+            }
+        }
+        trigger1.apply {
+            enabled = false
+
         }
     }
 }

.teamcity/patches/buildTypes/Release.kts

@@ -1,16 +0,0 @@
-package patches.buildTypes
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, change the buildType with id = 'Release'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("Release")) {
-    vcs {
-        remove(DslContext.settingsRoot.id!!)
-        add(RelativeId("Branch_Release"))
-    }
-}

.teamcity/patches/vcsRoots/Branch_Release.kts

@@ -1,18 +0,0 @@
-package patches.vcsRoots
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
-import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
-
-/*
-This patch script was generated by TeamCity on settings change in UI.
-To apply the patch, create a vcsRoot with id = 'Branch_Release'
-in the root project, and delete the patch script.
-*/
-create(DslContext.projectId, GitVcsRoot({
-    id("Branch_Release")
-    name = "https://github.com/JetBrains/ideavim (branch release)"
-    url = "https://github.com/JetBrains/ideavim.git"
-    branch = "release"
-}))
-

AUTHORS.md

@@ -380,6 +380,42 @@ Contributors:
   [![icon][github]](https://github.com/chylex)
    
   chylex
+* [![icon][mail]](mailto:daniel.egger@gmail.com)
+  [![icon][github]](https://github.com/DanEEStar)
+   
+  DanEEStar
+* [![icon][mail]](mailto:ksrbkevinsuen@gmail.com)
+  [![icon][github]](https://github.com/ksrb)
+   
+  Kevin Suen
+* [![icon][mail]](mailto:michael.schertenleib@inftec.ch)
+  [![icon][github]](https://github.com/cravay)
+   
+  Michael Schertenleib
+* [![icon][mail]](mailto:piotr@near.org)
+  [![icon][github]](https://github.com/pmnoxx)
+   
+  Piotr Mikulski
+* [![icon][mail]](mailto:lonrevip@gmail.com)
+  [![icon][github]](https://github.com/lonre)
+   
+  Lonre Wang
+* [![icon][mail]](mailto:AlexPl292@gmail.com)
+  [![icon][github]](https://github.com/AlexPl292)
+   
+  Alex Pláte
+* [![icon][mail]](mailto:david@dadon.fr)
+  [![icon][github]](https://github.com/ddadon10)
+   
+  David Dadon
+* [![icon][mail]](mailto:hollandpirates@gmail.com)
+  [![icon][github]](https://github.com/PHPirates)
+   
+  Thomas Schouten
+* [![icon][mail]](mailto:sr@mail25.de)
+  [![icon][github]](https://github.com/Vvalter)
+   
+  Simon Rainer
                         
 If you are a contributor and your name is not listed here, feel free to
 contact the maintainers.

CHANGES.md

@@ -26,14 +26,70 @@ usual beta standards.
 ## To Be Released
 
 ### Features:
-* Add register support to let command | [VIM-749](https://youtrack.jetbrains.com/issue/VIM-749)
+* Add `gcu` command for Commentary plugin
-* Add register support to let command | [VIM-1783](https://youtrack.jetbrains.com/issue/VIM-1783)
+* Add `:Commentary` command, which works great for commands such as `:%g/fun/Commentary`
-* Add `trackactionids`/`tai` option to track action ids
+* Support `gc` – commentary text objects. E.g. `dgc`: delete commented text.
+* Support `redo-register feature` | [VIM-2643](https://youtrack.jetbrains.com/issue/VIM-2643/Dot-operator-doesn-t-increment-number-register-after-pasting-fro) | [viminfo](http://vimdoc.sourceforge.net/htmldoc/undo.html#redo-register)
+
+### Changes:
+* Uses the same mappings as Commentary, so custom bindings for the Vim plugin will work with IdeaVim, too.
+  E.g. `<Plug>Commentary` instead of `<Plug>(CommentMotion)`. Old mappings are maintained for compatibility.
+* If you open `~/.ideavimrc` in IDE, remove a mapping, and reload the config using the reload button,
+  the mapping will actually be unmapped.
+
+### Fixes:
+* [VIM-2587](https://youtrack.jetbrains.com/issue/VIM-2587) Use ctrl-6 as ctrl-^
+* [VIM-2590](https://youtrack.jetbrains.com/issue/VIM-2590) Fix caret shape in PyCharm
+* [VIM-2553](https://youtrack.jetbrains.com/issue/VIM-2553) Substitute consecutive matches
+* [VIM-1687](https://youtrack.jetbrains.com/issue/VIM-1687) Support count for `gcc`
+* [VIM-2381](https://youtrack.jetbrains.com/issue/VIM-2381) Fall back to line comment if block comment is not available
+* [VIM-2589](https://youtrack.jetbrains.com/issue/VIM-2589) Add `gc` text object
+* [VIM-2604](https://youtrack.jetbrains.com/issue/VIM-2604) Update action execution rules
+* [VIM-2654](https://youtrack.jetbrains.com/issue/VIM-2654) Add support for `return` without expression
+* [VIM-2630](https://youtrack.jetbrains.com/issue/VIM-2630/Please-fix-warning-Shall-not-be-called-on-a-template-presentatio) Fix IDE freeze
+* [VIM-2661](https://youtrack.jetbrains.com/issue/VIM-2661/Spamming-does-not-work) Fix repeating the `@@` command
+* [VIM-2668](https://youtrack.jetbrains.com/issue/VIM-2668/tabm-or-tabm-with-no-number-does-not-match-vim-behavior) Fix omitted numbers in `tabm` command
+* [VIM-2595](https://youtrack.jetbrains.com/issue/VIM-2595) Support plugins in macro execution
+* [VIM-2671](https://youtrack.jetbrains.com/issue/VIM-2671) Fix using plugins from mappings
+* [VIM-2675](https://youtrack.jetbrains.com/issue/VIM-2675) Fix numbering register in visual mode
+* [VIM-696](https://youtrack.jetbrains.com/issue/VIM-696/vim-selection-issue-after-undo) Fix selection after undo
+* [VIM-744](https://youtrack.jetbrains.com/issue/VIM-744/Use-undoredo-with-count-modifier) Add count to undo/redo
+* [VIM-1862](https://youtrack.jetbrains.com/issue/VIM-1862/Ex-commands-executed-in-keymaps-and-macros-are-added-to-the-command-history) Fix command history
+
+### Merged PRs:
+* [468](https://github.com/JetBrains/ideavim/pull/468) by [Thomas Schouten](https://github.com/PHPirates): Implement UserDataHolder for EditorDataContext
+* [483](https://github.com/JetBrains/ideavim/pull/483) by [Simon Rainer](https://github.com/Vvalter): Fix(VIM-2553): Substitute consecutive matches
+* [488](https://github.com/JetBrains/ideavim/pull/488) by [Martin Yzeiri](https://github.com/myzeiri): Add Matchit support for the C family of languages
+* [493](https://github.com/JetBrains/ideavim/pull/493) by [Matt Ellis](https://github.com/citizenmatt): Improvements to Commentary extension
+* [494](https://github.com/JetBrains/ideavim/pull/494) by [Matt Ellis](https://github.com/citizenmatt): Cleanup pre-212 CaretVisualAttributes compatibility code
+* [504](https://github.com/JetBrains/ideavim/pull/504) by [Matt Ellis](https://github.com/citizenmatt): Minor bug fixes
+
+## 1.10.0, 2022-02-17
+
+### Features:
+* Add register support to let command | [VIM-749](https://youtrack.jetbrains.com/issue/VIM-749), [VIM-1783](https://youtrack.jetbrains.com/issue/VIM-1783)
+* Add tabmove command | [VIM-1164](https://youtrack.jetbrains.com/issue/VIM-1164)
 
 ### Fixes:
 * [VIM-2502](https://youtrack.jetbrains.com/issue/VIM-2502) Fix the shape of new carets
 * [VIM-2499](https://youtrack.jetbrains.com/issue/VIM-2499) Fix mapping to esc
 * [VIM-2500](https://youtrack.jetbrains.com/issue/VIM-2500) Fix esc for normal mode
+* [VIM-2523](https://youtrack.jetbrains.com/issue/VIM-2523) `i` command for the folder in the project tree
+* [VIM-2471](https://youtrack.jetbrains.com/issue/VIM-2471) Multiple [{ and ]} actions
+* [VIM-2504](https://youtrack.jetbrains.com/issue/VIM-2504) Fix esc with using python notebooks
+* [VIM-2540](https://youtrack.jetbrains.com/issue/VIM-2540) Fix option listeners
+* [VIM-2548](https://youtrack.jetbrains.com/issue/VIM-2548) Fix paste
+* [VIM-2470](https://youtrack.jetbrains.com/issue/VIM-2470) Fix incorrect reset of cursor shape
+* [VIM-2223](https://youtrack.jetbrains.com/issue/VIM-2223), [VIM-1684](https://youtrack.jetbrains.com/issue/VIM-1684), [VIM-2491](https://youtrack.jetbrains.com/issue/VIM-2491) Fix `gv`
+
+### Merged PRs:
+* [441](https://github.com/JetBrains/ideavim/pull/441) by [DanEEStar](https://github.com/DanEEStar): Add Matchit support for Vue.js files
+* [440](https://github.com/JetBrains/ideavim/pull/440) by [Kevin Suen](https://github.com/ksrb): Add matchit support for handlebars
+* [448](https://github.com/JetBrains/ideavim/pull/448) by [Michael Schertenleib](https://github.com/cravay): Support custom element names in vim-surround
+* [435](https://github.com/JetBrains/ideavim/pull/435) by [Piotr Mikulski](https://github.com/pmnoxx): Print stderr when running a command just like vim does
+* [449](https://github.com/JetBrains/ideavim/pull/449) by [Lonre Wang](https://github.com/lonre): Typo fix
+* [453](https://github.com/JetBrains/ideavim/pull/453) by [Matt Ellis](https://github.com/citizenmatt): fix(VIM-2470): Fix incorrect reset of cursor shape
+* [461](https://github.com/JetBrains/ideavim/pull/461) by [David Dadon](https://github.com/ddadon10): Add shortcut to ideajoin example
 
 ## 1.9.0, 2021-12-10
 

CONTRIBUTING.md

@@ -4,6 +4,9 @@ IdeaVim is an open source project created by 80+ contributors. Would you like to
 
 This page is created to help you start contributing. And who knows, maybe in a few days this project will be brighter than ever!
 
+:warning: The plugin is currently under a huge refactoring aiming to split into vim-engine and IdeaVim in order to
+support the new [Fleet IDE](https://www.jetbrains.com/fleet/).
+
 ## Before you begin
 
 - The project is written in Kotlin and Java. Choose whichever language you feel more comfortable with,
@@ -71,7 +74,7 @@ If you are looking for:
 
 - Common features:
     - State machine. How every particular keystroke is parsed in IdeaVim: `KeyHandler.handleKey()`.
-    - Options (`incsearch`, `iskeyword`, `relativenumber`): `OptionsManager`.
+    - Options (`incsearch`, `iskeyword`, `relativenumber`): `OptionServiceImpl`.
     - Plugin startup: `PluginStartup`.
     - Notifications: `NotificationService`.
     - Status bar icon: `StatusBar.kt`.

README.md

@@ -212,6 +212,7 @@ Ex commands or via `:map` command mappings:
 ### Executing actions:
 * `:action {action_id}`
     * Execute an action by `{action_id}`. Works from Ex command line.
+    * Please don't use `:action` in mappings. Use `<Action>` instead.
 * `<Action>({action_id})`
     * For the mappings you can use a special `<Action>` keyword. Don't forget the parentheses.
     * E.g. `map gh <Action>(ShowErrorDescription)`  <- execute hover on `gh`.

build.gradle.kts

@@ -11,24 +11,24 @@ buildscript {
     }
 
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.10")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
         classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
-        classpath("org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r")
-        classpath("org.kohsuke:github-api:1.301")
+        classpath("org.kohsuke:github-api:1.305")
-        classpath("org.jetbrains:markdown:0.2.4")
+        classpath("org.jetbrains:markdown:0.3.1")
     }
 }
 
 plugins {
     antlr
     java
-    kotlin("jvm") version "1.5.10"
+    kotlin("jvm") version "1.6.21"
 
-    id("org.jetbrains.intellij") version "1.3.0"
+    id("org.jetbrains.intellij") version "1.6.0"
     id("org.jetbrains.changelog") version "1.3.1"
 
     // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
-    id("org.jlleitschuh.gradle.ktlint") version "10.2.0"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }
 
 // Import variables from gradle.properties file
@@ -38,6 +38,7 @@ val ideaVersion: String by project
 val downloadIdeaSources: String by project
 val instrumentPluginCode: String by project
 val remoteRobotVersion: String by project
+val antlrVersion: String by project
 
 val publishChannels: String by project
 val publishToken: String by project
@@ -57,11 +58,19 @@ dependencies {
     testImplementation("com.ensarsarajcic.neovim.java:neovim-api:0.2.3")
     testImplementation("com.ensarsarajcic.neovim.java:core-rpc:0.2.3")
 
+    // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-test
+    testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
+
+    // https://mvnrepository.com/artifact/org.mockito.kotlin/mockito-kotlin
+    testImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
+
     testImplementation("com.intellij.remoterobot:remote-robot:$remoteRobotVersion")
     testImplementation("com.intellij.remoterobot:remote-fixtures:$remoteRobotVersion")
     testImplementation("com.automation-remarks:video-recorder-junit:2.0")
-    runtimeOnly("org.antlr:antlr4-runtime:4.9.3")
+    runtimeOnly("org.antlr:antlr4-runtime:$antlrVersion")
-    antlr("org.antlr:antlr4:4.9.3")
+    antlr("org.antlr:antlr4:$antlrVersion")
+
+    implementation(project(":vim-engine"))
 }
 
 configurations {
@@ -71,6 +80,22 @@ configurations {
 }
 
 // --- Compilation
+// This can be moved to other test registration when issue with tests in gradle will be fixed
+tasks.register<Test>("testWithNeovim") {
+    group = "verification"
+    systemProperty("ideavim.nvim.test", "true")
+    exclude("/ui/**")
+}
+
+tasks.register<Test>("testPropertyBased") {
+    group = "verification"
+//    include("**/propertybased/**")
+}
+
+tasks.register<Test>("testLongRunning") {
+    group = "verification"
+//    include("**/longrunning/**")
+}
 
 tasks {
     // Issue in gradle 7.3
@@ -83,6 +108,32 @@ tasks {
         exclude("**/ParserTest.class")
     }
 
+    val testWithNeovim by getting(Test::class) {
+        isScanForTestClasses = false
+        // Only run tests from classes that end with "Test"
+        include("**/*Test.class")
+        include("**/*test.class")
+        include("**/*Tests.class")
+        exclude("**/ParserTest.class")
+    }
+
+    val testPropertyBased by getting(Test::class) {
+        isScanForTestClasses = false
+        // Only run tests from classes that end with "Test"
+        include("**/propertybased/*Test.class")
+        include("**/propertybased/*test.class")
+        include("**/propertybased/*Tests.class")
+    }
+
+    val testLongRunning by getting(Test::class) {
+        isScanForTestClasses = false
+        // Only run tests from classes that end with "Test"
+        include("**/longrunning/**/*Test.class")
+        include("**/longrunning/**/*test.class")
+        include("**/longrunning/**/*Tests.class")
+        exclude("**/longrunning/**/ParserTest.class")
+    }
+
     compileJava {
         sourceCompatibility = javaVersion
         targetCompatibility = javaVersion
@@ -93,14 +144,14 @@ tasks {
     compileKotlin {
         kotlinOptions {
             jvmTarget = javaVersion
-            apiVersion = "1.4"
+            apiVersion = "1.5"
 //            allWarningsAsErrors = true
         }
     }
     compileTestKotlin {
         kotlinOptions {
             jvmTarget = javaVersion
-            apiVersion = "1.4"
+            apiVersion = "1.5"
 //            allWarningsAsErrors = true
         }
     }
@@ -118,11 +169,14 @@ gradle.projectsEvaluated {
 intellij {
     version.set(ideaVersion)
     pluginName.set("IdeaVim")
+
     updateSinceUntilBuild.set(false)
+
     downloadSources.set(downloadIdeaSources.toBoolean())
     instrumentCode.set(instrumentPluginCode.toBoolean())
     intellijRepository.set("https://www.jetbrains.com/intellij-repository")
-    plugins.set(listOf("java", "AceJump:3.8.4"))
+    // Yaml is only used for testing. It's part of the IdeaIC distribution, but needs to be included as a reference
+    plugins.set(listOf("java", "AceJump:3.8.4", "yaml"))
 }
 
 tasks {
@@ -145,6 +199,7 @@ tasks {
     runPluginVerifier {
         downloadDir.set("${project.buildDir}/pluginVerifier/ides")
         teamCityOutputFormat.set(true)
+        ideVersions.set(listOf("IC-2021.3.4"))
     }
 
     generateGrammarSource {
@@ -174,22 +229,6 @@ tasks {
     }
 }
 
-tasks.register<Test>("testWithNeovim") {
-    group = "verification"
-    systemProperty("ideavim.nvim.test", "true")
-    exclude("/ui/**")
-}
-
-tasks.register<Test>("testPropertyBased") {
-    group = "verification"
-    include("**/propertybased/**")
-}
-
-tasks.register<Test>("testLongRunning") {
-    group = "verification"
-    include("**/longrunning/**")
-}
-
 tasks.register<Test>("testUi") {
     group = "verification"
     include("/ui/**")

doc/ideajoin-examples.md

@@ -1,6 +1,8 @@
 Some examples of join command with `ideajoin` option enabled.  
 Put `set ideajoin` to your `~/.ideavimrc` to enable this functionality.
 
+Now, you can press `J` (`shift+j`) on a line or a selected block of text to join the lines together.
+
 * Automatic join concatenated lines:
 
 ```
@@ -55,4 +57,4 @@ sb.append("a");           ->       sb.append("a").append("b");
 sb.append("b");
 ```
 
-And other features provided by the plugins.
+And other features provided by the plugins.

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,19 +1,3 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
 rootProject.name = 'IdeaVIM'
+include 'vim-engine'
+

src/main/antlr/Vimscript.g4

@@ -28,7 +28,7 @@ comment:                (WS | COLON)* QUOTE ~(NEW_LINE)* NEW_LINE;
 finishStatement:        (WS | COLON)* FINISH WS* (NEW_LINE | BAR);
 continueStatement:      (WS | COLON)* CONTINUE WS* (NEW_LINE | BAR);
 breakStatement:         (WS | COLON)* BREAK WS* (NEW_LINE | BAR);
-returnStatement:        (WS | COLON)* range? (WS | COLON)* RETURN WS+ expr WS* (NEW_LINE | BAR);
+returnStatement:        (WS | COLON)* range? (WS | COLON)* RETURN (WS+ expr)? WS* (NEW_LINE | BAR);
 throwStatement:         (WS | COLON)* THROW WS+ expr WS* (NEW_LINE | BAR);
 
 ifStatement:            ifBlock
@@ -117,7 +117,7 @@ command:
         | MARK_COMMAND | JUMPS | J_LOWERCASE | JOIN_LINES | HISTORY | GO_TO_CHAR | SYMBOL | FIND | CLASS | F_LOWERCASE
         | FILE | EXIT | E_LOWERCASE | EDIT_FILE | DUMP_LINE | DIGRAPH | DEL_MARKS | D_LOWERCASE | DEL_LINES | DELCMD
         | T_LOWERCASE | COPY | CMD_CLEAR | BUFFER_LIST | BUFFER_CLOSE | B_LOWERCASE | BUFFER | ASCII
-        | ACTIONLIST | ACTION | LOCKVAR | UNLOCKVAR | PACKADD
+        | ACTIONLIST | ACTION | LOCKVAR | UNLOCKVAR | PACKADD | TABMOVE
       )
     WS* ((commandArgumentWithoutBars? inline_comment NEW_LINE) | (commandArgumentWithoutBars? NEW_LINE) | (commandArgumentWithoutBars? BAR)) (NEW_LINE | BAR)*
     #CommandWithComment|
@@ -492,6 +492,7 @@ existingCommands:       RETURN
                     |   EXECUTE
                     |   CALL
                     |   NORMAL
+                    |   TABMOVE
 ;
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -684,6 +685,7 @@ EXECUTE:                'exe' | 'exec' | 'execu' | 'execut' | 'execute';
 LOCKVAR:                'lockv' | 'lockva' | 'lockvar';
 UNLOCKVAR:              'unlo' | 'unloc' | 'unlock' | 'unlockv' | 'unlockva' | 'unlockvar';
 NORMAL:                 'norm' | 'norma' | 'normal';
+TABMOVE:                'tabm' | 'tabmo' | 'tabmov' | 'tabmove';
 
 // Types
 DIGIT:                  [0-9];

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ public class EventFacade {
   public void setupTypedActionHandler(@NotNull VimTypedActionHandler handler) {
     final TypedAction typedAction = getTypedAction();
 
-    if (HandlerInjector.notebookCommandMode()) {
+    if (HandlerInjector.notebookCommandMode(null)) {
       TypedActionHandler result = HandlerInjector.inject();
       if (result != null) {
         myOriginalTypedActionHandler = result;

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@ import com.maddyhome.idea.vim.group.KeyGroup;
 import com.maddyhome.idea.vim.handler.ActionBeanClass;
 import com.maddyhome.idea.vim.handler.EditorActionHandlerBase;
 import com.maddyhome.idea.vim.key.MappingOwner;
+import com.maddyhome.idea.vim.newapi.IjVimActionsInitiator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -71,7 +72,7 @@ public class RegisterActions {
 
   private static void registerVimCommandActions() {
     KeyGroup parser = VimPlugin.getKey();
-    VIM_ACTIONS_EP.extensions().forEach(parser::registerCommandAction);
+    VIM_ACTIONS_EP.extensions().map(IjVimActionsInitiator::new).forEach(parser::registerCommandAction);
   }
 
   private static void registerEmptyShortcuts() {
@@ -80,6 +81,6 @@ public class RegisterActions {
     // The {char1} <BS> {char2} shortcut is handled directly by KeyHandler#handleKey, so doesn't have an action. But we
     // still need to register the shortcut, to make sure the editor doesn't swallow it.
     parser
-      .registerShortcutWithoutAction(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), MappingOwner.IdeaVim.INSTANCE);
+      .registerShortcutWithoutAction(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), MappingOwner.IdeaVim.System.INSTANCE);
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,7 +25,6 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.Application;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.diagnostic.Logger;
@@ -35,11 +34,10 @@ import com.intellij.openapi.keymap.ex.KeymapManagerEx;
 import com.intellij.openapi.keymap.impl.DefaultKeymap;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.SystemInfo;
-import com.intellij.openapi.wm.StatusBar;
+import com.maddyhome.idea.vim.api.VimInjectorKt;
-import com.intellij.openapi.wm.WindowManager;
+import com.maddyhome.idea.vim.api.VimKeyGroup;
 import com.maddyhome.idea.vim.config.VimState;
 import com.maddyhome.idea.vim.config.migration.ApplicationConfigurationMigrator;
 import com.maddyhome.idea.vim.extension.VimExtensionRegistrar;
@@ -49,21 +47,20 @@ import com.maddyhome.idea.vim.group.copy.YankGroup;
 import com.maddyhome.idea.vim.group.visual.VisualMotionGroup;
 import com.maddyhome.idea.vim.helper.MacKeyRepeat;
 import com.maddyhome.idea.vim.listener.VimListenerManager;
-import com.maddyhome.idea.vim.option.OptionsManager;
+import com.maddyhome.idea.vim.newapi.IjVimInjector;
+import com.maddyhome.idea.vim.options.OptionService;
 import com.maddyhome.idea.vim.ui.StatusBarIconFactory;
 import com.maddyhome.idea.vim.ui.VimEmulationConfigurable;
 import com.maddyhome.idea.vim.ui.ex.ExEntryPanel;
 import com.maddyhome.idea.vim.vimscript.services.FunctionStorage;
-import com.maddyhome.idea.vim.vimscript.services.OptionService;
+import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService;
-import com.maddyhome.idea.vim.vimscript.services.VariableService;
+import com.maddyhome.idea.vim.vimscript.services.VimVariableService;
-import com.maddyhome.idea.vim.vimscript.services.VariableServiceImpl;
 import org.jdom.Element;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.event.HyperlinkEvent;
-import java.awt.*;
 
 import static com.maddyhome.idea.vim.group.EditorGroup.EDITOR_STORE_ELEMENT;
 import static com.maddyhome.idea.vim.group.KeyGroup.SHORTCUT_CONFLICTS_ELEMENT;
@@ -77,18 +74,16 @@ import static com.maddyhome.idea.vim.vimscript.services.VimRcService.executeIdea
  * This is an application level plugin meaning that all open projects will share a common instance of the plugin.
  * Registers and marks are shared across open projects so you can copy and paste between files of different projects.
  */
-@SuppressWarnings("deprecation")
-// [VERSION UPDATE] 212+ getService
 @State(name = "VimSettings", storages = {@Storage("$APP_CONFIG$/vim_settings.xml")})
 public class VimPlugin implements PersistentStateComponent<Element>, Disposable {
+
+  static {
+    VimInjectorKt.setInjector(new IjVimInjector());
+  }
+
   private static final String IDEAVIM_PLUGIN_ID = "IdeaVIM";
   public static final int STATE_VERSION = 7;
 
-  private static long lastBeepTimeMillis;
-
-  private boolean error = false;
-  private String message = null;
-
   private int previousStateVersion = 0;
   private String previousKeyMap = "";
 
@@ -131,10 +126,10 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
    */
   public static @NotNull NotificationService getNotifications(@Nullable Project project) {
     if (project == null) {
-      return ServiceManager.getService(NotificationService.class);
+      return ApplicationManager.getApplication().getService(NotificationService.class);
     }
     else {
-      return ServiceManager.getService(project, NotificationService.class);
+      return project.getService(NotificationService.class);
     }
   }
 
@@ -144,35 +139,35 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
 
 
   public static @NotNull MotionGroup getMotion() {
-    return ServiceManager.getService(MotionGroup.class);
+    return ApplicationManager.getApplication().getService(MotionGroup.class);
+  }
+
+  public static @NotNull XMLGroup getXML() {
+    return ApplicationManager.getApplication().getService(XMLGroup.class);
   }
 
   public static @NotNull ChangeGroup getChange() {
-    return ServiceManager.getService(ChangeGroup.class);
+    return ((ChangeGroup)VimInjectorKt.getInjector().getChangeGroup());
   }
 
   public static @NotNull CommandGroup getCommand() {
-    return ServiceManager.getService(CommandGroup.class);
+    return ApplicationManager.getApplication().getService(CommandGroup.class);
   }
 
   public static @NotNull MarkGroup getMark() {
-    return ServiceManager.getService(MarkGroup.class);
+    return ((MarkGroup)VimInjectorKt.getInjector().getMarkGroup());
   }
 
   public static @NotNull RegisterGroup getRegister() {
-    return ServiceManager.getService(RegisterGroup.class);
+    return ((RegisterGroup)VimInjectorKt.getInjector().getRegisterGroup());
-  }
-
-  public static @Nullable RegisterGroup getRegisterIfCreated() {
-    return ApplicationManager.getApplication().getServiceIfCreated(RegisterGroup.class);
   }
 
   public static @NotNull FileGroup getFile() {
-    return ServiceManager.getService(FileGroup.class);
+    return (FileGroup)VimInjectorKt.getInjector().getFile();
   }
 
   public static @NotNull SearchGroup getSearch() {
-    return ServiceManager.getService(SearchGroup.class);
+    return ApplicationManager.getApplication().getService(SearchGroup.class);
   }
 
   public static @Nullable SearchGroup getSearchIfCreated() {
@@ -180,35 +175,39 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   }
 
   public static @NotNull ProcessGroup getProcess() {
-    return ServiceManager.getService(ProcessGroup.class);
+    return ((ProcessGroup)VimInjectorKt.getInjector().getProcessGroup());
   }
 
   public static @NotNull MacroGroup getMacro() {
-    return ServiceManager.getService(MacroGroup.class);
+    return (MacroGroup)VimInjectorKt.getInjector().getMacro();
   }
 
   public static @NotNull DigraphGroup getDigraph() {
-    return ServiceManager.getService(DigraphGroup.class);
+    return (DigraphGroup)VimInjectorKt.getInjector().getDigraphGroup();
   }
 
   public static @NotNull HistoryGroup getHistory() {
-    return ServiceManager.getService(HistoryGroup.class);
+    return ApplicationManager.getApplication().getService(HistoryGroup.class);
   }
 
   public static @NotNull KeyGroup getKey() {
-    return ServiceManager.getService(KeyGroup.class);
+    return ((KeyGroup)VimInjectorKt.getInjector().getKeyGroup());
   }
 
   public static @Nullable KeyGroup getKeyIfCreated() {
-    return ApplicationManager.getApplication().getServiceIfCreated(KeyGroup.class);
+    return ((KeyGroup)ApplicationManager.getApplication().getServiceIfCreated(VimKeyGroup.class));
   }
 
   public static @NotNull WindowGroup getWindow() {
-    return ServiceManager.getService(WindowGroup.class);
+    return ((WindowGroup)VimInjectorKt.getInjector().getWindow());
+  }
+
+  public static @NotNull TabService getTabService() {
+    return ApplicationManager.getApplication().getService(TabService.class);
   }
 
   public static @NotNull EditorGroup getEditor() {
-    return ServiceManager.getService(EditorGroup.class);
+    return ApplicationManager.getApplication().getService(EditorGroup.class);
   }
 
   public static @Nullable EditorGroup getEditorIfCreated() {
@@ -216,23 +215,27 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   }
 
   public static @NotNull VisualMotionGroup getVisualMotion() {
-    return ServiceManager.getService(VisualMotionGroup.class);
+    return (VisualMotionGroup)VimInjectorKt.getInjector().getVisualMotionGroup();
   }
 
   public static @NotNull YankGroup getYank() {
-    return ServiceManager.getService(YankGroup.class);
+    return (YankGroup)VimInjectorKt.getInjector().getYank();
   }
 
   public static @NotNull PutGroup getPut() {
-    return ServiceManager.getService(PutGroup.class);
+    return (PutGroup)VimInjectorKt.getInjector().getPut();
   }
 
-  public static @NotNull VariableService getVariableService() {
+  public static @NotNull VimVariableService getVariableService() {
-    return ServiceManager.getService(VariableService.class);
+    return ApplicationManager.getApplication().getService(VimVariableService.class);
   }
 
   public static @NotNull OptionService getOptionService() {
-    return ServiceManager.getService(OptionService.class);
+    return VimInjectorKt.getInjector().getOptionService();
+  }
+
+  public static @NotNull IjVimOptionService getOptionServiceImpl() {
+    return (IjVimOptionService)VimInjectorKt.getInjector().getOptionService();
   }
 
   private static @NotNull NotificationService getNotifications() {
@@ -285,85 +288,79 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   }
 
   public static boolean isError() {
-    return getInstance().error;
+    return VimInjectorKt.getInjector().getMessages().isError();
   }
 
   public static String getMessage() {
-    return getInstance().message;
+    return VimInjectorKt.getInjector().getMessages().getStatusBarMessage();
   }
 
   /**
    * Indicate to the user that an error has occurred. Just beep.
    */
   public static void indicateError() {
-    if (ApplicationManager.getApplication().isUnitTestMode()) {
+    VimInjectorKt.getInjector().getMessages().indicateError();
-      getInstance().error = true;
-    }
-    else if (!VimPlugin.getOptionService().isSet(OptionService.Scope.GLOBAL.INSTANCE, "visualbell", "visualbell")) {
-      // Vim only allows a beep once every half second - :help 'visualbell'
-      final long currentTimeMillis = System.currentTimeMillis();
-      if (currentTimeMillis - lastBeepTimeMillis > 500) {
-        Toolkit.getDefaultToolkit().beep();
-        lastBeepTimeMillis = currentTimeMillis;
-      }
-    }
   }
 
   public static void clearError() {
-    if (ApplicationManager.getApplication().isUnitTestMode()) {
+    VimInjectorKt.getInjector().getMessages().clearError();
-      getInstance().error = false;
-    }
   }
 
   public static void showMode(String msg) {
-    showMessage(msg);
+    VimInjectorKt.getInjector().getMessages().showMode(msg);
   }
 
   public static void showMessage(@Nls(capitalization = Nls.Capitalization.Sentence) @Nullable String msg) {
-    if (ApplicationManager.getApplication().isUnitTestMode()) {
+    VimInjectorKt.getInjector().getMessages().showStatusBarMessage(msg);
-      getInstance().message = msg;
-    }
-    ProjectManager pm = ProjectManager.getInstance();
-    Project[] projects = pm.getOpenProjects();
-    for (Project project : projects) {
-      StatusBar bar = WindowManager.getInstance().getStatusBar(project);
-      if (bar != null) {
-        if (msg == null || msg.length() == 0) {
-          bar.setInfo("");
-        }
-        else {
-          bar.setInfo("VIM - " + msg);
-        }
-      }
-    }
   }
 
   public static @NotNull VimPlugin getInstance() {
-    return ServiceManager.getService(VimPlugin.class);
+    return ApplicationManager.getApplication().getService(VimPlugin.class);
   }
 
+  /**
+   * IdeaVim plugin initialization.
+   * This is an important operation and some commands ordering should be preserved.
+   * Please make sure that the documentation of this function is in sync with the code
+   *
+   * 1) Update state
+   *    This schedules a state update. In most cases it just shows some dialogs to the user. As I know, there are
+   *      no special reasons to keep this command as a first line, so it seems safe to move it.
+   * 2) Command registration
+   *    This block should be located BEFORE ~/.ideavimrc execution. Without it the commands won't be registered
+   *      and initialized, but ~/.ideavimrc file may refer or execute some commands or functions.
+   *    This block DOES NOT initialize extensions, but only registers the available ones.
+   * 3) ~/.ideavimrc execution
+   *    3.1 executes commands from the .ideavimrc file and 3.2 initializes extensions.
+   *    3.1 MUST BE BEFORE 3.2. This is a flow of vim/IdeaVim initialization, firstly .ideavimrc is executed and then
+   *      the extensions are initialized.
+   * 4) Components initialization
+   *    This should happen after ideavimrc execution because VimListenerManager accesses `number` option
+   *      to init line numbers and guicaret to initialize carets.
+   *    However, there is a question about listeners attaching. Listeners registration happens after the .ideavimrc
+   *      execution, what theoretically may cause bugs (e.g. VIM-2540)
+   */
   private void turnOnPlugin() {
+    // 1) Update state
     ApplicationManager.getApplication().invokeLater(this::updateState);
 
-    // Register vim actions in command mode
+    // 2) Command registration
+    // 2.1) Register vim actions in command mode
     RegisterActions.registerActions();
 
-    // Register extensions
+    // 2.2) Register extensions
     VimExtensionRegistrar.registerExtensions();
 
-    // Register functions
+    // 2.3) Register functions
     FunctionStorage.INSTANCE.registerHandlers();
 
-    // Execute ~/.ideavimrc
+    // 3) ~/.ideavimrc execution
+    // 3.1) Execute ~/.ideavimrc
     registerIdeavimrc();
 
-    // Initialize extensions
+    // 3.2) Initialize extensions. Always after 3.1
     VimExtensionRegistrar.enableDelayedExtensions();
 
-    // Some options' default values are based on values set in .ideavimrc, e.g. 'shellxquote' on Windows when 'shell'
-    // is cmd.exe has a different default to when 'shell' contains "sh"
-    OptionsManager.INSTANCE.completeInitialisation();
-
     // Turing on should be performed after all commands registration
     getSearch().turnOn();
     VimListenerManager.INSTANCE.turnOn();

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,8 +25,12 @@ import com.intellij.openapi.editor.actionSystem.TypedActionHandler
 import com.intellij.openapi.editor.actionSystem.TypedActionHandlerEx
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.maddyhome.idea.vim.helper.EditorDataContext
+import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
-import com.maddyhome.idea.vim.vimscript.services.OptionService
+import com.maddyhome.idea.vim.key.KeyHandlerKeeper
+import com.maddyhome.idea.vim.newapi.vim
+import com.maddyhome.idea.vim.options.OptionConstants
+import com.maddyhome.idea.vim.options.OptionScope
 import java.awt.event.KeyAdapter
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
@@ -36,33 +40,43 @@ import javax.swing.KeyStroke
  *
  * IDE shortcut keys used by Vim commands are handled by [com.maddyhome.idea.vim.action.VimShortcutKeyAction].
  */
-class VimTypedActionHandler(origHandler: TypedActionHandler?) : TypedActionHandlerEx {
+class VimTypedActionHandler(origHandler: TypedActionHandler) : TypedActionHandlerEx {
   private val handler = KeyHandler.getInstance()
-  private val traceTime = VimPlugin.getOptionService().isSet(OptionService.Scope.GLOBAL, "ideatracetime")
+  private val traceTime = VimPlugin.getOptionService().isSet(OptionScope.GLOBAL, OptionConstants.ideatracetimeName)
 
   init {
-    handler.originalHandler = origHandler
+    KeyHandlerKeeper.getInstance().originalHandler = origHandler
   }
 
   override fun beforeExecute(editor: Editor, charTyped: Char, context: DataContext, plan: ActionPlan) {
     LOG.trace("Before execute for typed action")
     if (editor.isIdeaVimDisabledHere) {
       LOG.trace("IdeaVim disabled here, finish")
-      (handler.originalHandler as? TypedActionHandlerEx)?.beforeExecute(editor, charTyped, context, plan)
+      (KeyHandlerKeeper.getInstance().originalHandler as? TypedActionHandlerEx)?.beforeExecute(editor, charTyped, context, plan)
       return
     }
 
     LOG.trace("Executing before execute")
     val modifiers = if (charTyped == ' ' && VimKeyListener.isSpaceShift) KeyEvent.SHIFT_DOWN_MASK else 0
     val keyStroke = KeyStroke.getKeyStroke(charTyped, modifiers)
-    handler.beforeHandleKey(editor, keyStroke, context, plan)
+
+    /* Invoked before acquiring a write lock and actually handling the keystroke.
+     *
+     * Drafts an optional [ActionPlan] that will be used as a base for zero-latency rendering in editor.
+     */
+    if (editor.inInsertMode) {
+      val originalHandler = KeyHandlerKeeper.getInstance().originalHandler
+      if (originalHandler is TypedActionHandlerEx) {
+        originalHandler.beforeExecute(editor, keyStroke.keyChar, context, plan)
+      }
+    }
   }
 
   override fun execute(editor: Editor, charTyped: Char, context: DataContext) {
     LOG.trace("Execute for typed action")
     if (editor.isIdeaVimDisabledHere) {
       LOG.trace("IdeaVim disabled here, finish")
-      handler.originalHandler.execute(editor, charTyped, context)
+      KeyHandlerKeeper.getInstance().originalHandler.execute(editor, charTyped, context)
       return
     }
 
@@ -71,7 +85,7 @@ class VimTypedActionHandler(origHandler: TypedActionHandler?) : TypedActionHandl
       val modifiers = if (charTyped == ' ' && VimKeyListener.isSpaceShift) KeyEvent.SHIFT_DOWN_MASK else 0
       val keyStroke = KeyStroke.getKeyStroke(charTyped, modifiers)
       val startTime = if (traceTime) System.currentTimeMillis() else null
-      handler.handleKey(editor, keyStroke, EditorDataContext.init(editor, context))
+      handler.handleKey(editor.vim, keyStroke, EditorDataContext.init(editor, context).vim)
       if (startTime != null) {
         val duration = System.currentTimeMillis() - startTime
         LOG.info("VimTypedAction '$charTyped': $duration ms")

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,9 @@
  */
 package com.maddyhome.idea.vim.action
 
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.handler.VimActionHandler
@@ -27,7 +27,7 @@ import com.maddyhome.idea.vim.handler.VimActionHandler
 class ExEntryAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
+  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     VimPlugin.getProcess().startExCommand(editor, context, cmd)
     return true
   }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -34,10 +34,10 @@ import com.intellij.openapi.util.Key
 import com.intellij.ui.KeyStrokeAdapter
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.EditorDataContext
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.HandlerInjector
-import com.maddyhome.idea.vim.helper.StringHelper
 import com.maddyhome.idea.vim.helper.inInsertMode
 import com.maddyhome.idea.vim.helper.inNormalMode
 import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
@@ -48,10 +48,14 @@ import com.maddyhome.idea.vim.key.ShortcutOwner
 import com.maddyhome.idea.vim.key.ShortcutOwnerInfo
 import com.maddyhome.idea.vim.listener.AceJumpService
 import com.maddyhome.idea.vim.listener.AppCodeTemplates.appCodeTemplateCaptured
+import com.maddyhome.idea.vim.newapi.IjVimEditor
+import com.maddyhome.idea.vim.newapi.vim
+import com.maddyhome.idea.vim.options.OptionChangeListener
+import com.maddyhome.idea.vim.options.OptionConstants
+import com.maddyhome.idea.vim.options.OptionScope
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimDataType
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString
-import com.maddyhome.idea.vim.vimscript.model.options.OptionChangeListener
+import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
-import com.maddyhome.idea.vim.vimscript.services.OptionService
 import java.awt.event.InputEvent
 import java.awt.event.KeyEvent
 import javax.swing.KeyStroke
@@ -63,7 +67,7 @@ import javax.swing.KeyStroke
  * These keys are not passed to [com.maddyhome.idea.vim.VimTypedActionHandler] and should be handled by actions.
  */
 class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
-  private val traceTime = VimPlugin.getOptionService().isSet(OptionService.Scope.GLOBAL, "ideatracetime")
+  private val traceTime = VimPlugin.getOptionService().isSet(OptionScope.GLOBAL, OptionConstants.ideatracetimeName)
 
   override fun actionPerformed(e: AnActionEvent) {
     LOG.trace("Executing shortcut key action")
@@ -77,7 +81,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
       // Should we use HelperKt.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
       try {
         val start = if (traceTime) System.currentTimeMillis() else null
-        KeyHandler.getInstance().handleKey(editor, keyStroke, EditorDataContext.init(editor, e.dataContext))
+        KeyHandler.getInstance().handleKey(editor.vim, keyStroke, EditorDataContext.init(editor, e.dataContext).vim)
         if (start != null) {
           val duration = System.currentTimeMillis() - start
           LOG.info("VimShortcut update '$keyStroke': $duration ms")
@@ -121,8 +125,8 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
 
       val keyCode = keyStroke.keyCode
 
-      if (HandlerInjector.notebookCommandMode()) {
+      if (HandlerInjector.notebookCommandMode(editor)) {
-        LOG.trace("Python Notebook command mode")
+        LOG.debug("Python Notebook command mode")
         if (keyCode == KeyEvent.VK_RIGHT || keyCode == KeyEvent.VK_KP_RIGHT || keyCode == KeyEvent.VK_ENTER) {
           invokeLater { editor.updateCaretsVisualAttributes() }
         }
@@ -170,19 +174,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
 
       val savedShortcutConflicts = VimPlugin.getKey().savedShortcutConflicts
       val info = savedShortcutConflicts[keyStroke]
-      if (info is ShortcutOwner) {
+      return when (info?.forEditor(editor.vim)) {
-        return when (info) {
-          ShortcutOwner.VIM -> true
-          ShortcutOwner.IDE -> !isShortcutConflict(keyStroke)
-          else -> {
-            if (isShortcutConflict(keyStroke)) {
-              savedShortcutConflicts[keyStroke] = ShortcutOwnerInfo.allUndefined
-            }
-            true
-          }
-        }
-      }
-      return when ((info as? ShortcutOwnerInfo)?.forEditor(editor)) {
         ShortcutOwner.VIM -> true
         ShortcutOwner.IDE -> !isShortcutConflict(keyStroke)
         else -> {
@@ -197,10 +189,10 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
   }
 
   private fun isEnabledForEscape(editor: Editor): Boolean {
-    val ideaVimSupportValue = (VimPlugin.getOptionService().getOptionValue(OptionService.Scope.LOCAL(editor), "ideavimsupport") as VimString).value
+    val ideaVimSupportValue = (VimPlugin.getOptionService().getOptionValue(OptionScope.LOCAL(IjVimEditor(editor)), IjVimOptionService.ideavimsupportName) as VimString).value
     return editor.isPrimaryEditor() ||
       EditorHelper.isFileEditor(editor) && !editor.inNormalMode ||
-      ideaVimSupportValue.contains("dialog") && !editor.inNormalMode
+      ideaVimSupportValue.contains(IjVimOptionService.ideavimsupport_dialog) && !editor.inNormalMode
   }
 
   private fun isShortcutConflict(keyStroke: KeyStroke): Boolean {
@@ -246,7 +238,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
 
     init {
       VimPlugin.getOptionService().addListener(
-        "lookupkeys",
+        OptionConstants.lookupkeysName,
         object : OptionChangeListener<VimDataType> {
           override fun processGlobalValueChange(oldValue: VimDataType?) {
             parsedLookupKeys = parseLookupKeys()
@@ -257,9 +249,9 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
 
     fun isEnabledForLookup(keyStroke: KeyStroke): Boolean = keyStroke !in parsedLookupKeys
 
-    private fun parseLookupKeys() = (VimPlugin.getOptionService().getOptionValue(OptionService.Scope.GLOBAL, "lookupkeys") as VimString).value
+    private fun parseLookupKeys() = (VimPlugin.getOptionService().getOptionValue(OptionScope.GLOBAL, OptionConstants.lookupkeysName) as VimString).value
       .split(",")
-      .map { StringHelper.parseKeys(it) }
+      .map { injector.parser.parseKeys(it) }
       .filter { it.isNotEmpty() }
       .map { it.first() }
       .toSet()

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,57 +17,108 @@
  */
 package com.maddyhome.idea.vim.action.change
 
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimCaret
+import com.maddyhome.idea.vim.api.VimEditor
 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.OperatorArguments
 import com.maddyhome.idea.vim.command.SelectionType
+import com.maddyhome.idea.vim.common.TextRange
+import com.maddyhome.idea.vim.common.argumentCaptured
 import com.maddyhome.idea.vim.group.MotionGroup
+import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.handler.VimActionHandler
+import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
 import com.maddyhome.idea.vim.helper.MessageHelper
 import com.maddyhome.idea.vim.helper.commandState
+import com.maddyhome.idea.vim.helper.enumSetOf
+import com.maddyhome.idea.vim.newapi.ij
+import java.util.*
+
+private fun doOperatorAction(editor: VimEditor, context: ExecutionContext, textRange: TextRange, selectionType: SelectionType): Boolean {
+  val operatorFunction = VimPlugin.getKey().operatorFunction
+  if (operatorFunction == null) {
+    VimPlugin.showMessage(MessageHelper.message("E774"))
+    return false
+  }
+
+  val saveRepeatHandler = VimRepeater.repeatHandler
+  VimPlugin.getMark().setChangeMarks(editor, textRange)
+  KeyHandler.getInstance().reset(editor)
+  val result = operatorFunction.apply(editor.ij, context.ij, selectionType)
+  VimRepeater.repeatHandler = saveRepeatHandler
+  return result
+}
 
-/**
- * @author vlan
- */
 class OperatorAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
 
   override val argumentType: Argument.Type = Argument.Type.MOTION
 
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
+  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val operatorFunction = VimPlugin.getKey().operatorFunction
+    val argument = cmd.argument ?: return false
-    if (operatorFunction != null) {
+    if (!editor.commandState.isDotRepeatInProgress) {
-      val argument = cmd.argument
+      argumentCaptured = argument
-      if (argument != null) {
+    }
-        if (!editor.commandState.isDotRepeatInProgress) {
+    val range = getMotionRange(editor, context, argument, operatorArguments)
-          VimRepeater.Extension.argumentCaptured = argument
+
-        }
+    if (range != null) {
-        val saveRepeatHandler = VimRepeater.repeatHandler
+      val selectionType = if (argument.motion.isLinewiseMotion()) {
-        val motion = argument.motion
+        SelectionType.LINE_WISE
-        val range = MotionGroup
+      } else {
-          .getMotionRange(
+        SelectionType.CHARACTER_WISE
-            editor,
+      }
-            editor.caretModel.primaryCaret,
+      return doOperatorAction(editor, context, range, selectionType)
-            context,
-            argument,
-            operatorArguments
-          )
-        if (range != null) {
-          VimPlugin.getMark().setChangeMarks(editor, range)
-          val selectionType = if (motion.isLinewiseMotion()) SelectionType.LINE_WISE else SelectionType.CHARACTER_WISE
-          KeyHandler.getInstance().reset(editor)
-          val result = operatorFunction.apply(editor, context, selectionType)
-          VimRepeater.repeatHandler = saveRepeatHandler
-          return result
-        }
-      }
-      return false
     }
-    VimPlugin.showMessage(MessageHelper.message("E774"))
     return false
   }
+
+  private fun getMotionRange(
+    editor: VimEditor,
+    context: ExecutionContext,
+    argument: Argument,
+    operatorArguments: OperatorArguments
+  ): TextRange? {
+
+    // Note that we're using getMotionRange2 in order to avoid normalising the linewise range into line start
+    // offsets that will be used to set the change marks. This affects things like the location of the caret in the
+    // Commentary extension
+    val ijEditor = editor.ij
+    return MotionGroup.getMotionRange2(
+      ijEditor,
+      ijEditor.caretModel.primaryCaret,
+      context.ij,
+      argument,
+      operatorArguments
+    )?.normalize()?.let {
+
+      // If we're linewise, make sure the end offset isn't just the EOL char
+      if (argument.motion.isLinewiseMotion() && it.endOffset < editor.fileSize()) {
+        TextRange(it.startOffset, it.endOffset + 1)
+      } else {
+        it
+      }
+    }
+  }
+}
+
+class VisualOperatorAction : VisualOperatorActionHandler.ForEachCaret() {
+  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
+
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_EXIT_VISUAL)
+
+  override fun executeAction(
+    editor: VimEditor,
+    caret: VimCaret,
+    context: ExecutionContext,
+    cmd: Command,
+    range: VimSelection,
+    operatorArguments: OperatorArguments,
+  ): Boolean {
+    return doOperatorAction(editor, context, range.toVimTextRange(), range.type)
+  }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,44 +17,49 @@
  */
 package com.maddyhome.idea.vim.action.change
 
-import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.command.CommandProcessor
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimEditor
+import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.extension.VimExtensionHandler
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.commandState
-import javax.swing.KeyStroke
+import com.maddyhome.idea.vim.newapi.ij
 
 class RepeatChangeAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_WRITABLE
 
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
+  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     val state = editor.commandState
     val lastCommand = VimRepeater.lastChangeCommand
 
-    if (lastCommand == null && VimRepeater.Extension.lastExtensionHandler == null) return false
+    if (lastCommand == null && Extension.lastExtensionHandler == null) return false
 
     // Save state
     val save = state.executingCommand
-    val lastFTCmd = VimPlugin.getMotion().lastFTCmd
+    val lastFTCmd = injector.motion.lastFTCmd
-    val lastFTChar = VimPlugin.getMotion().lastFTChar
+    val lastFTChar = injector.motion.lastFTChar
-    val reg = VimPlugin.getRegister().currentRegister
+    val reg = injector.registerGroup.currentRegister
-    val lastHandler = VimRepeater.Extension.lastExtensionHandler
+    val lastHandler = Extension.lastExtensionHandler
     val repeatHandler = VimRepeater.repeatHandler
 
     state.isDotRepeatInProgress = true
-    VimPlugin.getRegister().selectRegister(VimRepeater.lastChangeRegister)
+
+    // A fancy 'redo-register' feature
+    // VIM-2643, :h redo-register
+    if (VimRepeater.lastChangeRegister in '1'..'8') {
+      VimRepeater.lastChangeRegister = VimRepeater.lastChangeRegister.inc()
+    }
+
+    injector.registerGroup.selectRegister(VimRepeater.lastChangeRegister)
 
     try {
       if (repeatHandler && lastHandler != null) {
         val processor = CommandProcessor.getInstance()
         processor.executeCommand(
-          editor.project,
+          editor.ij.project,
           { lastHandler.execute(editor, context) },
           "Vim " + lastHandler.javaClass.simpleName,
           null
@@ -71,7 +76,7 @@ class RepeatChangeAction : VimActionHandler.SingleExecution() {
         state.setExecutingCommand(lastCommand)
 
         val arguments = operatorArguments.copy(count0 = lastCommand.rawCount)
-        KeyHandler.executeVimAction(editor, lastCommand.action, context, arguments)
+        injector.actionExecutor.executeVimAction(editor, lastCommand.action, context, arguments)
 
         VimRepeater.saveLastChange(lastCommand)
       }
@@ -83,66 +88,10 @@ class RepeatChangeAction : VimActionHandler.SingleExecution() {
     // Restore state
     if (save != null) state.setExecutingCommand(save)
     VimPlugin.getMotion().setLastFTCmd(lastFTCmd, lastFTChar)
-    if (lastHandler != null) VimRepeater.Extension.lastExtensionHandler = lastHandler
+    if (lastHandler != null) Extension.lastExtensionHandler = lastHandler
     VimRepeater.repeatHandler = repeatHandler
-    VimRepeater.Extension.reset()
+    Extension.reset()
     VimPlugin.getRegister().selectRegister(reg)
     return true
   }
 }
-
-object VimRepeater {
-  var repeatHandler = false
-
-  var lastChangeCommand: Command? = null
-    private set
-  var lastChangeRegister = VimPlugin.getRegister().defaultRegister
-    private set
-
-  fun saveLastChange(command: Command) {
-    lastChangeCommand = command
-    lastChangeRegister = VimPlugin.getRegister().currentRegister
-  }
-
-  object Extension {
-    var lastExtensionHandler: VimExtensionHandler? = null
-    var argumentCaptured: Argument? = null
-
-    private val keyStrokes = mutableListOf<KeyStroke>()
-    private val strings = mutableListOf<String>()
-
-    private var keystrokePointer = 0
-    private var stringPointer = 0
-
-    fun addKeystroke(key: KeyStroke) = keyStrokes.add(key)
-    fun addString(key: String) = strings.add(key)
-
-    fun consumeKeystroke(): KeyStroke? {
-      if (keystrokePointer in keyStrokes.indices) {
-        keystrokePointer += 1
-        return keyStrokes[keystrokePointer - 1]
-      }
-      return null
-    }
-
-    fun consumeString(): String? {
-      if (stringPointer in strings.indices) {
-        stringPointer += 1
-        return strings[stringPointer - 1]
-      }
-      return null
-    }
-
-    fun reset() {
-      keystrokePointer = 0
-      stringPointer = 0
-    }
-
-    fun clean() {
-      keyStrokes.clear()
-      strings.clear()
-      keystrokePointer = 0
-      stringPointer = 0
-    }
-  }
-}

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

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.change
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class ChangeCharacterAction : ChangeEditorActionHandler.ForEachCaret() {
-  override val type: Command.Type = Command.Type.CHANGE
-
-  override val argumentType: Argument.Type = Argument.Type.DIGRAPH
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_ALLOW_DIGRAPH)
-
-  override fun execute(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    return argument != null && VimPlugin.getChange().changeCharacter(editor, caret, operatorArguments.count1, argument.character)
-  }
-}

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,38 +17,38 @@
  */
 package com.maddyhome.idea.vim.action.change.delete
 
-import com.intellij.openapi.actionSystem.DataContext
+import com.maddyhome.idea.vim.api.ExecutionContext
-import com.intellij.openapi.editor.Caret
+import com.maddyhome.idea.vim.api.VimCaret
-import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.api.VimEditor
-import com.intellij.openapi.util.Ref
+import com.maddyhome.idea.vim.api.injector
-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.OperatorArguments
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-import com.maddyhome.idea.vim.vimscript.services.OptionService
+import com.maddyhome.idea.vim.options.OptionScope
+import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 
 class DeleteJoinLinesAction : ChangeEditorActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.DELETE
 
   override fun execute(
-    editor: Editor,
+    editor: VimEditor,
-    context: DataContext,
+    context: ExecutionContext,
     argument: Argument?,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    if (editor.isOneLineMode) return false
+    if (editor.isOneLineMode()) return false
-    if (VimPlugin.getOptionService().isSet(OptionService.Scope.LOCAL(editor), "ideajoin")) {
+    if (injector.optionService.isSet(OptionScope.LOCAL(editor), IjVimOptionService.ideajoinName)) {
-      return VimPlugin.getChange().joinViaIdeaByCount(editor, context, operatorArguments.count1)
+      return injector.changeGroup.joinViaIdeaByCount(editor, context, operatorArguments.count1)
     }
-    VimPlugin.getEditor().notifyIdeaJoin(editor.project)
+    injector.editorGroup.notifyIdeaJoin(editor)
-    val res = Ref.create(true)
+    val res = arrayOf(true)
-    editor.caretModel.runForEachCaret(
+    editor.forEachNativeCaret(
-      { caret: Caret ->
+      { caret: VimCaret ->
-        if (!VimPlugin.getChange().deleteJoinLines(editor, caret, operatorArguments.count1, false)) res.set(false)
+        if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, false)) res[0] = false
       },
       true
     )
-    return res.get()
+    return res[0]
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,38 +17,38 @@
  */
 package com.maddyhome.idea.vim.action.change.delete
 
-import com.intellij.openapi.actionSystem.DataContext
+import com.maddyhome.idea.vim.api.ExecutionContext
-import com.intellij.openapi.editor.Caret
+import com.maddyhome.idea.vim.api.VimCaret
-import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.api.VimEditor
-import com.intellij.openapi.util.Ref
+import com.maddyhome.idea.vim.api.injector
-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.OperatorArguments
 import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-import com.maddyhome.idea.vim.vimscript.services.OptionService
+import com.maddyhome.idea.vim.options.OptionScope
+import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 
 class DeleteJoinLinesSpacesAction : ChangeEditorActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.DELETE
 
   override fun execute(
-    editor: Editor,
+    editor: VimEditor,
-    context: DataContext,
+    context: ExecutionContext,
     argument: Argument?,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    if (editor.isOneLineMode) return false
+    if (editor.isOneLineMode()) return false
-    if (VimPlugin.getOptionService().isSet(OptionService.Scope.LOCAL(editor), "ideajoin")) {
+    if (injector.optionService.isSet(OptionScope.LOCAL(editor), IjVimOptionService.ideajoinName)) {
-      return VimPlugin.getChange().joinViaIdeaByCount(editor, context, operatorArguments.count1)
+      return injector.changeGroup.joinViaIdeaByCount(editor, context, operatorArguments.count1)
     }
-    VimPlugin.getEditor().notifyIdeaJoin(editor.project)
+    injector.editorGroup.notifyIdeaJoin(editor)
-    val res = Ref.create(true)
+    val res = arrayOf(true)
-    editor.caretModel.runForEachCaret(
+    editor.forEachNativeCaret(
-      { caret: Caret ->
+      { caret: VimCaret ->
-        if (!VimPlugin.getChange().deleteJoinLines(editor, caret, operatorArguments.count1, true)) res.set(false)
+        if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, true)) res[0] = false
       },
       true
     )
-    return res.get()
+    return res[0]
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,18 +17,18 @@
  */
 package com.maddyhome.idea.vim.action.change.delete
 
-import com.intellij.openapi.actionSystem.DataContext
+import com.maddyhome.idea.vim.api.ExecutionContext
-import com.intellij.openapi.editor.Caret
+import com.maddyhome.idea.vim.api.VimCaret
-import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.api.VimEditor
-import com.intellij.openapi.util.Ref
+import com.maddyhome.idea.vim.api.injector
-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.OperatorArguments
 import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
-import com.maddyhome.idea.vim.vimscript.services.OptionService
+import com.maddyhome.idea.vim.options.OptionScope
+import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 import java.util.*
 
 /**
@@ -40,28 +40,28 @@ class DeleteJoinVisualLinesAction : VisualOperatorActionHandler.SingleExecution(
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_EXIT_VISUAL)
 
   override fun executeForAllCarets(
-    editor: Editor,
+    editor: VimEditor,
-    context: DataContext,
+    context: ExecutionContext,
     cmd: Command,
-    caretsAndSelections: Map<Caret, VimSelection>,
+    caretsAndSelections: Map<VimCaret, VimSelection>,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    if (editor.isOneLineMode) return false
+    if (editor.isOneLineMode()) return false
-    if (VimPlugin.getOptionService().isSet(OptionService.Scope.LOCAL(editor), "ideajoin")) {
+    if (injector.optionService.isSet(OptionScope.LOCAL(editor), IjVimOptionService.ideajoinName)) {
-      VimPlugin.getChange().joinViaIdeaBySelections(editor, context, caretsAndSelections)
+      injector.changeGroup.joinViaIdeaBySelections(editor, context, caretsAndSelections)
       return true
     }
-    val res = Ref.create(true)
+    val res = arrayOf(true)
-    editor.caretModel.runForEachCaret(
+    editor.forEachNativeCaret(
-      { caret: Caret ->
+      {
-        if (!caret.isValid) return@runForEachCaret
+        caret: VimCaret ->
-        val range = caretsAndSelections[caret] ?: return@runForEachCaret
+        if (!caret.isValid) return@forEachNativeCaret
-        if (!VimPlugin.getChange().deleteJoinRange(editor, caret, range.toVimTextRange(true).normalize(), false)) {
+        val range = caretsAndSelections[caret] ?: return@forEachNativeCaret
-          res.set(false)
+        if (!injector.changeGroup.deleteJoinRange(editor, caret, range.toVimTextRange(true).normalize(), false)) {
+          res[0] = false
         }
-      },
+      }, true
-      true
     )
-    return res.get()
+    return res[0]
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,18 +17,18 @@
  */
 package com.maddyhome.idea.vim.action.change.delete
 
-import com.intellij.openapi.actionSystem.DataContext
+import com.maddyhome.idea.vim.api.ExecutionContext
-import com.intellij.openapi.editor.Caret
+import com.maddyhome.idea.vim.api.VimCaret
-import com.intellij.openapi.editor.Editor
+import com.maddyhome.idea.vim.api.VimEditor
-import com.intellij.openapi.util.Ref
+import com.maddyhome.idea.vim.api.injector
-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.OperatorArguments
 import com.maddyhome.idea.vim.group.visual.VimSelection
 import com.maddyhome.idea.vim.handler.VisualOperatorActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
-import com.maddyhome.idea.vim.vimscript.services.OptionService
+import com.maddyhome.idea.vim.options.OptionScope
+import com.maddyhome.idea.vim.vimscript.services.IjVimOptionService
 import java.util.*
 
 /**
@@ -40,28 +40,28 @@ class DeleteJoinVisualLinesSpacesAction : VisualOperatorActionHandler.SingleExec
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_EXIT_VISUAL)
 
   override fun executeForAllCarets(
-    editor: Editor,
+    editor: VimEditor,
-    context: DataContext,
+    context: ExecutionContext,
     cmd: Command,
-    caretsAndSelections: Map<Caret, VimSelection>,
+    caretsAndSelections: Map<VimCaret, VimSelection>,
     operatorArguments: OperatorArguments,
   ): Boolean {
-    if (editor.isOneLineMode) return false
+    if (editor.isOneLineMode()) return false
-    if (VimPlugin.getOptionService().isSet(OptionService.Scope.LOCAL(editor), "ideajoin")) {
+    if (injector.optionService.isSet(OptionScope.LOCAL(editor), IjVimOptionService.ideajoinName)) {
-      VimPlugin.getChange().joinViaIdeaBySelections(editor, context, caretsAndSelections)
+      injector.changeGroup.joinViaIdeaBySelections(editor, context, caretsAndSelections)
       return true
     }
-    val res = Ref.create(true)
+    val res = arrayOf(true)
-    editor.caretModel.runForEachCaret(
+    editor.forEachNativeCaret(
-      { caret: Caret ->
+      { caret: VimCaret ->
-        if (!caret.isValid) return@runForEachCaret
+        if (!caret.isValid) return@forEachNativeCaret
-        val range = caretsAndSelections[caret] ?: return@runForEachCaret
+        val range = caretsAndSelections[caret] ?: return@forEachNativeCaret
-        if (!VimPlugin.getChange().deleteJoinRange(editor, caret, range.toVimTextRange(true).normalize(), true)) {
+        if (!injector.changeGroup.deleteJoinRange(editor, caret, range.toVimTextRange(true).normalize(), true)) {
-          res.set(false)
+          res[0] = false
         }
       },
       true
     )
-    return res.get()
+    return res[0]
   }
 }

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

@@ -1,43 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-
-class InsertCharacterAboveCursorAction : ChangeEditorActionHandler.ForEachCaret() {
-  override val type: Command.Type = Command.Type.INSERT
-
-  override fun execute(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    return if (editor.isOneLineMode) {
-      false
-    } else VimPlugin.getChange().insertCharacterAroundCursor(editor, caret, -1)
-  }
-}

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

@@ -1,43 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-
-class InsertCharacterBelowCursorAction : ChangeEditorActionHandler.ForEachCaret() {
-  override val type: Command.Type = Command.Type.INSERT
-
-  override fun execute(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    return if (editor.isOneLineMode) {
-      false
-    } else VimPlugin.getChange().insertCharacterAroundCursor(editor, caret, 1)
-  }
-}

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

@@ -1,46 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class InsertDeletePreviousWordAction : ChangeEditorActionHandler.ForEachCaret() {
-  override val type: Command.Type = Command.Type.INSERT
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_CLEAR_STROKES)
-
-  override fun execute(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    return VimPlugin.getChange().insertDeletePreviousWord(editor, caret)
-  }
-}

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

@@ -1,46 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class InsertNewLineAboveAction : ChangeEditorActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.INSERT
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_MULTIKEY_UNDO)
-
-  override fun execute(
-    editor: Editor,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    if (editor.isOneLineMode) return false
-    VimPlugin.getChange().insertNewLineAbove(editor, context)
-    return true
-  }
-}

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

@@ -1,46 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class InsertNewLineBelowAction : ChangeEditorActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.INSERT
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_MULTIKEY_UNDO)
-
-  override fun execute(
-    editor: Editor,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    if (editor.isOneLineMode) return false
-    VimPlugin.getChange().insertNewLineBelow(editor, context)
-    return true
-  }
-}

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

@@ -1,40 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
-
-class InsertPreviousInsertAction : ChangeEditorActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.INSERT
-
-  override fun execute(
-    editor: Editor,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    VimPlugin.getChange().insertPreviousInsert(editor, context, false, operatorArguments)
-    return true
-  }
-}

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

@@ -1,70 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change.insert
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.components.ServiceManager
-import com.intellij.openapi.editor.Editor
-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.OperatorArguments
-import com.maddyhome.idea.vim.ex.ExException
-import com.maddyhome.idea.vim.handler.VimActionHandler
-import com.maddyhome.idea.vim.helper.CommandLineHelper
-import com.maddyhome.idea.vim.vimscript.model.Script
-import com.maddyhome.idea.vim.vimscript.parser.VimscriptParser
-
-class InsertRegisterAction : VimActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.INSERT
-
-  override val argumentType: Argument.Type = Argument.Type.CHARACTER
-
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val argument = cmd.argument
-
-    if (argument?.character == '=') {
-      ApplicationManager.getApplication().invokeLater {
-        try {
-          val expression = readExpression(editor)
-          if (expression != null) {
-            if (expression.isNotEmpty()) {
-              val expressionValue = VimscriptParser.parseExpression(expression)?.evaluate(editor, context, Script(listOf()))
-                ?: throw ExException("E15: Invalid expression: $expression")
-              val textToStore = expressionValue.toInsertableString()
-              VimPlugin.getRegister().storeTextSpecial('=', textToStore)
-            }
-            VimPlugin.getChange().insertRegister(editor, context, argument.character)
-          }
-        } catch (e: ExException) {
-          VimPlugin.indicateError()
-          VimPlugin.showMessage(e.message)
-        }
-      }
-      return true
-    } else {
-      return argument != null && VimPlugin.getChange().insertRegister(editor, context, argument.character)
-    }
-  }
-
-  @SuppressWarnings("deprecation") // [VERSION UPDATE] 212+ getService
-  private fun readExpression(editor: Editor): String? {
-    return ServiceManager.getService(CommandLineHelper::class.java).inputString(editor, "=", null)
-  }
-}

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 
 package com.maddyhome.idea.vim.action.editor
 
-import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.openapi.actionSystem.IdeActions
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.KeyHandler
 import com.maddyhome.idea.vim.action.ComplicatedKeysAction
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimEditor
+import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.OperatorArguments
@@ -79,8 +79,8 @@ class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_UP), Co
 class VimQuickJavaDoc : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
+  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    KeyHandler.executeAction(IdeActions.ACTION_QUICK_JAVADOC, context)
+    injector.actionExecutor.executeAction(IdeActions.ACTION_QUICK_JAVADOC, context)
     return true
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
  */
 package com.maddyhome.idea.vim.action.ex
 
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.action.ComplicatedKeysAction
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.command.Command
 import com.maddyhome.idea.vim.command.CommandFlags
 import com.maddyhome.idea.vim.command.OperatorArguments
@@ -41,7 +41,7 @@ class ProcessExEntryAction : VimActionHandler.SingleExecution(), ComplicatedKeys
 
   override val flags: EnumSet<CommandFlags> = EnumSet.of(CommandFlags.FLAG_COMPLETE_EX)
 
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
+  override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
     return VimPlugin.getProcess().processExEntry(editor, context)
   }
 }

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

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

@@ -1,6 +1,6 @@
 /*
  * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
+ * Copyright (C) 2003-2022 The IdeaVim authors
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

src/main/java/com/maddyhome/idea/vim/action/motion/gn/VisualSelectNextSearch.kt

@@ -1,46 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.gn
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.noneOfEnum
-import java.util.*
-
-class VisualSelectNextSearch : MotionActionHandler.SingleExecution() {
-  override val flags: EnumSet<CommandFlags> = noneOfEnum()
-
-  override fun getOffset(
-    editor: Editor,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().selectNextSearch(editor, operatorArguments.count1, true).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/leftright/MotionLastMatchCharAction.kt

@@ -1,43 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.leftright
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-
-class MotionLastMatchCharAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    val repeatLastMatchChar = VimPlugin.getMotion().repeatLastMatchChar(editor, caret, operatorArguments.count1)
-    return if (repeatLastMatchChar < 0) Motion.Error else Motion.AbsoluteOffset(repeatLastMatchChar)
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/leftright/MotionRightWrapAction.kt

@@ -1,43 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.leftright
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-
-class MotionRightWrapAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretHorizontalWrap(editor, caret, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBigWordAction.kt

@@ -1,44 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-
-class MotionInnerBigWordAction : TextObjectActionHandler() {
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange {
-    return VimPlugin.getMotion().getWordRange(editor, caret, count, false, true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBlockAngleAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionInnerBlockAngleAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, false, '<')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBlockBackQuoteAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionInnerBlockBackQuoteAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockQuoteRange(editor, caret, '`', false)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBlockBraceAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionInnerBlockBraceAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, false, '{')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBlockBracketAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionInnerBlockBracketAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, false, '[')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBlockDoubleQuoteAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionInnerBlockDoubleQuoteAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockQuoteRange(editor, caret, '"', false)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBlockParenAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionInnerBlockParenAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, false, '(')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerBlockSingleQuoteAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionInnerBlockSingleQuoteAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockQuoteRange(editor, caret, '\'', false)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionInnerWordAction.kt

@@ -1,44 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-
-class MotionInnerWordAction : TextObjectActionHandler() {
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange {
-    return VimPlugin.getMotion().getWordRange(editor, caret, count, false, false)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBigWordAction.kt

@@ -1,44 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-
-class MotionOuterBigWordAction : TextObjectActionHandler() {
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange {
-    return VimPlugin.getMotion().getWordRange(editor, caret, count, true, true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockAngleAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockAngleAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, true, '<')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockBackQuoteAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockBackQuoteAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockQuoteRange(editor, caret, '`', true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockBraceAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockBraceAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, true, '{')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockBracketAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockBracketAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, true, '[')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockDoubleQuoteAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockDoubleQuoteAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockQuoteRange(editor, caret, '"', true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockParenAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockParenAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockRange(editor, caret, count, true, '(')
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockSingleQuoteAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockSingleQuoteAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockQuoteRange(editor, caret, '\'', true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterBlockTagAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterBlockTagAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getBlockTagRange(editor, caret, count, true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterParagraphAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterParagraphAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.LINE_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange? {
-    return VimPlugin.getMotion().getParagraphRange(editor, caret, count, true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterSentenceAction.kt

@@ -1,49 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionOuterSentenceAction : TextObjectActionHandler() {
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_TEXT_BLOCK)
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange {
-    return VimPlugin.getMotion().getSentenceRange(editor, caret, count, true)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/object/MotionOuterWordAction.kt

@@ -1,44 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.maddyhome.idea.vim.action.motion.`object`
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.TextObjectVisualType
-import com.maddyhome.idea.vim.common.TextRange
-import com.maddyhome.idea.vim.handler.TextObjectActionHandler
-
-class MotionOuterWordAction : TextObjectActionHandler() {
-
-  override val visualType: TextObjectVisualType = TextObjectVisualType.CHARACTER_WISE
-
-  override fun getRange(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    count: Int,
-    rawCount: Int,
-    argument: Argument?,
-  ): TextRange {
-    return VimPlugin.getMotion().getWordRange(editor, caret, count, true, false)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollLineUpAction.kt

@@ -1,38 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.scroll
-
-import com.intellij.openapi.actionSystem.DataContext
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.VimActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionScrollLineUpAction : VimActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.OTHER_READONLY
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP)
-
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    return VimPlugin.getMotion().scrollLine(editor, -cmd.count)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/scroll/MotionScrollMiddleScreenLineAction.kt

@@ -1,38 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.scroll
-
-import com.intellij.openapi.actionSystem.DataContext
-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.OperatorArguments
-import com.maddyhome.idea.vim.handler.VimActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionScrollMiddleScreenLineAction : VimActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.OTHER_READONLY
-
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_IGNORE_SCROLL_JUMP)
-
-  override fun execute(editor: Editor, context: DataContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    return VimPlugin.getMotion().scrollLineToMiddleScreenLine(editor, cmd.rawCount, false)
-  }
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionBigWordEndLeftAction.kt

@@ -1,42 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-
-class MotionBigWordEndLeftAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextWordEnd(editor, caret, -operatorArguments.count1, true)
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionBigWordEndRightAction.kt

@@ -1,42 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-
-class MotionBigWordEndRightAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextWordEnd(editor, caret, operatorArguments.count1, true)
-  }
-
-  override val motionType: MotionType = MotionType.INCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionCamelEndRightAction.kt

@@ -1,43 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-
-class MotionCamelEndRightAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextCamelEnd(editor, caret, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.INCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionCamelLeftAction.kt

@@ -1,43 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-
-class MotionCamelLeftAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextCamel(editor, caret, -operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionCamelRightAction.kt

@@ -1,43 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-
-class MotionCamelRightAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextCamel(editor, caret, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionMethodNextEndAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionMethodNextEndAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    val moveCaretToMethodEnd = VimPlugin.getMotion().moveCaretToMethodEnd(editor, caret, operatorArguments.count1)
-    return if (moveCaretToMethodEnd < 0) Motion.Error else Motion.AbsoluteOffset(moveCaretToMethodEnd)
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionMethodNextStartAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionMethodNextStartAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    val moveCaretToMethodStart = VimPlugin.getMotion().moveCaretToMethodStart(editor, caret, operatorArguments.count1)
-    return if (moveCaretToMethodStart < 0) Motion.Error else Motion.AbsoluteOffset(moveCaretToMethodStart)
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionSectionBackwardEndAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionSectionBackwardEndAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToSection(editor, caret, '}', -1, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionSectionBackwardStartAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionSectionBackwardStartAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToSection(editor, caret, '{', -1, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionSectionForwardEndAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionSectionForwardEndAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToSection(editor, caret, '}', 1, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionSectionForwardStartAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionSectionForwardStartAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToSection(editor, caret, '{', 1, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionSentenceNextStartAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionSentenceNextStartAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextSentenceStart(editor, caret, operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionSentencePreviousEndAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionSentencePreviousEndAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextSentenceEnd(editor, caret, -operatorArguments.count1).toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionUnmatchedBraceCloseAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionUnmatchedBraceCloseAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToUnmatchedBlock(editor, caret, operatorArguments.count1, '}').toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionUnmatchedBraceOpenAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionUnmatchedBraceOpenAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToUnmatchedBlock(editor, caret, operatorArguments.count1, '{').toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionUnmatchedParenCloseAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionUnmatchedParenCloseAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToUnmatchedBlock(editor, caret, operatorArguments.count1, ')').toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionUnmatchedParenOpenAction.kt

@@ -1,48 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.CommandFlags
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-import com.maddyhome.idea.vim.handler.toMotionOrError
-import com.maddyhome.idea.vim.helper.enumSetOf
-import java.util.*
-
-class MotionUnmatchedParenOpenAction : MotionActionHandler.ForEachCaret() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_JUMP)
-
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToUnmatchedBlock(editor, caret, operatorArguments.count1, '(').toMotionOrError()
-  }
-
-  override val motionType: MotionType = MotionType.EXCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionWordEndLeftAction.kt

@@ -1,42 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-
-class MotionWordEndLeftAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextWordEnd(editor, caret, -operatorArguments.count1, false)
-  }
-
-  override val motionType: MotionType = MotionType.INCLUSIVE
-}

src/main/java/com/maddyhome/idea/vim/action/motion/text/MotionWordEndRightAction.kt

@@ -1,42 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2021 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.motion.text
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Caret
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.MotionType
-import com.maddyhome.idea.vim.command.OperatorArguments
-import com.maddyhome.idea.vim.handler.Motion
-import com.maddyhome.idea.vim.handler.MotionActionHandler
-
-class MotionWordEndRightAction : MotionActionHandler.ForEachCaret() {
-  override fun getOffset(
-    editor: Editor,
-    caret: Caret,
-    context: DataContext,
-    argument: Argument?,
-    operatorArguments: OperatorArguments,
-  ): Motion {
-    return VimPlugin.getMotion().moveCaretToNextWordEnd(editor, caret, operatorArguments.count1, false)
-  }
-
-  override val motionType: MotionType = MotionType.INCLUSIVE
-}