Set plugin version to chylex-26

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

.github/workflows/closeYoutrackOnCommit.yml

@@ -20,10 +20,10 @@ jobs:
           fetch-depth: 300
       - name: Get tags
         run: git fetch --tags origin
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
@@ -34,7 +34,7 @@ jobs:
           echo "LAST_COMMIT=$(git rev-list -n 1 tags/workflow-close-youtrack)" >> $GITHUB_ENV
 
       - name: Update YouTrack
-        run: ./gradlew --no-configuration-cache updateYoutrackOnCommit
+        run: ./gradlew updateYoutrackOnCommit
         env:
           SUCCESS_COMMIT: ${{ env.LAST_COMMIT }}
           YOUTRACK_TOKEN: ${{ secrets.YOUTRACK_TOKEN }}

.github/workflows/integrationsTest.yml

@@ -18,16 +18,16 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 300
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
       - name: Run tests
-        run: ./gradlew --no-configuration-cache integrationsTest
+        run: ./gradlew integrationsTest
         env:
           YOUTRACK_TOKEN: ${{ secrets.YOUTRACK_TOKEN }}
           GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/kover.yml

@@ -18,10 +18,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 300
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/mergePr.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   build:
 
-    if: false
+    if: github.event.pull_request.merged == true && github.repository == 'JetBrains/ideavim'
     runs-on: ubuntu-latest
 
     steps:
@@ -20,17 +20,17 @@ jobs:
           fetch-depth: 50
           # See end of file updateChangeslog.yml for explanation of this secret
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
 
       - name: Update authors
         id: update_authors
-        run: ./gradlew --no-configuration-cache updateMergedPr -PprId=${{ github.event.number }}
+        run: ./gradlew updateMergedPr -PprId=${{ github.event.number }}
         env:
           GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/runUiOctopusTests.yml

@@ -1,81 +0,0 @@
-name: Run Non Octopus UI Tests
-on:
-  workflow_dispatch:
-  schedule:
-      - cron: '0 12 * * *'
-jobs:
-  build-for-ui-test-mac-os:
-    if: github.repository == 'JetBrains/ideavim'
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-      - name: Setup FFmpeg
-        run: brew install ffmpeg
-#      - name: Setup Gradle
-#        uses: gradle/gradle-build-action@v2.4.2
-      - name: Build Plugin
-        run: gradle :buildPlugin
-      - name: Run Idea
-        run: |
-          mkdir -p build/reports
-          gradle --no-configuration-cache runIdeForUiTests -Doctopus.handler=false > build/reports/idea.log &
-      - name: Wait for Idea started
-        uses: jtalk/url-health-check-action@v3
-        with:
-          url: http://127.0.0.1:8082
-          max-attempts: 20
-          retry-delay: 10s
-      - name: Tests
-        run: gradle :tests:ui-ij-tests:testUi
-      - name: Move video
-        if: always()
-        run: mv tests/ui-ij-tests/video build/reports
-      - name: Move sandbox logs
-        if: always()
-        run: mv build/idea-sandbox/IC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
-      - name: Save report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-test-fails-report-mac
-          path: |
-            build/reports
-            tests/ui-ij-tests/build/reports
-            idea-sandbox-log
-#  build-for-ui-test-linux:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - uses: actions/checkout@v2
-#      - name: Setup Java
-#        uses: actions/setup-java@v2.1.0
-#        with:
-#          distribution: zulu
-#          java-version: 11
-#      - name: Build Plugin
-#        run: gradle :buildPlugin
-#      - name: Run Idea
-#        run: |
-#          export DISPLAY=:99.0
-#          Xvfb -ac :99 -screen 0 1920x1080x16 &
-#          mkdir -p build/reports
-#          gradle :runIdeForUiTests #> build/reports/idea.log
-#      - name: Wait for Idea started
-#        uses: jtalk/url-health-check-action@1.5
-#        with:
-#          url: http://127.0.0.1:8082
-#          max-attempts: 15
-#          retry-delay: 30s
-#      - name: Tests
-#        run: gradle :testUi
-#      - name: Save fails report
-#        if: ${{ failure() }}
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: ui-test-fails-report-linux
-#          path: |
-#            ui-test-example/build/reports

.github/workflows/runUiPyTests.yml

@@ -1,52 +0,0 @@
-name: Run UI PyCharm Tests
-on:
-  workflow_dispatch:
-  schedule:
-      - cron: '0 12 * * *'
-jobs:
-  build-for-ui-test-mac-os:
-    if: github.repository == 'JetBrains/ideavim'
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.10'
-      - name: Setup FFmpeg
-        run: brew install ffmpeg
-#      - name: Setup Gradle
-#        uses: gradle/gradle-build-action@v2.4.2
-      - name: Build Plugin
-        run: gradle :buildPlugin
-      - name: Run Idea
-        run: |
-          mkdir -p build/reports
-          gradle --no-configuration-cache :runIdeForUiTests -PideaType=PC > build/reports/idea.log &
-      - name: Wait for Idea started
-        uses: jtalk/url-health-check-action@v3
-        with:
-          url: http://127.0.0.1:8082
-          max-attempts: 20
-          retry-delay: 10s
-      - name: Tests
-        run: gradle :tests:ui-py-tests:testUi
-      - name: Move video
-        if: always()
-        run: mv tests/ui-py-tests/video build/reports
-      - name: Move sandbox logs
-        if: always()
-        run: mv build/idea-sandbox/PC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
-      - name: Save report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: ui-test-fails-report-mac
-          path: |
-            build/reports
-            tests/ui-py-tests/build/reports
-            idea-sandbox-log

.github/workflows/runUiTests.yml

@@ -13,17 +13,21 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: zulu
-          java-version: 17
+          java-version: 11
       - name: Setup FFmpeg
-        run: brew install ffmpeg
+        uses: FedericoCarboni/setup-ffmpeg@v3
-#      - name: Setup Gradle
+        with:
-#        uses: gradle/gradle-build-action@v2.4.2
+          # Not strictly necessary, but it may prevent rate limit
+          # errors especially on GitHub-hosted macos machines.
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2.4.2
       - name: Build Plugin
         run: gradle :buildPlugin
       - name: Run Idea
         run: |
           mkdir -p build/reports
-          gradle --no-configuration-cache runIdeForUiTests > build/reports/idea.log &
+          gradle :runIdeForUiTests > build/reports/idea.log &
       - name: Wait for Idea started
         uses: jtalk/url-health-check-action@v3
         with:
@@ -31,13 +35,13 @@ jobs:
           max-attempts: 20
           retry-delay: 10s
       - name: Tests
-        run: gradle :tests:ui-ij-tests:testUi
+        run: gradle :testUi
       - name: Move video
         if: always()
-        run: mv tests/ui-ij-tests/video build/reports
+        run: mv video build/reports
       - name: Move sandbox logs
         if: always()
-        run: mv build/idea-sandbox/IC-2024.1.2/log_runIdeForUiTests idea-sandbox-log
+        run: mv build/idea-sandbox/system/log sandbox-idea-log
       - name: Save report
         if: always()
         uses: actions/upload-artifact@v4
@@ -45,8 +49,7 @@ jobs:
           name: ui-test-fails-report-mac
           path: |
             build/reports
-            tests/ui-ij-tests/build/reports
+            sandbox-idea-log
-            idea-sandbox-log
 #  build-for-ui-test-linux:
 #    runs-on: ubuntu-latest
 #    steps:
@@ -78,4 +81,4 @@ jobs:
 #        with:
 #          name: ui-test-fails-report-linux
 #          path: |
-#            ui-test-example/build/reports
+#            ui-test-example/build/reports

.github/workflows/updateAffectedRate.yml

@@ -0,0 +1,34 @@
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+# This workflow syncs changes from the docs folder of IdeaVim to the IdeaVim.wiki repository
+
+name: Update Affected Rate field on YouTrack
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 8 * * *'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    if: github.repository == 'JetBrains/ideavim'
+
+    steps:
+      - name: Fetch origin repo
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v2
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - name: Update YouTrack
+        run: ./gradlew scripts:updateAffectedRates
+        env:
+          YOUTRACK_TOKEN: ${{ secrets.YOUTRACK_TOKEN }}

.github/workflows/updateAuthors.yml

@@ -25,10 +25,10 @@ jobs:
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
       - name: Get tags
         run: git fetch --tags origin
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
@@ -40,7 +40,7 @@ jobs:
 
       - name: Update authors
         id: update_authors
-        run: ./gradlew --no-configuration-cache updateAuthors --stacktrace
+        run: ./gradlew updateAuthors --stacktrace
         env:
           SUCCESS_COMMIT: ${{ env.LAST_COMMIT }}
           GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/updateChangelog.yml

@@ -7,12 +7,15 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 10 * * *'
+# Workflow run on push is disabled to avoid conflicts when merging PR
+#  push:
+#    branches: [ master ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
-    if: false
+    if: github.repository == 'JetBrains/ideavim'
 
     steps:
       - uses: actions/checkout@v3
@@ -22,10 +25,10 @@ jobs:
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
       - name: Get tags
         run: git fetch --tags origin
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file
@@ -36,7 +39,7 @@ jobs:
           echo "LAST_COMMIT=$(git rev-list -n 1 tags/workflow-changelog)" >> $GITHUB_ENV
 
       - name: Update changelog
-        run: ./gradlew --no-configuration-cache updateChangelog
+        run: ./gradlew updateChangelog
         env:
           SUCCESS_COMMIT: ${{ env.LAST_COMMIT }}
 
@@ -60,4 +63,4 @@ jobs:
 #   dependabot updates. See mergeDependatobPR.yml file.
 # However, it turned out that GitHub accepts pushes from the actions as a PR and requires checks, that are always
 #   false for pushing from actions.
-# This secret is created to implement the workaround described in https://stackoverflow.com/a/76135647/3124227
+# This secret is created to implement the workaround described in https://stackoverflow.com/a/76135647/3124227

.github/workflows/updateFormatting.yml

@@ -20,10 +20,10 @@ jobs:
           fetch-depth: 50
           # See end of file updateChangeslog.yml for explanation of this secret
           ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
           settings-path: ${{ github.workspace }} # location for the settings.xml file

.gitignore

@@ -1,6 +1,5 @@
 *.swp
 /.gradle/
-/.intellijPlatform/
 
 /.idea/
 !/.idea/scopes
@@ -11,8 +10,6 @@
 !/.idea/runConfigurations
 !/.idea/codeStyles
 !/.idea/vcs.xml
-!/.idea/misc.xml
-!/.idea/.name
 
 **/build/
 **/out/
@@ -25,13 +22,10 @@
 .teamcity/*.iml
 
 # Generated by gradle task "generateGrammarSource"
-vim-engine/src/main/java/com/maddyhome/idea/vim/parser/generated
+src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated
-vim-engine/src/main/java/com/maddyhome/idea/vim/regexp/parser/generated
 # Generated JSONs for lazy classloading
 /vim-engine/src/main/resources/ksp-generated
 /src/main/resources/ksp-generated
 
 # Created by github automation
 settings.xml
-
-.kotlin

.idea/.name

@@ -1 +0,0 @@
-IdeaVim

.idea/misc.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <list size="3">
-      <item index="0" class="java.lang.String" itemvalue="com.intellij.vim.annotations.CommandOrMotion" />
-      <item index="1" class="java.lang.String" itemvalue="com.intellij.vim.annotations.ExCommand" />
-      <item index="2" class="java.lang.String" itemvalue="com.intellij.vim.annotations.VimscriptFunction" />
-    </list>
-  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="FrameworkDetectionExcludesConfiguration">
-    <file type="web" url="file://$PROJECT_DIR$" />
-  </component>
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/.teamcity/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" />
-</project>

.idea/runConfigurations/IdeaVim_full_verification.xml

@@ -12,7 +12,7 @@
       <option name="taskNames">
         <list>
           <option value="check" />
-          <option value="verifyPlugin" />
+          <option value="runPluginVerifier" />
         </list>
       </option>
       <option name="vmOptions" value="" />
@@ -20,7 +20,6 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
-    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>

.idea/runConfigurations/Start_IJ_with_IdeaVim__Split_Mode_.xml

@@ -1,25 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Start IJ with IdeaVim (Split Mode)" type="GradleRunConfiguration" factoryName="Gradle">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="runIdeSplitMode" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <RunAsTest>false</RunAsTest>
-    <method v="2" />
-  </configuration>
-</component>

.idea/vcs.xml

@@ -11,6 +11,6 @@
     </option>
   </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

.teamcity/_Self/Constants.kt

@@ -5,13 +5,13 @@ object Constants {
   const val EAP_CHANNEL = "eap"
   const val DEV_CHANNEL = "Dev"
 
-  const val GITHUB_TESTS = "2024.1.1"
+  const val GITHUB_TESTS = "2023.3.2"
-  const val NVIM_TESTS = "2024.1.1"
+  const val NVIM_TESTS = "2023.3.2"
-  const val PROPERTY_TESTS = "2024.1.1"
+  const val PROPERTY_TESTS = "2023.3.2"
-  const val LONG_RUNNING_TESTS = "2024.1.1"
+  const val LONG_RUNNING_TESTS = "2023.3.2"
-  const val QODANA_TESTS = "2024.1.1"
+  const val QODANA_TESTS = "2023.3.2"
-  const val RELEASE = "2024.1.1"
+  const val RELEASE = "2023.3.2"
 
-  const val RELEASE_DEV = "2024.1.1"
+  const val RELEASE_DEV = "2023.3.2"
-  const val RELEASE_EAP = "2024.1.1"
+  const val RELEASE_EAP = "2023.3.2"
 }

.teamcity/_Self/Project.kt

@@ -11,22 +11,20 @@ import _Self.subprojects.GitHub
 import _Self.subprojects.OldTests
 import _Self.subprojects.Releases
 import _Self.vcsRoots.GitHubPullRequest
-import _Self.vcsRoots.ReleasesVcsRoot
 import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
 object Project : Project({
-  description = "Vim engine for JetBrains IDEs"
+  description = "Vim engine for IDEs based on the IntelliJ platform"
 
   subProjects(Releases, OldTests, GitHub)
 
   // VCS roots
   vcsRoot(GitHubPullRequest)
-  vcsRoot(ReleasesVcsRoot)
 
   // Active tests
   buildType(TestingBuildType("Latest EAP", "<default>", version = "LATEST-EAP-SNAPSHOT"))
-  buildType(TestingBuildType("2024.1.1", "<default>"))
+  buildType(TestingBuildType("2023.3", "<default>", version = "2023.3"))
   buildType(TestingBuildType("Latest EAP With Xorg", "<default>", version = "LATEST-EAP-SNAPSHOT"))
 
   buildType(PropertyBased)

.teamcity/_Self/buildTypes/Compatibility.kt

@@ -34,10 +34,11 @@ object Compatibility : IdeaVimBuildType({
               
               java --version
               java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}org.jetbrains.IdeaVim-EasyMotion' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}io.github.mishkun.ideavimsneak' [latest-IU] -team-city
               java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
               java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}IdeaVimExtension' [latest-IU] -team-city
               # Outdated java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}github.zgqq.intellij-enhance' [latest-IU] -team-city
-              # java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
+              java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
               java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
               java -jar verifier1/verifier-cli-dev-all-1.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
             """.trimIndent()

.teamcity/_Self/buildTypes/CreateNewReleaseBranchFromMaster.kt

@@ -1,72 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package _Self.buildTypes
-
-import _Self.IdeaVimBuildType
-import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
-import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
-
-object CreateNewReleaseBranchFromMaster : IdeaVimBuildType({
-  name = "EXP: Create new release branch from master"
-
-  vcs {
-    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"
-
-    checkoutMode = CheckoutMode.AUTO
-  }
-
-  steps {
-    script {
-      name = "Calculate next potential release version"
-      scriptContent = """
-        #!/bin/bash
-
-        # Fetch all remote branches
-        git fetch --all
-
-        # Get a list of all branches matching the pattern releases/x.y.z
-        branches=${'$'}(git branch -r | grep -oE 'releases/[0-9]+\.[0-9]+\.x')
-
-        # If no matching branches are found, print a message and exit
-        if [[ -z "${'$'}branches" ]]; then
-            echo "No release branches found"
-            exit 1
-        fi
-
-        # Find the largest release version
-        largest_release=${'$'}(echo "${'$'}branches" | sort -V | tail -n 1)
-
-        # Print the largest release
-        echo "Largest release branch: ${'$'}largest_release"
-        echo "##teamcity[setParameter name='env.POTENTIAL_VERSION' value='${'$'}largest_release']"
-      """.trimIndent()
-    }
-
-    script {
-      name = "Show potential release version"
-      scriptContent = """
-                #!/bin/bash
-                echo "Calculated or user-provided parameter value is: %env.POTENTIAL_VERSION%"
-            """.trimIndent()
-    }
-  }
-
-  params {
-    param("env.POTENTIAL_VERSION", "")
-  }
-
-  features {
-    sshAgent {
-      teamcitySshKey = "IdeaVim ssh keys"
-    }
-  }
-})

.teamcity/_Self/buildTypes/LongRunning.kt

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

.teamcity/_Self/buildTypes/Nvim.kt

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

.teamcity/_Self/buildTypes/PluginVerifier.kt

@@ -22,7 +22,7 @@ object PluginVerifier : IdeaVimBuildType({
 
   steps {
     gradle {
-      tasks = "clean verifyPlugin"
+      tasks = "clean runPluginVerifier"
       buildFile = ""
       enableStacktrace = true
     }

.teamcity/_Self/buildTypes/PrintReleaseBranch.kt

@@ -1,42 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package _Self.buildTypes
-
-import _Self.IdeaVimBuildType
-import _Self.vcsRoots.ReleasesVcsRoot
-import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
-
-object PrintReleaseBranch : IdeaVimBuildType({
-  name = "EXP: Print release branch"
-
-  vcs {
-    root(ReleasesVcsRoot)
-    branchFilter = "+:heads/releases/*"
-
-    checkoutMode = CheckoutMode.AUTO
-  }
-
-  steps {
-
-    script {
-      name = "Print current branch"
-      scriptContent = """
-                echo "Current branch is: %teamcity.build.branch%"
-            """.trimIndent()
-    }
-  }
-
-  features {
-    sshAgent {
-      teamcitySshKey = "IdeaVim ssh keys"
-    }
-  }
-})

.teamcity/_Self/buildTypes/PropertyBased.kt

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

.teamcity/_Self/buildTypes/PublishVimEngine.kt

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

.teamcity/_Self/buildTypes/Qodana.kt

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

.teamcity/_Self/buildTypes/ReleaseEap.kt

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

.teamcity/_Self/buildTypes/ReleaseEapFromBranch.kt

@@ -1,106 +0,0 @@
-package _Self.buildTypes
-
-import _Self.Constants.EAP_CHANNEL
-import _Self.Constants.RELEASE_EAP
-import _Self.IdeaVimBuildType
-import _Self.vcsRoots.ReleasesVcsRoot
-import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
-import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
-import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
-import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
-
-object ReleaseEapFromBranch : IdeaVimBuildType({
-  name = "EXP: Publish EAP Build from branch"
-  description = "Build and publish EAP of IdeaVim plugin"
-
-  artifactRules = "build/distributions/*"
-
-  params {
-    param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE_EAP)
-    password(
-      "env.ORG_GRADLE_PROJECT_publishToken",
-      "credentialsJSON:61a36031-4da1-4226-a876-b8148bf32bde",
-      label = "Password"
-    )
-    param("env.ORG_GRADLE_PROJECT_publishChannels", EAP_CHANNEL)
-    password(
-      "env.ORG_GRADLE_PROJECT_slackUrl",
-      "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
-      label = "Slack Token"
-    )
-    password(
-      "env.YOUTRACK_TOKEN",
-      "credentialsJSON:2479995b-7b60-4fbb-b095-f0bafae7f622",
-      display = ParameterDisplay.HIDDEN
-    )
-  }
-
-  vcs {
-    root(ReleasesVcsRoot)
-    branchFilter = """
-      +:heads/(releases/*)
-      """.trimIndent()
-
-    checkoutMode = CheckoutMode.AUTO
-  }
-
-  steps {
-    script {
-      name = "Pull git tags"
-      scriptContent = "git fetch --tags origin"
-    }
-    script {
-      name = "Pull git history"
-      scriptContent = "git fetch --unshallow"
-    }
-    gradle {
-      name = "Calculate new eap version from branch"
-      tasks = "scripts:calculateNewEapVersionFromBranch"
-    }
-    gradle {
-      name = "Set TeamCity build number"
-      tasks = "scripts:setTeamCityBuildNumber"
-    }
-    gradle {
-      name = "Add release tag"
-      tasks = "scripts:addReleaseTag"
-    }
-    gradle {
-      name = "Publish plugin"
-      tasks = "publishPlugin"
-    }
-    script {
-      name = "Push changes to the repo"
-      scriptContent = """
-      branch=$(git branch --show-current)
-      echo current branch is ${'$'}branch
-      git push origin %build.number%
-      """.trimIndent()
-    }
-    gradle {
-      name = "YouTrack post release actions"
-      tasks = "scripts:eapReleaseActions"
-    }
-  }
-
-  features {
-    sshAgent {
-      teamcitySshKey = "IdeaVim ssh keys"
-    }
-  }
-
-  failureConditions {
-    failOnMetricChange {
-      metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
-      threshold = 5
-      units = BuildFailureOnMetric.MetricUnit.PERCENTS
-      comparison = BuildFailureOnMetric.MetricComparison.DIFF
-      compareTo = build {
-        buildRule = lastSuccessful()
-      }
-    }
-  }
-})

.teamcity/_Self/buildTypes/ReleasePlugin.kt

@@ -19,6 +19,8 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
 
 object ReleaseMajor : ReleasePlugin("major")
 object ReleaseMinor : ReleasePlugin("minor")
@@ -43,11 +45,7 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
       label = "Slack Token"
     )
-    password(
+    password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:3cd3e867-282c-451f-b958-bc95d56a8450", display = ParameterDisplay.HIDDEN)
-      "env.ORG_GRADLE_PROJECT_youtrackToken",
-      "credentialsJSON:7bc0eb3a-b86a-4ebd-b622-d4ef12d7e1d3",
-      display = ParameterDisplay.HIDDEN
-    )
     param("env.ORG_GRADLE_PROJECT_releaseType", releaseType)
   }
 
@@ -67,25 +65,9 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       name = "Pull git history"
       scriptContent = "git fetch --unshallow"
     }
-    script {
+    gradle {
-      name = "Reset release branch"
+      name = "Select branch"
-      scriptContent = """
+      tasks = "scripts:selectBranch"
-        if [ "major" = "$releaseType" ] || [ "minor" = "$releaseType" ]
-        then
-          echo Resetting the release branch because the release type is $releaseType
-          git checkout master
-          latest_eap=${'$'}(git describe --tags --match="[0-9].[0-9]*.[0-9]-eap.[0-9]*" --abbrev=0 HEAD)
-          echo Latest EAP: ${'$'}latest_eap
-          commit_of_latest_eap=${'$'}(git rev-list -n 1 ${'$'}latest_eap)
-          echo Commit of latest EAP: ${'$'}commit_of_latest_eap
-          git checkout release
-          git reset --hard ${'$'}commit_of_latest_eap
-        else
-          git checkout release
-          echo Do not reset the release branch because the release type is $releaseType
-        fi
-        echo Checked out release branch
-      """.trimIndent()
     }
     gradle {
       name = "Calculate new version"
@@ -95,61 +77,63 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       name = "Set TeamCity build number"
       tasks = "scripts:setTeamCityBuildNumber"
     }
-//    gradle {
+    gradle {
-//      name = "Update change log"
+      name = "Update change log"
-//      tasks = "scripts:changelogUpdateUnreleased"
+      tasks = "scripts:changelogUpdateUnreleased"
-//    }
+    }
-//    gradle {
+    gradle {
-//      name = "Commit preparation changes"
+      name = "Commit preparation changes"
-//      tasks = "scripts:commitChanges"
+      tasks = "scripts:commitChanges"
-//    }
+    }
     gradle {
       name = "Add release tag"
       tasks = "scripts:addReleaseTag"
     }
-    script {
+    gradle {
-      name = "Run tests"
+      name = "Reset release branch"
-      scriptContent = "./gradlew test"
+      tasks = "scripts:resetReleaseBranch"
     }
     gradle {
       name = "Publish release"
       tasks = "publishPlugin"
     }
-//    script {
-//      name = "Checkout master branch"
-//      scriptContent = """
-//        echo Checkout master
-//        git checkout master
-//      """.trimIndent()
-//    }
 //    gradle {
-//      name = "Update change log in master"
+//      name = "Push changes to the repo"
-//      tasks = "scripts:changelogUpdateUnreleased"
+//      tasks = "scripts:pushChangesWithReleaseBranch"
-//    }
-//    gradle {
-//      name = "Commit preparation changes in master"
-//      tasks = "scripts:commitChanges"
 //    }
     script {
       name = "Push changes to the repo"
       scriptContent = """
-      git checkout release
+      branch=$(git branch --show-current)  
-      echo checkout release branch
+      echo current branch is ${'$'}branch
-      git branch --set-upstream-to=origin/release release
+      if [ "master" != "${'$'}branch" ];
-      git push origin --force
+      then
-      # Push tag
+        git checkout master
-      git push origin %build.number%
+      fi
+      
+      git push origin --tags
+      git push origin
+      
+      if [ "patch" != $releaseType  ];
+      then
+        git checkout release
+        echo checkout release branch
+        git branch --set-upstream-to=origin/release release
+        git push --tags
+        git push origin --force
+      fi
+      
+      git checkout ${'$'}branch
       """.trimIndent()
     }
     gradle {
       name = "Run Integrations"
       tasks = "releaseActions"
-      gradleParams = "--no-configuration-cache"
     }
-//    gradle {
+    gradle {
-//      name = "Slack Notification"
+      name = "Slack Notification"
-//      tasks = "slackNotification"
+      tasks = "slackNotification"
-//    }
+    }
   }
 
   features {
@@ -157,4 +141,16 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       teamcitySshKey = "IdeaVim ssh keys"
     }
   }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
+      threshold = 5
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.DIFF
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
 })

.teamcity/_Self/subprojects/GitHub.kt

@@ -16,10 +16,10 @@ object GitHub : Project({
   name = "Pull Requests checks"
   description = "Automatic checking of GitHub Pull Requests"
 
-  buildType(GithubBuildType("clean test", "Tests"))
+  buildType(Github("clean test", "Tests"))
 })
 
-class GithubBuildType(command: String, desc: String) : IdeaVimBuildType({
+class Github(command: String, desc: String) : IdeaVimBuildType({
   name = "GitHub Pull Requests $desc"
   description = "Test GitHub pull requests $desc"
 

.teamcity/_Self/subprojects/Releases.kt

@@ -1,11 +1,8 @@
 package _Self.subprojects
 
-import _Self.buildTypes.CreateNewReleaseBranchFromMaster
-import _Self.buildTypes.PrintReleaseBranch
 import _Self.buildTypes.PublishVimEngine
 import _Self.buildTypes.ReleaseDev
 import _Self.buildTypes.ReleaseEap
-import _Self.buildTypes.ReleaseEapFromBranch
 import _Self.buildTypes.ReleaseMajor
 import _Self.buildTypes.ReleaseMinor
 import _Self.buildTypes.ReleasePatch
@@ -41,8 +38,4 @@ object Releases : Project({
   buildType(ReleaseEap)
   buildType(ReleaseDev)
   buildType(PublishVimEngine)
-
-  buildType(CreateNewReleaseBranchFromMaster)
-  buildType(PrintReleaseBranch)
-  buildType(ReleaseEapFromBranch)
 })

.teamcity/_Self/vcsRoots/Releases.kt

@@ -1,13 +0,0 @@
-package _Self.vcsRoots
-
-import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
-
-object ReleasesVcsRoot : GitVcsRoot({
-  name = "IdeaVim Releases"
-  url = "git@github.com:JetBrains/ideavim.git"
-  branch = "refs/heads/master"
-  branchSpec = "+:refs/(*)"
-  authMethod = uploadedKey {
-    uploadedKey = "IdeaVim ssh keys"
-  }
-})

.teamcity/patches/buildTypes/IdeaVimTests_Latest_EAP.kts

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

.teamcity/patches/buildTypes/ReleaseEapFromBranch.kts

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

.teamcity/patches/buildTypes/ReleaseMinor.kts

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

.teamcity/patches/buildTypes/ReleasePatch.kts

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

.teamcity/patches/projects/_Self.kts

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

.teamcity/settings.kts

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

AUTHORS.md

@@ -491,38 +491,6 @@ Contributors:
   [![icon][github]](https://github.com/Infonautica)
    
   Leonid Danilov
-* [![icon][mail]](mailto:emanuel-367@hotmail.com)
-  [![icon][github]](https://github.com/emanuelgestosa)
-   
-  Emanuel Gestosa
-* [![icon][mail]](mailto:81118900+lippfi@users.noreply.github.com)
-  [![icon][github]](https://github.com/lippfi)
-   
-  lippfi, 
-* [![icon][mail]](mailto:fillipser143@gmail.com)
-  [![icon][github]](https://github.com/Parker7123)
-   
-  FilipParker
-* [![icon][mail]](mailto:7138209+duhaesbaert@users.noreply.github.com)
-  [![icon][github]](https://github.com/duhaesbaert)
-   
-  Eduardo Haesbaert
-* [![icon][mail]](mailto:nikolaevsky.egor@gmail.com)
-  [![icon][github]](https://github.com/Aisper)
-   
-  Egor Nikolaevsky
-* [![icon][mail]](mailto:77796630+throwaway69420-69420@users.noreply.github.com)
-  [![icon][github]](https://github.com/kun-codes)
-   
-  Bishwa Saha, 
-* [![icon][mail]](mailto:alexfu@fastmail.com)
-  [![icon][github]](https://github.com/alexfu)
-   
-  Alex Fu
-* [![icon][mail]](mailto:jakepeters199@hotmail.com)
-  [![icon][github]](https://github.com/LazyScaper)
-   
-  Jake
 
 Previous contributors:
 

CHANGES.md

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

README.md

@@ -222,13 +222,13 @@ Ex commands or via `:map` command mappings:
     * Execute an action by `{action_id}`. Works from Ex command line.
     * Please don't use `:action` in mappings. Use `<Action>` instead.
 
-### Finding action IDs:
+### Finding action ids:
 
-* IJ provides `IdeaVim: track action IDs` command to show the id of the executed actions.
+* IJ provides `IdeaVim: track action Ids` command to show the id of the executed actions.
   This command can be found in "Search everywhere" (double `shift`).
 
     <details>
-        <summary><strong>"Track action IDs" Details</strong> (click to see)</summary>
+        <summary><strong>"Track action Ids" Details</strong> (click to see)</summary>
         <picture>
             <source media="(prefers-color-scheme: dark)" srcset="assets/readme/track_action_dark.gif">
             <img src="assets/readme/track_action_light.gif" alt="track action ids"/>
@@ -369,8 +369,6 @@ is the full list of synonyms.
 - Fancy constants for [undolevels](https://vimhelp.org/options.txt.html#%27undolevels%27):
   > The local value is set to -123456 when the global value is to be used.
 
-- Vi (not Vim) is a POSIX standard, and [has a spec](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/vi.html)! Vim is mostly POSIX compliant when Vi compatibility is selected with the `'compatible'` option, but there are still some differences that can be changed with `'copoptions'`. The spec is interesting because it documents the behaviour of different commands in a stricter style than the user documentation, describing the current line and column after the command, for example. [More details can be found by reading `:help posix`](https://vimhelp.org/vi_diff.txt.html#posix).
-
 License
 -------
 

ThirdPartyLicenses.md

@@ -1,5 +1,6 @@
 IdeaVim project is licensed under MIT license except the following parts of it:
 
+* File [RegExp.kt](src/main/java/com/maddyhome/idea/vim/regexp/RegExp.kt) is licensed under Vim License.  
 * File [ScrollViewHelper.kt](com/maddyhome/idea/vim/helper/ScrollViewHelper.kt) is licensed under Vim License.
 * File [Tutor.kt](src/main/java/com/maddyhome/idea/vim/ui/Tutor.kt) is licensed under Vim License.
 
@@ -83,8 +84,3 @@ IV)  It is not allowed to remove this license from the distribution of the Vim
      license for previous Vim releases instead of the license that they came
      with, at your option.
 ```
-
----
-
-File [sneakIcon.png](doc/images/sneakIcon.svg), which is originally an icon of the ideavim-sneak plugin,
-is merged icons of IdeaVim plugin and a random sneaker by FreePic from flaticon.com.

annotation-processors/build.gradle.kts

@@ -8,7 +8,7 @@
 
 plugins {
   kotlin("jvm")
-  kotlin("plugin.serialization") version "2.0.0"
+  kotlin("plugin.serialization") version "1.8.21"
 }
 
 val kotlinxSerializationVersion: String by project
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-  compileOnly("com.google.devtools.ksp:symbol-processing-api:2.0.0-1.0.24")
+  compileOnly("com.google.devtools.ksp:symbol-processing-api:1.9.22-1.0.16")
   implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:$kotlinxSerializationVersion") {
     // kotlin stdlib is provided by IJ, so there is no need to include it into the distribution
     exclude("org.jetbrains.kotlin", "kotlin-stdlib")

annotation-processors/src/main/kotlin/com/intellij/vim/providers/VimscriptFunctionProcessorProvider.kt

@@ -13,7 +13,7 @@ import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
 import com.google.devtools.ksp.processing.SymbolProcessorProvider
 import com.intellij.vim.processors.VimscriptFunctionProcessor
 
-class VimscriptFunctionProcessorProvider : SymbolProcessorProvider {
+public class VimscriptFunctionProcessorProvider : SymbolProcessorProvider {
   override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
     return VimscriptFunctionProcessor(environment)
   }

doc/IdeaVim Plugins.md

@@ -44,21 +44,16 @@ All commands with the mappings are supported. See the [full list of supported co
 
 <details>
 <summary><h2>sneak</h2></summary>
-
+   
-<img src="images/sneakIcon.svg" width="80" height="80" alt="icon"/>  
-
-By [Mikhail Levchenko](https://github.com/Mishkun)  
-Original repository with the plugin: https://github.com/Mishkun/ideavim-sneak  
 Original plugin: [vim-sneak](https://github.com/justinmk/vim-sneak).
    
 ### Setup:
-- Add the following command to `~/.ideavimrc`: `Plug 'justinmk/vim-sneak'`
+- Install [IdeaVim-sneak](https://plugins.jetbrains.com/plugin/15348-ideavim-sneak) plugin.
+- Add the following command to `~/.ideavimrc`: `set sneak`
    
 ### Instructions
-
+   
-* Type `s` and two chars to start sneaking in forward direction
+See the [docs](https://github.com/Mishkun/ideavim-sneak#usage)
-* Type `S` and two chars to start sneaking in backward direction
-* Type `;` or `,` to proceed with sneaking just as if you were using `f` or `t` commands
 
 </details>
 
@@ -129,26 +124,8 @@ Original plugin: [vim-multiple-cursors](https://github.com/terryma/vim-multiple-
       </details>
    
 ### Instructions
-
+   
-At the moment, the default key binds for this plugin do not get mapped correctly in IdeaVim (see [VIM-2178](https://youtrack.jetbrains.com/issue/VIM-2178)). To enable the default key binds, add the following to your `.ideavimrc` file...
+https://github.com/terryma/vim-multiple-cursors/blob/master/doc/multiple_cursors.txt
-
-```
-" Remap multiple-cursors shortcuts to match terryma/vim-multiple-cursors
-nmap <C-n> <Plug>NextWholeOccurrence
-xmap <C-n> <Plug>NextWholeOccurrence
-nmap g<C-n> <Plug>NextOccurrence
-xmap g<C-n> <Plug>NextOccurrence
-xmap <C-x> <Plug>SkipOccurrence
-xmap <C-p> <Plug>RemoveOccurrence
-
-" Note that the default <A-n> and g<A-n> shortcuts don't work on Mac due to dead keys.
-" <A-n> is used to enter accented text e.g. ñ
-" Feel free to pick your own mappings that are not affected. I like to use <leader>
-nmap <leader><C-n> <Plug>AllWholeOccurrences
-xmap <leader><C-n> <Plug>AllWholeOccurrences
-nmap <leader>g<C-n> <Plug>AllOccurrences
-xmap <leader>g<C-n> <Plug>AllOccurrences
-```
 
 </details>
 

doc/NERDTree-support.md

@@ -27,7 +27,7 @@ Plug 'nerdtree'
 ### Preview
 
 <details>
-<summary>Click for the preview</summary>
+<summary>Click to the the preview</summary>
 <img src="images/nerdtree.gif" alt="NERDTree example"/>
 </details>
 
@@ -40,33 +40,30 @@ Plug 'nerdtree'
 - `:NERDTreeFind`
 - `:NERDTreeRefreshRoot`
 
-| Key     | Description                                            | Map Setting                    |
+| Key     |  Description                                            |  Map Setting                   |
-|---------|--------------------------------------------------------|--------------------------------|
+|---------|---------------------------------------------------------|--------------------------------|
-| `o`     | Open files, directories and bookmarks                  | `g:NERDTreeMapActivateNode`    |
+| `o`     |  Open files, directories and bookmarks                  | `g:NERDTreeMapActivateNode`    |
-| `go`    | Open selected file, but leave cursor in the NERDTree   | `g:NERDTreeMapPreview`         |
+| `go`    |  Open selected file, but leave cursor in the NERDTree   | `g:NERDTreeMapPreview`         |
-| `t`     | Open selected node/bookmark in a new tab               | `g:NERDTreeMapOpenInTab`       |
+| `t`     |  Open selected node/bookmark in a new tab               | `g:NERDTreeMapOpenInTab`       |
-| `T`     | Same as 't' but keep the focus on the current tab      | `g:NERDTreeMapOpenInTabSilent` |
+| `T`     |  Same as 't' but keep the focus on the current tab      | `g:NERDTreeMapOpenInTabSilent` |
-| `i`     | Open selected file in a split window                   | `g:NERDTreeMapOpenSplit`       |
+| `i`     |  Open selected file in a split window                   | `g:NERDTreeMapOpenSplit`       |
-| `gi`    | Same as i, but leave the cursor on the NERDTree        | `g:NERDTreeMapPreviewSplit`    |
+| `gi`    |  Same as i, but leave the cursor on the NERDTree        | `g:NERDTreeMapPreviewSplit`    |
-| `s`     | Open selected file in a new vsplit                     | `g:NERDTreeMapOpenVSplit`      |
+| `s`     |  Open selected file in a new vsplit                     | `g:NERDTreeMapOpenVSplit`      |
-| `gs`    | Same as s, but leave the cursor on the NERDTree        | `g:NERDTreeMapPreviewVSplit`   |
+| `gs`    |  Same as s, but leave the cursor on the NERDTree        | `g:NERDTreeMapPreviewVSplit`   |
-| `O`     | Recursively open the selected directory                | `g:NERDTreeMapOpenRecursively` |
+| `O`     |  Recursively open the selected directory                | `g:NERDTreeMapOpenRecursively` |
-| `x`     | Close the current nodes parent                         | `g:NERDTreeMapCloseDir`        |
+| `x`     |  Close the current nodes parent                         | `g:NERDTreeMapCloseDir`        |
-| `X`     | Recursively close all children of the current node     | `g:NERDTreeMapCloseChildren`   |
+| `X`     |  Recursively close all children of the current node     | `g:NERDTreeMapCloseChildren`   |
-| `P`     | Jump to the root node                                  | `g:NERDTreeMapJumpRoot`        |
+| `P`     |  Jump to the root node                                  | `g:NERDTreeMapJumpRoot`        |
-| `p`     | Jump to current nodes parent                           | `g:NERDTreeMapJumpParent`      | 
+| `p`     |  Jump to current nodes parent                           | `g:NERDTreeMapJumpParent`      | 
-| `K`     | Jump up inside directories at the current tree depth   | `g:NERDTreeMapJumpFirstChild`  |
+| `K`     |  Jump up inside directories at the current tree depth   | `g:NERDTreeMapJumpFirstChild`  |
-| `J`     | Jump down inside directories at the current tree depth | `g:NERDTreeMapJumpLastChild`   |
+| `J`     |  Jump down inside directories at the current tree depth | `g:NERDTreeMapJumpLastChild`   |
-| `<C-J>` | Jump down to next sibling of the current directory     | `g:NERDTreeMapJumpNextSibling` |
+| `<C-J>` |  Jump down to next sibling of the current directory     | `g:NERDTreeMapJumpNextSibling` |
-| `<C-K>` | Jump up to previous sibling of the current directory   | `g:NERDTreeMapJumpPrevSibling` |
+| `<C-K>` |  Jump up to previous sibling of the current directory   | `g:NERDTreeMapJumpPrevSibling` |
-| `r`     | Recursively refresh the current directory              | `g:NERDTreeMapRefresh`         |
+| `r`     |  Recursively refresh the current directory              | `g:NERDTreeMapRefresh`         |
-| `R`     | Recursively refresh the current root                   | `g:NERDTreeMapRefreshRoot`     |
+| `R`     |  Recursively refresh the current root                   | `g:NERDTreeMapRefreshRoot`     |
-| `m`     | Display the NERDTree menu                              | `g:NERDTreeMapMenu`            |
+| `m`     |  Display the NERDTree menu                              | `g:NERDTreeMapMenu`            |
-| `q`     | Close the NERDTree window                              | `g:NERDTreeMapQuit`            |
+| `q`     |  Close the NERDTree window                              | `g:NERDTreeMapQuit`            |
-| `A`     | Zoom (maximize/minimize) the NERDTree window           | `g:NERDTreeMapToggleZoom`      |
+| `A`     |  Zoom (maximize/minimize) the NERDTree window           | `g:NERDTreeMapToggleZoom`      |
-| `d`     | Delete file or directory                               | `g:NERDTreeMapDelete`          |
-| `n`     | Create File                                            | `g:NERDTreeMapNewFile`         |
-| `N`     | Create Directory                                       | `g:NERDTreeMapNewDir`          |
 
 ### Troubleshooting
 

doc/images/sneakIcon.svg

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

doc/marketplace-plugin-example.md

@@ -5,9 +5,9 @@ Using actions from external plugins is the same, as tracking and reusing any IDE
 1. Install the plugin via Marketplace
 2. Enable action tracking. You can enable it by one of the following ways:
     * Execute `:set trackactionids` ex command or just `:set tai`
-    * Open the "Find actions" window by pressing `Ctrl-Shift-A` and search for "Track Action IDs" to find the toggle that enables and disables action tracking
+    * Open the "Find actions" window by pressing `Ctrl-Shift-A` and search for "Track Action Ids" to find the toggle that enables and disables action tracking
 3. Execute the plugin action the way intended by plugin author "See Edit menu or use ⇧ + ⌥ + U / Shift + Alt + U" or just find the `Toggle Camel Case` action in the "Find actions" window (`Ctrl-Shift-A`). If you action tracking is on, you will see this notification in your right bottom corner:
    
    <img alt="Notification" src="images/action-id-notification.png"/>
 4. Copy the action id from the notification to create the following mapping in your .ideavimrc
-```map <leader>t <Action>(de.netnexus.CamelCasePlugin.ToggleCamelCase)```
+```map <leader>t <Action>(de.netnexus.CamelCasePlugin.ToggleCamelCase)```

doc/set-commands.md

@@ -1,268 +1,140 @@
-List of Supported Options
+List of Supported Set Commands
-=========================
+==============================
 
-The following options can be set with the `:set`, `:setglobal` and `:setlocal` commands.
+The following `:set` commands can appear in `~/.ideavimrc` or be set manually in the command mode:
-They can be added to the `~/.ideavimrc` file, or set manually in Command-line mode.
-For more details of each option, please see the Vim documentation.
-Every effort is made to make these options compatible with Vim behaviour.
-However, some differences are inevitable.
 
-```
+    'clipboard'      'cb'       clipboard options
-'clipboard'     'cb'    Defines clipboard behavioue
+                                Standard clipboard options plus 
-        A comma-separated list of words to control clipboard behaviour:
-           unnamed      The clipboard register '*' is used instead of the
-                        unnamed register
-           unnamedplus  The clipboard register '+' is used instead of the
-                        unnamed register
-           ideaput      Uses the IDEs own paste implementation for put
-                        operations rather than simply inserting the text
-
-'digraph'       'dg'    Enable using <BS> to enter digraphs in Insert mode
-'gdefault'      'gd'    The ":substitute" flag 'g' is by default
-'guicursor'     'gcr'   Controls the shape of the cursor for different modes
-'history'       'hi'    Number of command-lines that are remembered
-'hlsearch'      'hls'   Highlight matches with the last search pattern
-'ignorecase'    'ic'    Ignore case in search patterns
-'incsearch'     'is'    Show where search pattern typed so far matches
-'iskeyword'     'isk'   Defines keywords for commands like 'w', '*', etc.
-'keymodel'      'km'    Controls selection behaviour with special keys
-        List of comma separated words, which enable special things that keys
-        can do. These values can be used:
-           startsel     Using a shifted special key starts selection (either
-                        Select mode or Visual mode, depending on "key" being
-                        present in 'selectmode')
-           stopsel      Using a NOT-shifted special key stops selection.
-                        Automatically enables `stopselect` and `stopvisual`
-           stopselect   Using a NOT-shifted special key stops select mode
-                        and removes selection - IdeaVim ONLY
-           stopvisual   Using a NOT-shifted special key stops visual mode
-                        and removes selection - IdeaVim ONLY
-           continueselect   Using a shifted arrow key doesn't start selection,
-                        but in select mode acts like startsel is enabled
-                        - IdeaVim ONLY
-           continuevisual   Using a shifted arrow key doesn't start selection,
-                        but in visual mode acts like startsel is enabled
-                        - IdeaVim ONLY
                                 
-        Special keys in this context are the cursor keys, <End>, <Home>,
+                                `ideaput`  (default on)   - IdeaVim ONLY
-        <PageUp> and <PageDown>.
+                                enable native idea paste action for put operations
+    
+    'digraph'        'dg'       enable the entering of digraphs in Insert mode
+    'gdefault'       'gd'       the ":substitute" flag 'g' is by default
+    'history'        'hi'       number of command-lines that are remembered
+    'hlsearch'       'hls'      highlight matches with the last search pattern
+    'ignorecase'     'ic'       ignore case in search patterns
+    'iskeyword'      'isk'      defines keywords for commands like 'w', '*', etc.
+    'incsearch'      'is'       show where search pattern typed so far matches
+    
+    `keymodel`       `km`       String (default "continueselect,stopselect")
 
-'matchpairs'    'mps'   Pairs of characters that "%" can match
+                 List of comma separated words, which enable special things that keys
-'maxmapdepth'   'mmd'   Maximum depth of mappings
+                 can do. These values can be used:
-'more'          'more'  When on, listings pause when the whole screen is filled
+                   startsel           Using a shifted special[1] key starts selection (either
-'nrformats'     'nf'    Number formats recognized for CTRL-A command
+                                      Select mode or Visual mode, depending on "key" being
-'operatorfunc'  'opfunc'    Name of a function to call with the g@ operator
+                                      present in 'selectmode').
-'scroll'        'scr'   Number of lines to scroll with CTRL-U and CTRL-D
+                   stopsel            Using a NOT-shifted special[1] key stops selection.
-'selection'     'sel'   What type of selection to use
+                                      Automatically enables `stopselect` and `stopvisual`
-'selectmode'    'slm'   Controls when to start Select mode instead of Visual
+                   stopselect         Using a NOT-shifted special[1] key stops     - IdeaVim ONLY
-        This is a comma-separated list of words:
+                                      select mode and removes selection.
-                        
+                   stopvisual         Using a NOT-shifted special[1] key stops     - IdeaVim ONLY
-           mouse        When using the mouse
+                                      visual mode and removes selection.
-           key          When using shifted special[1] keys
+                   continueselect     Using a shifted arrow key doesn't       - IdeaVim ONLY
-           cmd          When using "v", "V", or <C-V>
+                                      start selection, but in select mode
-           ideaselection    When IDE sets a selection - IdeaVim ONLY
+                                      acts like startsel is enabled
-                        (e.g.: extend selection, wrap with while, etc.)
+                   continuevisual     Using a shifted arrow key doesn't       - IdeaVim ONLY
+                                      start selection, but in visual mode
+                                      acts like startsel is enabled
+    
+    'matchpairs'     'mps'   pairs of characters that "%" can match
+    'maxmapdepth'    'mmd'   Maximum depth of mappings
+    'more'           'more'  When on, listings pause when the whole screen is filled.
+    'nrformats'      'nf'    number formats recognized for CTRL-A command
+    'number'         'nu'    print the line number in front of each line
+    'relativenumber' 'rnu'   show the line number relative to the line with
+                             the cursor
+    'scroll'         'scr'   lines to scroll with CTRL-U and CTRL-D
+    'scrolljump'     'sj'    minimum number of lines to scroll
+    'scrolloff'      'so'    minimum number of lines above and below the cursor
+    'selection'      'sel'   what type of selection to use
 
-'shell'         'sh'    The shell to use to execute commands with ! and :!
+    `selectmode`     `slm`   String (default "")
-'shellcmdflag'  'shcf'  The command flag passed to the shell
-'shellxescape'  'sxe'   The characters to be escaped when calling a shell
-'shellxquote'   'sxq'   The quote character to use in a shell command
-'showcmd'       'sc'    Show (partial) command in the status bar
-'showmode'      'smd'   Show the current mode in the status bar
-'smartcase'     'scs'   Use case sensitive search if any character in the
-                        pattern is uppercase
-'startofline'   'sol'   When on, some commands move the cursor to the first
-                        non-blank of the line
-                        When off, the cursor is kept in the same column
-                        (if possible)
-'timeout'       'to'    Use timeout for mapped key sequences
-'timeoutlen'    'tm'    Timeout duration for a mapped key sequence
-'viminfo'       'vi'    Information to remember after restart
-'virtualedit'   've'    Placement of the cursor where there is no actual text
-        A comma-separated list of these words:
-           block        Allow virtual editing in Visual mode (not supported)
-           insert       Allow virtual editing in Insert mode (not supported)
-           all          Allow virtual editing in all modes (not supported)
-           onemore      Allow the cursor to move just past the end of the line
 
-'visualbell'    'vb'    When on, prevents beeping on error
+                 This is a comma-separated list of words, which specify when to start
-'whichwrap'     'ww'    Which keys that move the cursor left/right can wrap to
+                 Select mode instead of Visual mode, when a selection is started.
-                        other lines
+                 Possible values:
-        A comma-separated list of these flags:
+                   mouse           when using the mouse
-           char key     modes
+                   key             when using shifted special[1] keys
-           b    <BS>    Normal and Visual
+                   cmd             when using "v", "V", or <C-V>
-           s    <Space> Normal and Visual
+                   ideaselection   when IDE sets a selection      - IdeaVim ONLY
-           h    "h"     Normal and Visual
+                                   (examples: extend selection, wrap with while, etc.)
-           l    "l"     Normal and Visual
-           <    <Left>  Normal and Visual
-           >    <Right> Normal and Visual
-           ~    "~"     Normal
-           [    <Left>  Insert and Replace
-           ]    <Right> Insert and Replace
 
-'wrapscan'      'ws'    Search will wrap around the end of file
+    `startofline`    `sol`       When "on" some commands move the cursor to the first non-blank of the line.
-```
+                                    When off the cursor is kept in the same column (if possible).
 
-## IdeaVim options mapped to IntelliJ-based IDE settings
+    'showmode'       'smd'       message on the status line to show current mode
+    'showcmd'        'sc'        show (partial) command in the status bar
+    'sidescroll'     'ss'        minimum number of columns to scroll horizontally
+    'sidescrolloff'  'siso'      min. number of columns to left and right of cursor
+    'smartcase'      'scs'       no ignore case when pattern is uppercase
+    'timeout'        'to'        use timeout for mapped key sequences
+    'timeoutlen'     'tm'        timeout duration for a mapped key sequence
+    'undolevels'     'ul'        maximum number of changes that can be undone
+    'viminfo'        'vi'        information to remember after restart
+    'visualbell'     'vb'        use visual bell instead of beeping
+    'wrapscan'       'ws'        searches wrap around the end of file
+    
+    
+    
+    IdeaVim only commands:
 
-IdeaVim provides its own implementation for handling scroll jump and offset, even though IntelliJ-based IDEs have similar functionality (there are differences in behaviour).
+    `ideamarks`      `ideamarks` Boolean (default true)
-When IdeaVim is hosted in an IntelliJ-based IDE (but not JetBrains Fleet), the following options map to the equivalent IDE settings:
+    
+                     If true, creation of global mark will trigger creation of IDE's bookmark
+                     and vice versa.
+                     
+    `idearefactormode` `idearefactormode` String(default "select")
+    
+                 Define the mode that would be enabled during
+                 the refactoring (renaming, live template, introduce variable, etc)
+                 
+                 Use one of the following values:
+                 - keep  - keep the mode that was enabled before starting a refactoring
+                 - select - start refactoring in select mode
+                 - visual - start refactoring in visual mode
+                 
+                 This option has effect if you are in normal, insert or replace mode before refactoring start.
+                 Visual or select mode are not changed.
+    
+    
+    `ideajoin`      `ideajoin` Boolean (default false)
+    
+                  If true, join command will be performed via IDE
+                  See wiki/`ideajoin` examples
+                  
+    `ideastatusicon`  `ideastatusicon` String(default "enabled")
+    
+                 Define the behavior of IdeaVim icon in the status bar.
+                 
+                 Use one of the following values:
+                 - enabled - icon is shown in the status bar
+                 - gray - use the gray version of the icon
+                 - disabled - hide the icon
 
-```
+    `ideawrite`     `ideawrite` String (default "all")
-'scrolljump'    'sj'    Minimal number of lines to scroll
+                  "file" or "all". Defines the behaviour of ":w" command.
-'scrolloff'     'so'    Minimal number of lines above and below the cursor
+                  Value "all" enables execution of ":wa" (save all) command on ":w" (save).
-'sidescroll'    'ss'    Minimal number of columns to scroll horizontally
+                  This feature exists because some IJ options like "Prettier on save" or "ESlint on save"
-'sidescrolloff' 'siso'  Minimal number of columns to left and right of cursor
+                       work only with "save all" action. If this option is set to "all", these actions work
-```
+                       also with ":w" command.
+                  
+    `lookupkeys`    `lookupkeys`   List of strings
+    
+                  List of keys that should be processed by the IDE during the active lookup (autocompletion).
+                  For example, <Tab> and <Enter> are used by the IDE to finish the lookup,
+                        but <C-W> should be passed to IdeaVim.
+                  Default value: 
+                        "<Tab>", "<Down>", "<Up>", "<Enter>", "<Left>", "<Right>",
+                        "<C-Down>", "<C-Up>", "<PageUp>", "<PageDown>",
+                        "<C-J>", "<C-Q>"
+                     
+    `ideavimsupport`  `ideavimsupport`  List of strings (default "dialog")
+                  
+                  Define the list of additional buffers where IdeaVim is enabled.
+                  
+                  - dialog - enable IdeaVim in dialogs
+                  - singleline - enable IdeaVim in single line editors (not suggested)
 
-## IdeaVim options for IntelliJ-based IDE features
+    ----------
-
+    [1] - cursor keys, <End>, <Home>, <PageUp> and <PageDown>
-Some Vim features cannot be implemented by IdeaVim, and must be implemented by the host IDE, such as showing whitespace and line numbers, and enabling soft-wrap.
-The following options modify equivalent settings and features implemented by IntelliJ-based IDEs.
-
-There is some mismatch when trying to map Vim options, most of which are local options, to IDE settings, which are mostly global-local.
-The Vim option will always reflect the effective value of the IDE setting for the current editor, and modifying the Vim option will update the local value of the IDE setting.
-The default value of the Vim option set during startup is not passed to the IDE setting.
-
-If the IDE setting has a way to modify the local value, such as entries in the _View | Active Editor_ menu, then changing this will update the current editor and be reflected in the Vim option value.
-If the IDE setting can only modify its global setting in the main _Settings_ dialog, this change does not always update the current editor (because the local IDE setting has been modified and takes precedence).
-
-IdeaVim tries to make this work more naturally by updating the editor and local Vim option when a global value changes unless the Vim option has been explicitly set in Command-line mode.
-
-In other words, if the local Vim value is explicitly set for a window or buffer, interactively, then it should not be reset.
-If the Vim option was explicitly set in `~/.ideavimrc` however, then the value will be reset, because this can be viewed as a "global" value - set once and applied to subsequently opened windows.
-(This should not be confused with Vim's concept of global options, which are mainly used to initialise new windows.)
-
-The local Vim option can always be reset to the global IDE setting value by resetting the Vim option to default with the `:set {option}&` syntax.
-
-```
-'bomb'              'bomb'  Add or remove a byte order mark (BOM) to the
-                            current file. Unlike Vim, the file is modified
-                            immediately, and not when saved
-'breakindent'       'bri'   Indent soft wrapped lines to match the first
-                            line's indent
-'colorcolumn'       'cc'    Maps to IntelliJ's visual guide columns
-'cursorline'        'cul'   Highlight the line containing the cursor
-'fileencoding'      'fenc'  Change the encoding of the current file. The file
-                            is modified and written immediately, rather than
-                            waiting to be saved
-                            Note that the names of the encoding might not
-                            match Vim's known names
-'fileformat'        'ff'    Change the file format - dos, unix or mac
-                            The file is modified immediately, rather than
-                            when saved
-'list'              'list'  Show whitespace. Maps to the editor's local
-                            setting in the View | Active Editor menu
-'number'            'nu'    Show line numbers. Maps to the editor's local
-                            setting in the View | Active Editor menu
-'relativenumber'    'rnu'   Show line numbers relative to the current line
-'textwidth'         'tw'    Set the column at which text is automatically
-                            wrapped
-'wrap'              'wrap'  Enable soft-wraps. Maps to the editor's local
-                            setting in the View | Active Editor menu
-```
-
-## IdeaVim only options
-
-These options are IdeaVim only, and not supported by Vim.
-They control integration with the host IDE.
-Unless otherwise stated, these options do not have abbreviations.
-
-```
-'ideacopypreprocess'    boolean (default off)
-                        global or local to buffer
-        When enabled, the IDE will run custom copy pre-processors over text
-        copied to registers. These pre-processors can perform transformations
-        on the text, such as converting escape characters in a string literal
-        into the actual control characters in a Java file.
-
-        This is not usually the expected behaviour, so this option's default
-        value is off. The equivalent processing for paste is controlled by the
-        "ideaput" value to the 'clipboard' option.
-
-'ideaglobalmode'        boolean (default off)
-                        global
-        This option will cause IdeaVim to share a single mode across all open
-        windows. In other words, entering Insert mode in one window will
-        enable Insert mode in all windows.
-
-'ideajoin'              boolean (default off)
-                        global or local to buffer
-        When enabled, join commands will be handled by the IDE's "smart join"
-        feature. The IDE can change syntax when joining lines, such as merging
-        string literals or if statements. See the wiki for more examples. Not
-        all languages support smart join functionality.
-
-'ideamarks'             boolean (default on)
-                        global
-        Maps Vim's global marks to IDE bookmarks.
-
-'idearefactormode'      string  (default "select")
-                        global or local to buffer
-        Specifies the mode to be used when a refactoring selects text to be
-        edited (e.g. renaming, live template fields, introduce variable, etc):
-           keep         Keep the current mode
-           select       Switch to Select mode
-           visual       Switch to Visual mode
-
-        This option is only used when the refactoring is started in Normal,
-        Insert or Replace mode. Visual or Select modes are not changed.
-
-'ideastatusicon'        string  (default "enabled")
-                        global
-        This option controls the behaviour and appearance of the IdeaVim icon
-        in the status bar:
-           enabled      Show the icon in the status bar
-           gray         Show the gray version of the icon
-           disabled     Hide the icon
-
-'ideavimsupport'        string  (default "dialog")
-                        global
-        A comma-separated list of additional buffers or locations where
-        IdeaVim should be enabled:
-           dialog       Enable IdeaVim in editors hosted in dialogs
-           singleline   Enable IdeaVim in single line editors (not recommended)
-
-        The IDE's editor component can be used in many places, such as VCS
-        commit tool window, or inside dialogs, and even as single line fields.
-
-'ideawrite'             string  (default "all")
-                        global
-        This option defines the behaviour of the :w command:
-           file         Save the current file only
-           all          The :w command works like :wa and invokes the Save All
-                        IDE action. This allows options such as "Prettier on
-                        save" or "ESlint on save" to work with the :w command,
-                        but means all files are saved.
-
-'lookupkeys'            string  (default "<Tab>,<Down>,<Up>,<Enter>,
-                                          <Left>,<Right>,<C-Down>,<C-Up>,
-                                          <PageUp>,<PageDown>, <C-J>,<C-Q>")
-                        global
-        Comma-separated list of keys that should be processed by the IDE while
-        a code completion lookup popup is active. For example, <Tab> and
-        <Enter> are used by the IDE to complete the lookup and insert text,
-        but <C-W> should be passed IdeaVim to continue editing the text.
-
-'trackactionids'        boolean (default off)
-                        global
-        When on, IdeaVim will try to track the current IDE action and display
-        the action name in a notification. This action ID can then be used in
-        a mapping to the action in the form <Action>(...).
-
-'visualdelay'           number  (default 100)
-                        global
-        This option specifies the delay, in milliseconds before converting an
-        IDE selection into Visual mode.
-
-        Some IDE features make a selection to help modify text (e.g. backspace
-        in Python or Yaml selects an indent and invokes the "remove selection"
-        action). IdeaVim listens for changes in selection to switch to Visual
-        mode, and will return to Normal mode when the selection is removed,
-        even if originally in Insert mode.
-
-        By waiting before converting to Visual mode, temporary selections can
-        be ignored and the current Vim mode maintained.
-        
-        It is not expected that this value will need to be changed.
-```

gradle.properties

@@ -8,46 +8,31 @@
 
 # suppress inspection "UnusedProperty" for whole file
 
-# ideaVersion is the version of the IDE that will be added as a compile-time dependency. The format can be either
+ideaVersion=2023.3.2
-# product version (e.g. 2024.1, 2024.1.1) or build (e.g. 241.15989.150, 241-EAP-SNAPSHOT). The dependency will be
+downloadIdeaSources=true
-# resolved against the configured repositories, which by default includes Maven releases and snapshots, the CDN used to
-# download consumer releases, the plugin marketplace and so on.
-# You can find an example list of all CDN based versions for IDEA Community here:
-# https://data.services.jetbrains.com/products?code=IC
-# Maven releases are here: https://www.jetbrains.com/intellij-repository/releases
-# And snapshots: https://www.jetbrains.com/intellij-repository/snapshots
-ideaVersion=2024.2
-# Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
-ideaType=IC
 instrumentPluginCode=true
-version=chylex-39
+version=chylex-26
 javaVersion=17
-remoteRobotVersion=0.11.23
+remoteRobotVersion=0.11.21
 antlrVersion=4.10.1
 
-# [VERSION UPDATE] 2024.2 - remove when IdeaVim targets 2024.2
+kotlin.incremental.useClasspathSnapshot=false
-# Running IdeaVim in split mode requires 242. Update this version once 242 has been released, and remove it completely
-# when IdeaVim targets 242, at which point runIdeSplitMode will run correctly with the target version.
-# See also runIdeSplitMode
-splitModeVersion=242-EAP-SNAPSHOT
-
 
 # Please don't forget to update kotlin version in buildscript section
 # Also update kotlinxSerializationVersion version
-kotlinVersion=2.0.0
+kotlinVersion=1.8.21
 publishToken=token
 publishChannels=eap
 
 # Kotlinx serialization also uses some version of kotlin stdlib under the hood. However,
 #   we exclude this version from the dependency and use our own version of kotlin that is specified above
-kotlinxSerializationVersion=1.6.2
+kotlinxSerializationVersion=1.5.1
 
 slackUrl=
 youtrackToken=
 
 # Gradle settings
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-org.gradle.caching=true
 
 # Disable warning from gradle-intellij-plugin. Kotlin stdlib is included as compileOnly, so the warning is unnecessary
 kotlin.stdlib.default.dependency=false

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

qodana.yaml

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

scripts/build.gradle.kts

@@ -20,17 +20,17 @@ repositories {
 }
 
 dependencies {
-  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.25")
+  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
 
-  implementation("io.ktor:ktor-client-core:2.3.12")
+  implementation("io.ktor:ktor-client-core:2.3.7")
-  implementation("io.ktor:ktor-client-cio:2.3.10")
+  implementation("io.ktor:ktor-client-cio:2.3.7")
-  implementation("io.ktor:ktor-client-content-negotiation:2.3.10")
+  implementation("io.ktor:ktor-client-content-negotiation:2.3.7")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.12")
+  implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.7")
-  implementation("io.ktor:ktor-client-auth:2.3.12")
+  implementation("io.ktor:ktor-client-auth:2.3.7")
   implementation("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")
 
   // This is needed for jgit to connect to ssh
-  implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.10.0.202406032230-r")
+  implementation("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.8.0.202311291450-r")
   implementation("com.vdurmont:semver4j:3.1.0")
 }
 
@@ -58,6 +58,13 @@ tasks.register("checkNewPluginDependencies", JavaExec::class) {
   classpath = sourceSets["main"].runtimeClasspath
 }
 
+tasks.register("updateAffectedRates", JavaExec::class) {
+  group = "verification"
+  description = "This job updates Affected Rate field on YouTrack"
+  mainClass.set("scripts.YouTrackUsersAffectedKt")
+  classpath = sourceSets["main"].runtimeClasspath
+}
+
 tasks.register("calculateNewVersion", JavaExec::class) {
   group = "release"
   mainClass.set("scripts.release.CalculateNewVersionKt")
@@ -86,6 +93,25 @@ tasks.register("addReleaseTag", JavaExec::class) {
   args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
 }
 
+tasks.register("resetReleaseBranch", JavaExec::class) {
+  group = "release"
+  mainClass.set("scripts.release.ResetReleaseBranchKt")
+  classpath = sourceSets["main"].runtimeClasspath
+  args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
+}
+
+tasks.register("pushChanges", JavaExec::class) {
+  mainClass.set("scripts.PushChangesKt")
+  classpath = sourceSets["main"].runtimeClasspath
+  args = listOf(rootProject.rootDir.toString())
+}
+
+tasks.register("pushChangesWithReleaseBranch", JavaExec::class) {
+  mainClass.set("scripts.PushChangesWithReleaseBranchKt")
+  classpath = sourceSets["main"].runtimeClasspath
+  args = listOf(rootProject.rootDir.toString(), releaseType ?: "")
+}
+
 tasks.register("selectBranch", JavaExec::class) {
   group = "release"
   mainClass.set("scripts.release.SelectBranchKt")
@@ -93,13 +119,6 @@ tasks.register("selectBranch", JavaExec::class) {
   args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
 }
 
-tasks.register("eapReleaseActions", JavaExec::class) {
-  group = "release"
-  mainClass.set("scripts.releaseEap.EapReleaseActionsKt")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
-}
-
 tasks.register("calculateNewEapVersion", JavaExec::class) {
   group = "release"
   mainClass.set("scripts.release.CalculateNewEapVersionKt")
@@ -107,13 +126,6 @@ tasks.register("calculateNewEapVersion", JavaExec::class) {
   args = listOf("${rootProject.rootDir}")
 }
 
-tasks.register("calculateNewEapVersionFromBranch", JavaExec::class) {
-  group = "release"
-  mainClass.set("scripts.release.CalculateNewEapVersionFromBranchKt")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf("${rootProject.rootDir}")
-}
-
 tasks.register("calculateNewDevVersion", JavaExec::class) {
   group = "release"
   mainClass.set("scripts.release.CalculateNewDevVersionKt")

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

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

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

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

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package scripts
+
+import scripts.release.checkoutBranch
+import scripts.release.withGit
+import scripts.release.withRepo
+
+fun main(args: Array<String>) {
+  val rootDir = args[0]
+  println("root dir: $rootDir")
+
+  val currentBranch = withRepo(rootDir) { it.branch }
+  println("Current branch is $currentBranch")
+
+
+  withGit(rootDir) { git ->
+    if (currentBranch != "master") {
+      git.checkoutBranch("master")
+      println("Check out master branch")
+    }
+
+    git.push()
+      .setPushTags()
+      .call()
+    println("Master pushed with tags")
+
+    git.checkoutBranch(currentBranch)
+    println("Checked out $currentBranch branch")
+  }
+}

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package scripts
+
+import scripts.release.checkoutBranch
+import scripts.release.withGit
+import scripts.release.withRepo
+
+fun main(args: Array<String>) {
+  val rootDir = args[0]
+  val releaseType = args[1]
+  println("root dir: $rootDir")
+  println("releaseType: $releaseType")
+
+  val currentBranch = withRepo(rootDir) { it.branch }
+  println("Current branch is $currentBranch")
+
+
+  withGit(rootDir) { git ->
+    if (currentBranch != "master") {
+      git.checkoutBranch("master")
+      println("Check out master branch")
+    }
+
+    git.push()
+      .setPushTags()
+      .call()
+    println("Master pushed with tags")
+
+    if (releaseType != "patch") {
+      git.checkoutBranch("release")
+      println("Checked out release")
+
+      git
+        .push()
+        .setForce(true)
+        .setPushTags()
+        .call()
+      println("Pushed release branch with tags")
+    }
+    else {
+      println("Do not push release branch because type of release is $releaseType")
+    }
+
+    git.checkoutBranch(currentBranch)
+    println("Checked out $currentBranch branch")
+  }
+}

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

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

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

@@ -1,49 +0,0 @@
-/*
- * Copyright 2003-2023 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package scripts.release
-
-fun main(args: Array<String> ) {
-  val projectDir = args[0]
-  println("Working directory: $projectDir")
-  val branch = withRepo(projectDir) { it.branch }
-  val (majorBranchVersion, minorBranchVersion) = versions(branch)
-  val versions = getVersionsExistingVersionsFor(majorBranchVersion, minorBranchVersion, projectDir)
-  val maxExistingVersion = versions.keys.maxOrNull()
-
-  val nextVersion = if (maxExistingVersion != null) {
-    if (maxExistingVersion.suffixTokens.isEmpty()) {
-      maxExistingVersion.nextPatch().withSuffix("eap.1").value
-    }
-    else {
-      check(maxExistingVersion.suffixTokens.size == 2) {
-        "We should have exactly two suffix tokens. Current tokens: ${maxExistingVersion.suffixTokens.toList()}"
-      }
-      check(maxExistingVersion.suffixTokens[0] == "eap") {
-        "First suffix token must be eap. Current tokens: ${maxExistingVersion.suffixTokens.toList()}"
-      }
-
-      val newEapNumber = maxExistingVersion.suffixTokens[1].toInt().inc()
-      maxExistingVersion.withSuffix("eap.$newEapNumber").value
-    }
-  } else {
-    "$majorBranchVersion.$minorBranchVersion.0-eap.1"
-  }
-
-
-  println("Next eap version: $nextVersion")
-  println("##teamcity[setParameter name='env.ORG_GRADLE_PROJECT_version' value='$nextVersion']")
-}
-
-private val regex = "releases/(\\d+)\\.(\\d+)\\.x".toRegex()
-private fun versions(branchName: String): Pair<Int, Int> {
-  val match = regex.matchEntire(branchName) ?: error("Cannot match branch: $branchName")
-  val major = match.groups[1]
-  val minor = match.groups[2]
-  return major!!.value.toInt() to minor!!.value.toInt()
-}

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

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

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

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

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

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package scripts.release
+
+fun main(args: Array<String>) {
+  val (_, rootDir, releaseType) = readArgs(args)
+
+  checkReleaseType(releaseType)
+
+  checkBranch(rootDir, releaseType)
+
+  if (releaseType == "patch") {
+    println("Skip release branch reset because release type is 'patch'")
+    return
+  }
+
+  withGit(rootDir) { git ->
+    val currentCommit = git.log().setMaxCount(1).call().first()
+    println("Current commit id: ${currentCommit.id.name}")
+
+    git.checkoutBranch("release")
+    println("Checked out release branch")
+
+    git.reset()
+      .setRef(currentCommit.id.name)
+      .call()
+    println("release branch reset")
+
+    git.checkoutBranch("master")
+    println("Checked out master branch")
+  }
+}

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

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

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

@@ -64,31 +64,6 @@ enum class ReleaseType {
   STABLE_NO_PATCH, // Version that ends on 0. Like 2.5.0
 }
 
-internal fun getVersionsExistingVersionsFor(
-  majorVersion: Int,
-  minorVersion: Int,
-  projectDir: String,
-): Map<Semver, ObjectId> {
-  val repository = RepositoryBuilder().setGitDir(File("$projectDir/.git")).build()
-  val git = Git(repository)
-  println(git.log().call().first())
-  println(git.tagList().call().first())
-
-  return git.tagList().call().mapNotNull { ref ->
-    runCatching {
-      // Git has two types of tags: light and annotated. This code detect hash of the commit for both types of tags
-      val revWalk = RevWalk(repository)
-      val tag = revWalk.parseAny(ref.objectId)
-      val commitHash = revWalk.peel(tag).id
-      val semver = Semver(ref.name.removePrefix("refs/tags/"))
-      if (semver.major == majorVersion && semver.minor == minorVersion) {
-        semver to commitHash
-      } else null
-    }.getOrNull()
-  }
-    .toMap()
-}
-
 internal fun getVersion(projectDir: String, releaseType: ReleaseType): Pair<Semver, ObjectId> {
   val repository = RepositoryBuilder().setGitDir(File("$projectDir/.git")).build()
   val git = Git(repository)

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

@@ -1,36 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package scripts.releaseEap
-
-import kotlinx.coroutines.runBlocking
-import scripts.addComment
-import scripts.getYoutrackTicketsByQuery
-import scripts.release.readArgs
-import scripts.releasedInEapTagId
-import scripts.setTag
-
-fun main(args: Array<String>) {
-  runBlocking {
-    val (newVersion, _, _) = readArgs(args)
-
-    // Search for Ready to release, but without "IdeaVim Released In EAP" tag
-    val ticketsToUpdate =
-      getYoutrackTicketsByQuery("%23%7BReady%20To%20Release%7D%20tag:%20-%7BIdeaVim%20Released%20In%20EAP%7D%20")
-    println("Have to update the following tickets: $ticketsToUpdate")
-
-    ticketsToUpdate.forEach { ticketId ->
-      setTag(ticketId, releasedInEapTagId)
-      addComment(
-        ticketId, """
-        The fix is available in the IdeaVim $newVersion. See https://jb.gg/ideavim-eap for the instructions on how to get EAP builds as updates within the IDE. You can also wait till the next stable release with this fix, you’ll get it automatically.
-      """.trimIndent()
-      )
-    }
-  }
-}

scripts/src/main/kotlin/scripts/youTrackUsersAffected.kt

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package scripts
+
+import io.ktor.client.call.*
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.jsonObject
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.put
+
+val areaWeights = setOf(
+  Triple("118-53212", "Plugins", 50),
+  Triple("118-53220", "Vim Script", 30),
+  Triple("118-54084", "Esc", 100),
+)
+
+suspend fun updateRates() {
+  println("Updating rates of the issues")
+  areaWeights.forEach { (id, name, weight) ->
+    val unmappedIssues = unmappedIssues(name)
+    println("Got ${unmappedIssues.size} for $name area")
+
+    unmappedIssues.forEach { issueId ->
+      print("Trying to update issue $issueId: ")
+      val response = updateCustomField(issueId) {
+        put("name", "Affected Rate")
+        put("\$type", "SimpleIssueCustomField")
+        put("value", weight)
+      }
+
+      println(response)
+    }
+  }
+}
+
+private suspend fun unmappedIssues(area: String): List<String> {
+  val areaProcessed = if (" " in area) "{$area}" else area
+  val res = issuesQuery(
+    query = "project: VIM Affected Rate: {No affected rate} Area: $areaProcessed #Unresolved",
+    fields = "id,idReadable"
+  )
+  return res.body<JsonArray>().map { it.jsonObject }.map { it["idReadable"]!!.jsonPrimitive.content }
+}
+
+suspend fun getAreasWithoutWeight(): Set<Pair<String, String>> {
+  val allAreas = getAreaValues()
+  return allAreas
+    .filterNot { it.key in areaWeights.map { it.first }.toSet() }
+    .entries
+    .map { it.key to it.value }
+    .toSet()
+}
+
+suspend fun main() {
+  updateRates()
+}

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

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

settings.gradle

@@ -0,0 +1,15 @@
+// Set repository for snapshot versions of gradle plugin
+pluginManagement {
+  repositories {
+    maven {
+      url 'https://oss.sonatype.org/content/repositories/snapshots/'
+    }
+    gradlePluginPortal()
+  }
+}
+
+rootProject.name = 'IdeaVIM'
+include 'vim-engine'
+include 'scripts'
+include 'annotation-processors'
+

settings.gradle.kts

@@ -1,21 +0,0 @@
-// Set repository for snapshot versions of gradle plugin
-pluginManagement {
-  repositories {
-    maven {
-      url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-    }
-    gradlePluginPortal()
-  }
-}
-
-rootProject.name = "IdeaVIM"
-
-include("vim-engine")
-include("scripts")
-include("annotation-processors")
-include("tests:java-tests")
-include("tests:property-tests")
-include("tests:long-running-tests")
-include("tests:ui-ij-tests")
-include("tests:ui-py-tests")
-include("tests:ui-fixtures")

src/main/antlr/Vimscript.g4

@@ -101,14 +101,10 @@ command:
     (WS | COLON)* range? (WS | COLON)* EXECUTE WS* (expr WS*)* (NEW_LINE | BAR)+
     #ExecuteCommand|
 
-    (WS | COLON)* range? (WS | COLON)* lShift
+    (WS | COLON)* range? (WS | COLON)* lShift (WS* commandArgument = ~(NEW_LINE | BAR)+)? ((inline_comment NEW_LINE+) | (NEW_LINE | BAR)+)
-    WS* ((commandArgumentWithoutBars? inline_comment NEW_LINE) | (commandArgumentWithoutBars? NEW_LINE) | (commandArgumentWithoutBars? BAR))
-    (NEW_LINE | BAR)*
     #ShiftLeftCommand|
 
-    (WS | COLON)* range? (WS | COLON)* rShift
+    (WS | COLON)* range? (WS | COLON)* rShift (WS* commandArgument = ~(NEW_LINE | BAR)+)? ((inline_comment NEW_LINE+) | (NEW_LINE | BAR)+)
-    WS* ((commandArgumentWithoutBars? inline_comment NEW_LINE) | (commandArgumentWithoutBars? NEW_LINE) | (commandArgumentWithoutBars? BAR))
-    (NEW_LINE | BAR)*
     #ShiftRightCommand|
 
     (WS | COLON)* range? (WS | COLON)*
@@ -119,7 +115,6 @@ command:
         | PROMPT_REPLACE | P_LOWERCASE | P_UPPERCASE | PRINT | PREVIOUS_TAB | N_UPPERCASE | PREVIOUS_FILE | PLUG
         | ONLY | NO_HL_SEARCH | NEXT_TAB | N_LOWERCASE | NEXT_FILE | M_LOWERCASE | MOVE_TEXT | MARKS | K_LOWERCASE
         | MARK_COMMAND | JUMPS | J_LOWERCASE | JOIN_LINES | HISTORY | GO_TO_CHAR | SYMBOL | FIND | CLASS | F_LOWERCASE
-        | CLEARJUMPS
         | 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 | TABMOVE
@@ -619,7 +614,6 @@ BUFFER_CLOSE:           'bd' | 'bde' | 'bdel' | 'bdele' | 'bdelet' | 'bdelete';
 BUFFER_LIST:            'buffers' | 'ls' | 'files';
 CALL:                   'cal' | 'call';
 CLASS:                  'cla' | 'clas' | 'class';
-CLEARJUMPS:             'cle' | 'clea' | 'clear' | 'clearj' | 'clearju' | 'clearjum' | 'clearjump' | 'clearjumps';
 CMD:                    'com' | 'comm' | 'comma' | 'comman' | 'command';
 CMD_CLEAR:              'comc' | 'comcl' | 'comcle' | 'comclea' | 'comclear';
 COPY:                   'co' | 'cop' | 'copy';
@@ -830,4 +824,4 @@ AUGROUP_SKIP:           NEW_LINE (WS|COLON)* AUGROUP .*? AUGROUP WS+ END -> skip
 
 // All the other symbols
 UNICODE_CHAR:           '\u0000'..'\uFFFE';
-EMOJI:                  [\p{Emoji}];
+EMOJI:                  [\p{Emoji}];

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

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

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

@@ -8,19 +8,14 @@
 
 package com.maddyhome.idea.vim
 
-import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManagerListener
 import com.intellij.openapi.startup.ProjectActivity
-import com.intellij.openapi.updateSettings.impl.UpdateSettings
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.EditorHelper
-import com.maddyhome.idea.vim.newapi.IjVimEditor
+import com.maddyhome.idea.vim.helper.localEditors
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.initInjector
-import com.maddyhome.idea.vim.ui.JoinEap
-import com.maddyhome.idea.vim.ui.JoinEap.EAP_LINK
 
 /**
  * @author Alex Plate
@@ -33,11 +28,6 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {
     if (firstInitializationOccurred) return
     firstInitializationOccurred = true
 
-    if (!VimPlugin.getVimState().wasSubscibedToEAPAutomatically && ApplicationManager.getApplication().isEAP && !JoinEap.eapActive()) {
-      VimPlugin.getVimState().wasSubscibedToEAPAutomatically = true
-      UpdateSettings.getInstance().storedPluginHosts += EAP_LINK
-    }
-
     // This code should be executed once
     VimPlugin.getInstance().initialize()
   }
@@ -46,11 +36,8 @@ internal class PluginStartup : ProjectActivity/*, LightEditCompatible*/ {
 // This is a temporal workaround for VIM-2487
 internal class PyNotebooksCloseWorkaround : ProjectManagerListener {
   override fun projectClosingBeforeSave(project: Project) {
-    initInjector()
-    // TODO: Confirm context in CWM scenario
     if (injector.globalIjOptions().closenotebooks) {
-      injector.editorGroup.getEditors().forEach { vimEditor ->
+      localEditors().forEach { editor ->
-        val editor = (vimEditor as IjVimEditor).editor
         val virtualFile = EditorHelper.getVirtualFile(editor)
         if (virtualFile?.extension == "ipynb") {
           val fileEditorManager = FileEditorManagerEx.getInstanceEx(project)

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

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

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

@@ -37,17 +37,17 @@ 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.newapi.IjVimInjector;
-import com.maddyhome.idea.vim.newapi.IjVimInjectorKt;
-import com.maddyhome.idea.vim.newapi.IjVimSearchGroup;
 import com.maddyhome.idea.vim.ui.StatusBarIconFactory;
+import com.maddyhome.idea.vim.ui.ex.ExEntryPanel;
+import com.maddyhome.idea.vim.vimscript.services.OptionService;
 import com.maddyhome.idea.vim.vimscript.services.VariableService;
 import com.maddyhome.idea.vim.yank.YankGroupBase;
 import org.jdom.Element;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import static com.maddyhome.idea.vim.api.VimInjectorKt.injector;
 import static com.maddyhome.idea.vim.group.EditorGroup.EDITOR_STORE_ELEMENT;
 import static com.maddyhome.idea.vim.group.KeyGroup.SHORTCUT_CONFLICTS_ELEMENT;
 import static com.maddyhome.idea.vim.vimscript.services.VimRcService.executeIdeaVimRc;
@@ -68,7 +68,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   private static final Logger LOG = Logger.getInstance(VimPlugin.class);
 
   static {
-    IjVimInjectorKt.initInjector();
+    VimInjectorKt.setInjector(new IjVimInjector());
   }
 
   private final @NotNull VimState state = new VimState();
@@ -117,6 +117,12 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     return ApplicationManager.getApplication().getService(CommandGroup.class);
   }
 
+  @Deprecated // "Please use `injector.markService` instead"
+  @ApiStatus.ScheduledForRemoval(inVersion = "2.3")
+  public static @NotNull MarkGroup getMark() {
+    return ApplicationManager.getApplication().getService(MarkGroup.class);
+  }
+
   public static @NotNull RegisterGroup getRegister() {
     return ((RegisterGroup)VimInjectorKt.getInjector().getRegisterGroup());
   }
@@ -125,12 +131,12 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     return (FileGroup)VimInjectorKt.getInjector().getFile();
   }
 
-  public static @NotNull IjVimSearchGroup getSearch() {
+  public static @NotNull SearchGroup getSearch() {
-    return ApplicationManager.getApplication().getService(IjVimSearchGroup.class);
+    return ApplicationManager.getApplication().getService(SearchGroup.class);
   }
 
-  public static @Nullable IjVimSearchGroup getSearchIfCreated() {
+  public static @Nullable SearchGroup getSearchIfCreated() {
-    return ApplicationManager.getApplication().getServiceIfCreated(IjVimSearchGroup.class);
+    return ApplicationManager.getApplication().getServiceIfCreated(SearchGroup.class);
   }
 
   public static @NotNull ProcessGroup getProcess() {
@@ -189,6 +195,13 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     return VimInjectorKt.getInjector().getOptionGroup();
   }
 
+  /** Deprecated: Use getOptionGroup */
+  @Deprecated
+  // Used by which-key 0.8.0, IdeaVimExtension 1.6.5 + 1.6.8
+  public static @NotNull OptionService getOptionService() {
+    return VimInjectorKt.getInjector().getOptionService();
+  }
+
   private static @NotNull NotificationService getNotifications() {
     return getNotifications(null);
   }
@@ -213,22 +226,22 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   public static void setEnabled(final boolean enabled) {
     if (isEnabled() == enabled) return;
 
+    if (!enabled) {
+      getInstance().turnOffPlugin(true);
+    }
+
     getInstance().enabled = enabled;
 
+    if (enabled) {
+      getInstance().turnOnPlugin();
+    }
+
     if (enabled) {
       VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOn();
     } else {
       VimInjectorKt.getInjector().getListenersNotifier().notifyPluginTurnedOff();
     }
 
-    if (!enabled) {
-      getInstance().turnOffPlugin(true);
-    }
-
-    if (enabled) {
-      getInstance().turnOnPlugin();
-    }
-
     StatusBarIconFactory.Util.INSTANCE.updateIcon();
   }
 
@@ -284,13 +297,7 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     ideavimrcRegistered = true;
 
     if (!ApplicationManager.getApplication().isUnitTestMode()) {
-      try {
+      executeIdeaVimRc(editor);
-        injector.getOptionGroup().startInitVimRc();
-        executeIdeaVimRc(editor);
-      }
-      finally {
-        injector.getOptionGroup().endInitVimRc();
-      }
     }
   }
 
@@ -347,21 +354,20 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
   }
 
   private void turnOffPlugin(boolean unsubscribe) {
-    IjVimSearchGroup searchGroup = getSearchIfCreated();
+    SearchGroup searchGroup = getSearchIfCreated();
     if (searchGroup != null) {
       searchGroup.turnOff();
     }
     if (unsubscribe) {
       VimListenerManager.INSTANCE.turnOff();
     }
-    injector.getCommandLine().fullReset();
+    ExEntryPanel.fullReset();
 
     // Unregister vim actions in command mode
     RegisterActions.unregisterActions();
 
     if (onOffDisposable != null) {
       Disposer.dispose(onOffDisposable);
-      onOffDisposable = null;
     }
   }
 

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

@@ -12,13 +12,13 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
-import com.maddyhome.idea.vim.ui.ex.ExEntryPanel
+import com.maddyhome.idea.vim.group.EditorHolderService
 
-@Service(Service.Level.PROJECT)
+@Service
 internal class VimProjectService(val project: Project) : Disposable {
   override fun dispose() {
     // Not sure if this is a best solution
-    ExEntryPanel.getInstance().setEditor(null)
+    EditorHolderService.getInstance().editor = null
   }
 
   companion object {

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

@@ -32,7 +32,7 @@ import javax.swing.KeyStroke
  * This class is used in Which-Key plugin, so don't make it internal. Generally, we should provide a proper
  *   way to get ideavim keys for this plugin. See VIM-3085
  */
-class VimTypedActionHandler(origHandler: TypedActionHandler) : TypedActionHandlerEx {
+public class VimTypedActionHandler(origHandler: TypedActionHandler) : TypedActionHandlerEx {
   private val handler = KeyHandler.getInstance()
   private val traceTime = injector.globalOptions().ideatracetime
 
@@ -77,7 +77,7 @@ class VimTypedActionHandler(origHandler: TypedActionHandler) : TypedActionHandle
       val modifiers = if (charTyped == ' ' && VimKeyListener.isSpaceShift) KeyEvent.SHIFT_DOWN_MASK else 0
       val keyStroke = KeyStroke.getKeyStroke(charTyped, modifiers)
       val startTime = if (traceTime) System.currentTimeMillis() else null
-      handler.handleKey(editor.vim, keyStroke, context.vim, handler.keyHandlerState)
+      handler.handleKey(editor.vim, keyStroke, injector.executionContextManager.onEditor(editor.vim, context.vim))
       if (startTime != null) {
         val duration = System.currentTimeMillis() - startTime
         LOG.info("VimTypedAction '$charTyped': $duration ms")

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

@@ -1,32 +1,27 @@
 /*
- * Copyright 2003-2024 The IdeaVim authors
+ * Copyright 2003-2023 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
  * https://opensource.org/licenses/MIT.
  */
-package com.maddyhome.idea.vim.action.ex
+package com.maddyhome.idea.vim.action
 
 import com.intellij.vim.annotations.CommandOrMotion
 import com.intellij.vim.annotations.Mode
+import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
-import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.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.*
 
 @CommandOrMotion(keys = [":"], modes = [Mode.NORMAL, Mode.VISUAL, Mode.OP_PENDING])
 internal class ExEntryAction : VimActionHandler.SingleExecution() {
-  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_START_EX)
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    if (editor.isOneLineMode()) return false
+    VimPlugin.getProcess().startExCommand(editor, context, cmd)
-    injector.commandLine.createCommandPrompt(editor, context, cmd, initialText = "")
     return true
   }
 }

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

@@ -8,6 +8,6 @@
 
 package com.maddyhome.idea.vim.action
 
-object IntellijCommandProvider : CommandProvider {
+public object IntellijCommandProvider : CommandProvider {
   override val commandListFileName: String = "intellij_commands.json"
 }

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

@@ -1,39 +0,0 @@
-/*
- * Copyright 2003-2024 The IdeaVim authors
- *
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE.txt file or at
- * https://opensource.org/licenses/MIT.
- */
-
-package com.maddyhome.idea.vim.action
-
-import com.intellij.vim.annotations.CommandOrMotion
-import com.intellij.vim.annotations.Mode
-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.handler.VimActionHandler
-
-/**
- * Clear and redraw the screen
- *
- * Typically, an IDE does not need to redraw the screen - it's editor handles scrolling, etc. However, it can be
- * necessary to clear the status line.
- */
-@CommandOrMotion(keys = ["<C-L>"], modes = [Mode.NORMAL])
-internal class RedrawAction : VimActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.OTHER_READONLY
-
-  override fun execute(
-    editor: VimEditor,
-    context: ExecutionContext,
-    cmd: Command,
-    operatorArguments: OperatorArguments,
-  ): Boolean {
-    injector.redrawService.redraw()
-    return true
-  }
-}

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

@@ -1,52 +0,0 @@
-package com.maddyhome.idea.vim.action
-
-import com.intellij.openapi.actionSystem.ActionUpdateThread
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.command.UndoConfirmationPolicy
-import com.intellij.openapi.command.WriteCommandAction
-import com.intellij.openapi.fileEditor.TextEditor
-import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
-import com.intellij.openapi.project.DumbAwareAction
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.newapi.IjEditorExecutionContext
-import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.mode.Mode
-
-class VimRunLastMacroInOpenFiles : DumbAwareAction() {
-  override fun update(e: AnActionEvent) {
-    val lastRegister = injector.macro.lastRegister
-    val isEnabled = lastRegister != 0.toChar()
-
-    e.presentation.isEnabled = isEnabled
-    e.presentation.text = if (isEnabled) "Run Macro '${lastRegister}' in Open Files" else "Run Last Macro in Open Files"
-  }
-
-  override fun getActionUpdateThread(): ActionUpdateThread {
-    return ActionUpdateThread.EDT
-  }
-
-  override fun actionPerformed(e: AnActionEvent) {
-    val project = e.project ?: return
-    val fileEditorManager = FileEditorManagerEx.getInstanceExIfCreated(project) ?: return
-    val editors = fileEditorManager.allEditors.filterIsInstance<TextEditor>()
-    
-    WriteCommandAction.writeCommandAction(project)
-      .withName(e.presentation.text)
-      .withGlobalUndo()
-      .withUndoConfirmationPolicy(UndoConfirmationPolicy.REQUEST_CONFIRMATION)
-      .run<RuntimeException> {
-        val reg = injector.macro.lastRegister
-        
-        for (editor in editors) {
-          fileEditorManager.openFile(editor.file, true)
-          
-          val vimEditor = editor.editor.vim
-          vimEditor.mode = Mode.NORMAL()
-          KeyHandler.getInstance().reset(vimEditor)
-          
-          injector.macro.playbackRegister(vimEditor, IjEditorExecutionContext(e.dataContext), reg, 1)
-        }
-      }
-  }
-}

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

@@ -28,7 +28,6 @@ import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.group.IjOptionConstants
 import com.maddyhome.idea.vim.group.IjOptions
-import com.maddyhome.idea.vim.handler.enableOctopus
 import com.maddyhome.idea.vim.handler.isOctopusEnabled
 import com.maddyhome.idea.vim.helper.EditorHelper
 import com.maddyhome.idea.vim.helper.HandlerInjector
@@ -43,10 +42,8 @@ import com.maddyhome.idea.vim.key.ShortcutOwnerInfo
 import com.maddyhome.idea.vim.listener.AceJumpService
 import com.maddyhome.idea.vim.listener.AppCodeTemplates.appCodeTemplateCaptured
 import com.maddyhome.idea.vim.newapi.globalIjOptions
-import com.maddyhome.idea.vim.newapi.initInjector
 import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.ui.ex.ExEntryPanel
+import com.maddyhome.idea.vim.state.mode.mode
-import com.maddyhome.idea.vim.ui.ex.ExTextField
 import com.maddyhome.idea.vim.vimscript.model.datatypes.VimString
 import java.awt.event.InputEvent
 import java.awt.event.KeyEvent
@@ -61,14 +58,11 @@ import javax.swing.KeyStroke
  * This class is used in Which-Key plugin, so don't make it internal. Generally, we should provide a proper
  *   way to get ideavim keys for this plugin. See VIM-3085
  */
-class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
+public class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
-
-  init {
-    initInjector()
-  }
-
   private val traceTime: Boolean
     get() {
+      // Make sure the injector is initialized
+      VimPlugin.getInstance()
       return injector.globalOptions().ideatracetime
     }
 
@@ -84,8 +78,11 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
       // Should we use HelperKt.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
       try {
         val start = if (traceTime) System.currentTimeMillis() else null
-        val keyHandler = KeyHandler.getInstance()
+        KeyHandler.getInstance().handleKey(
-        keyHandler.handleKey(editor.vim, keyStroke, e.dataContext.vim, keyHandler.keyHandlerState)
+          editor.vim,
+          keyStroke,
+          injector.executionContextManager.onEditor(editor.vim, e.dataContext.vim),
+        )
         if (start != null) {
           val duration = System.currentTimeMillis() - start
           LOG.info("VimShortcut update '$keyStroke': $duration ms")
@@ -119,13 +116,11 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
     if (VimPlugin.isNotEnabled()) return ActionEnableStatus.no("IdeaVim is disabled", LogLevel.DEBUG)
     val editor = getEditor(e)
     if (editor != null && keyStroke != null) {
-      if (enableOctopus) {
+      if (isOctopusEnabled(keyStroke, editor)) {
-        if (isOctopusEnabled(keyStroke, editor)) {
+        return ActionEnableStatus.no(
-          return ActionEnableStatus.no(
+          "Processing VimShortcutKeyAction for the key that is used in the octopus handler",
-            "Processing VimShortcutKeyAction for the key that is used in the octopus handler",
+          LogLevel.ERROR
-            LogLevel.ERROR
+        )
-          )
-        }
       }
       if (editor.isIdeaVimDisabledHere) {
         return ActionEnableStatus.no("IdeaVim is disabled in this place", LogLevel.INFO)
@@ -258,14 +253,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
     return null
   }
 
-  private fun getEditor(e: AnActionEvent): Editor? {
+  private fun getEditor(e: AnActionEvent): Editor? = e.getData(PlatformDataKeys.EDITOR)
-    return e.getData(PlatformDataKeys.EDITOR)
-      ?: if (e.getData(PlatformDataKeys.CONTEXT_COMPONENT) is ExTextField) {
-        ExEntryPanel.getInstance().ijEditor
-      } else {
-        null
-      }
-  }
 
   /**
    * Every time the key pressed with an active lookup, there is a decision:
@@ -389,10 +377,6 @@ private class ActionEnableStatus(
     }
   }
 
-  override fun toString(): String {
-    return "ActionEnableStatus(isEnabled=$isEnabled, message='$message', logLevel=$logLevel)"
-  }
-
   companion object {
     private val LOG = logger<ActionEnableStatus>()
 

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

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

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

@@ -7,9 +7,9 @@
  */
 package com.maddyhome.idea.vim.action.change
 
-import com.intellij.openapi.command.CommandProcessor
 import com.intellij.vim.annotations.CommandOrMotion
 import com.intellij.vim.annotations.Mode
+import com.intellij.openapi.command.CommandProcessor
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
@@ -17,6 +17,7 @@ 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.handler.VimActionHandler
+import com.maddyhome.idea.vim.helper.vimStateMachine
 import com.maddyhome.idea.vim.newapi.ij
 
 @CommandOrMotion(keys = ["."], modes = [Mode.NORMAL])
@@ -24,7 +25,7 @@ internal class RepeatChangeAction : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_WRITABLE
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    val state = injector.vimState
+    val state = editor.vimStateMachine
     val lastCommand = VimRepeater.lastChangeCommand
 
     if (lastCommand == null && Extension.lastExtensionHandler == null) return false
@@ -57,11 +58,11 @@ internal class RepeatChangeAction : VimActionHandler.SingleExecution() {
       )
     } else if (!repeatHandler && lastCommand != null) {
       if (cmd.rawCount > 0) {
-        lastCommand.rawCount = cmd.count
+        lastCommand.count = cmd.count
         val arg = lastCommand.argument
         if (arg != null) {
           val mot = arg.motion
-          mot.rawCount = 0
+          mot.count = 0
         }
       }
       state.executingCommand = lastCommand

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

@@ -20,7 +20,7 @@ import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
 import com.maddyhome.idea.vim.newapi.ijOptions
 
 @CommandOrMotion(keys = ["gJ"], modes = [Mode.NORMAL])
-class DeleteJoinLinesAction : ChangeEditorActionHandler.ConditionalSingleExecution() {
+public class DeleteJoinLinesAction : ChangeEditorActionHandler.ConditionalSingleExecution() {
   override val type: Command.Type = Command.Type.DELETE
   override fun runAsMulticaret(
     editor: VimEditor,

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

@@ -19,7 +19,7 @@ import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler
 import com.maddyhome.idea.vim.newapi.ijOptions
 
 @CommandOrMotion(keys = ["J"], modes = [Mode.NORMAL])
-class DeleteJoinLinesSpacesAction : ChangeEditorActionHandler.SingleExecution() {
+public class DeleteJoinLinesSpacesAction : ChangeEditorActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.DELETE
 
   override fun execute(
@@ -34,7 +34,7 @@ class DeleteJoinLinesSpacesAction : ChangeEditorActionHandler.SingleExecution()
     }
     injector.editorGroup.notifyIdeaJoin(editor)
     var res = true
-    editor.nativeCarets().sortedByDescending { it.offset }.forEach { caret ->
+    editor.nativeCarets().sortedByDescending { it.offset.point }.forEach { caret ->
       if (!injector.changeGroup.deleteJoinLines(editor, caret, operatorArguments.count1, true, operatorArguments)) {
         res = false
       }

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

@@ -23,7 +23,7 @@ import com.maddyhome.idea.vim.newapi.ijOptions
  * @author vlan
  */
 @CommandOrMotion(keys = ["gJ"], modes = [Mode.VISUAL])
-class DeleteJoinVisualLinesAction : VisualOperatorActionHandler.SingleExecution() {
+public class DeleteJoinVisualLinesAction : VisualOperatorActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.DELETE
 
   override fun executeForAllCarets(
@@ -39,7 +39,7 @@ class DeleteJoinVisualLinesAction : VisualOperatorActionHandler.SingleExecution(
       return true
     }
     var res = true
-    editor.nativeCarets().sortedByDescending { it.offset }.forEach { caret ->
+    editor.nativeCarets().sortedByDescending { it.offset.point }.forEach { caret ->
       if (!caret.isValid) return@forEach
       val range = caretsAndSelections[caret] ?: return@forEach
       if (!injector.changeGroup.deleteJoinRange(

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

@@ -23,7 +23,7 @@ import com.maddyhome.idea.vim.newapi.ijOptions
  * @author vlan
  */
 @CommandOrMotion(keys = ["J"], modes = [Mode.VISUAL])
-class DeleteJoinVisualLinesSpacesAction : VisualOperatorActionHandler.SingleExecution() {
+public class DeleteJoinVisualLinesSpacesAction : VisualOperatorActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.DELETE
 
   override fun executeForAllCarets(
@@ -39,7 +39,7 @@ class DeleteJoinVisualLinesSpacesAction : VisualOperatorActionHandler.SingleExec
       return true
     }
     var res = true
-    editor.carets().sortedByDescending { it.offset }.forEach { caret ->
+    editor.carets().sortedByDescending { it.offset.point }.forEach { caret ->
       if (!caret.isValid) return@forEach
       val range = caretsAndSelections[caret] ?: return@forEach
       if (!injector.changeGroup.deleteJoinRange(

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

@@ -8,9 +8,10 @@
 
 package com.maddyhome.idea.vim.action.editor
 
-import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.vim.annotations.CommandOrMotion
 import com.intellij.vim.annotations.Mode
+import com.intellij.openapi.actionSystem.IdeActions
+import com.maddyhome.idea.vim.action.ComplicatedKeysAction
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.injector
@@ -20,58 +21,56 @@ import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.handler.IdeActionHandler
 import com.maddyhome.idea.vim.handler.VimActionHandler
 import com.maddyhome.idea.vim.helper.enumSetOf
+import java.awt.event.KeyEvent
 import java.util.*
+import javax.swing.KeyStroke
 
 @CommandOrMotion(keys = ["<C-H>", "<BS>"], modes = [Mode.INSERT])
-internal class VimEditorBackSpace : IdeActionHandler(IdeActions.ACTION_EDITOR_BACKSPACE) {
+internal class VimEditorBackSpace : IdeActionHandler(IdeActions.ACTION_EDITOR_BACKSPACE), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_H, KeyEvent.CTRL_DOWN_MASK)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0)),
+  )
   override val type: Command.Type = Command.Type.DELETE
 }
 
 @CommandOrMotion(keys = ["<Del>"], modes = [Mode.INSERT])
-internal class VimEditorDelete : IdeActionHandler(IdeActions.ACTION_EDITOR_DELETE) {
+internal class VimEditorDelete : IdeActionHandler(IdeActions.ACTION_EDITOR_DELETE), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0)),
+  )
   override val type: Command.Type = Command.Type.DELETE
+  override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_STROKE)
 }
 
 @CommandOrMotion(keys = ["<Down>", "<kDown>"], modes = [Mode.INSERT])
-internal class VimEditorDown : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN) {
+internal class VimEditorDown : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_DOWN), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, 0)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_KP_DOWN, 0)),
+  )
   override val type: Command.Type = Command.Type.MOTION
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_CLEAR_STROKES)
-
-  override fun execute(
-    editor: VimEditor,
-    context: ExecutionContext,
-    cmd: Command,
-    operatorArguments: OperatorArguments
-  ): Boolean {
-    val undo = injector.undo
-    val nanoTime = System.nanoTime()
-    editor.forEachCaret { undo.endInsertSequence(it, it.offset, nanoTime) }
-    return super.execute(editor, context, cmd, operatorArguments)
-  }
 }
 
 @CommandOrMotion(keys = ["<Tab>", "<C-I>"], modes = [Mode.INSERT])
-internal class VimEditorTab : IdeActionHandler(IdeActions.ACTION_EDITOR_TAB) {
+internal class VimEditorTab : IdeActionHandler(IdeActions.ACTION_EDITOR_TAB), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_I, KeyEvent.CTRL_DOWN_MASK)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0)),
+  )
   override val type: Command.Type = Command.Type.INSERT
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_SAVE_STROKE)
 }
 
 @CommandOrMotion(keys = ["<Up>", "<kUp>"], modes = [Mode.INSERT])
-internal class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_UP) {
+internal class VimEditorUp : IdeActionHandler(IdeActions.ACTION_EDITOR_MOVE_CARET_UP), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> = setOf(
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_UP, 0)),
+    listOf(KeyStroke.getKeyStroke(KeyEvent.VK_KP_UP, 0)),
+  )
   override val type: Command.Type = Command.Type.MOTION
   override val flags: EnumSet<CommandFlags> = enumSetOf(CommandFlags.FLAG_CLEAR_STROKES)
-
-  override fun execute(
-    editor: VimEditor,
-    context: ExecutionContext,
-    cmd: Command,
-    operatorArguments: OperatorArguments
-  ): Boolean {
-    val undo = injector.undo
-    val nanoTime = System.nanoTime()
-    editor.forEachCaret { undo.endInsertSequence(it, it.offset, nanoTime) }
-    return super.execute(editor, context, cmd, operatorArguments)
-  }
 }
 
 @CommandOrMotion(keys = ["K"], modes = [Mode.NORMAL])
@@ -79,7 +78,7 @@ internal class VimQuickJavaDoc : VimActionHandler.SingleExecution() {
   override val type: Command.Type = Command.Type.OTHER_READONLY
 
   override fun execute(editor: VimEditor, context: ExecutionContext, cmd: Command, operatorArguments: OperatorArguments): Boolean {
-    injector.actionExecutor.executeAction(editor, 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

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2003-2023 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package com.maddyhome.idea.vim.action.ex
+
+import com.intellij.vim.annotations.CommandOrMotion
+import com.intellij.vim.annotations.Mode
+import com.maddyhome.idea.vim.VimPlugin
+import com.maddyhome.idea.vim.action.ComplicatedKeysAction
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimEditor
+import com.maddyhome.idea.vim.command.Command
+import com.maddyhome.idea.vim.command.CommandFlags
+import com.maddyhome.idea.vim.command.OperatorArguments
+import com.maddyhome.idea.vim.handler.VimActionHandler
+import java.util.*
+import javax.swing.KeyStroke
+
+/**
+ * Called by KeyHandler to process the contents of the ex entry panel
+ *
+ * The mapping for this action means that the ex command is executed as a write action
+ */
+@CommandOrMotion(keys = ["<CR>", "<C-M>", "<C-J>"], modes = [Mode.CMD_LINE])
+public class ProcessExEntryAction : VimActionHandler.SingleExecution(), ComplicatedKeysAction {
+  override val keyStrokesSet: Set<List<KeyStroke>> =
+    parseKeysSet("<CR>", "<C-M>", 0x0a.toChar().toString(), 0x0d.toChar().toString())
+
+  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
+
+  override val flags: EnumSet<CommandFlags> = EnumSet.of(CommandFlags.FLAG_COMPLETE_EX)
+
+  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/command/CommandState.kt

@@ -9,48 +9,41 @@
 package com.maddyhome.idea.vim.command
 
 import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.KeyHandler
+import com.maddyhome.idea.vim.helper.vimStateMachine
-import com.maddyhome.idea.vim.api.injector
+import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.VimStateMachine
+import com.maddyhome.idea.vim.state.mode.SelectionType
 
 /**
  * COMPATIBILITY-LAYER: Additional class
  * Please see: https://jb.gg/zo8n0r
  */
-@Deprecated("Use `injector.vimState`")
+public class CommandState(private val machine: VimStateMachine) {
-class CommandState(private val machine: VimStateMachine) {
 
-  val mode: Mode
+  public val isOperatorPending: Boolean
+    get() = machine.isOperatorPending
+
+  public val mode: CommandState.Mode
     get() {
       val myMode = machine.mode
       return when (myMode) {
-        is com.maddyhome.idea.vim.state.mode.Mode.CMD_LINE -> Mode.CMD_LINE
+        is com.maddyhome.idea.vim.state.mode.Mode.CMD_LINE -> CommandState.Mode.CMD_LINE
-        com.maddyhome.idea.vim.state.mode.Mode.INSERT -> Mode.INSERT
+        com.maddyhome.idea.vim.state.mode.Mode.INSERT -> CommandState.Mode.INSERT
-        is com.maddyhome.idea.vim.state.mode.Mode.NORMAL -> Mode.COMMAND
+        is com.maddyhome.idea.vim.state.mode.Mode.NORMAL -> CommandState.Mode.COMMAND
-        is com.maddyhome.idea.vim.state.mode.Mode.OP_PENDING -> Mode.OP_PENDING
+        is com.maddyhome.idea.vim.state.mode.Mode.OP_PENDING -> CommandState.Mode.OP_PENDING
-        com.maddyhome.idea.vim.state.mode.Mode.REPLACE -> Mode.REPLACE
+        com.maddyhome.idea.vim.state.mode.Mode.REPLACE -> CommandState.Mode.REPLACE
-        is com.maddyhome.idea.vim.state.mode.Mode.SELECT -> Mode.SELECT
+        is com.maddyhome.idea.vim.state.mode.Mode.SELECT -> CommandState.Mode.SELECT
-        is com.maddyhome.idea.vim.state.mode.Mode.VISUAL -> Mode.VISUAL
+        is com.maddyhome.idea.vim.state.mode.Mode.VISUAL -> CommandState.Mode.VISUAL
       }
     }
 
-  @Deprecated("Use `KeyHandler.keyHandlerState.commandBuilder", ReplaceWith(
+  public val commandBuilder: CommandBuilder
-    "KeyHandler.getInstance().keyHandlerState.commandBuilder",
+    get() = machine.commandBuilder
-    "com.maddyhome.idea.vim.KeyHandler"
-  )
-  )
-  val commandBuilder: CommandBuilder
-    get() = KeyHandler.getInstance().keyHandlerState.commandBuilder
 
-  @Deprecated("Use `KeyHandler.keyHandlerState.mappingState", ReplaceWith(
+  public val mappingState: MappingState
-    "KeyHandler.getInstance().keyHandlerState.mappingState",
+    get() = machine.mappingState
-    "com.maddyhome.idea.vim.KeyHandler"
-  )
-  )
-  val mappingState: MappingState
-    get() = KeyHandler.getInstance().keyHandlerState.mappingState
 
-  enum class Mode {
+  public enum class Mode {
     // Basic modes
     COMMAND, VISUAL, SELECT, INSERT, CMD_LINE, /*EX*/
 
@@ -58,15 +51,22 @@ class CommandState(private val machine: VimStateMachine) {
     OP_PENDING, REPLACE /*, VISUAL_REPLACE*/, INSERT_NORMAL, INSERT_VISUAL, INSERT_SELECT
   }
 
-  enum class SubMode {
+  public enum class SubMode {
     NONE, VISUAL_CHARACTER, VISUAL_LINE, VISUAL_BLOCK
   }
 
-  companion object {
+  public companion object {
     @JvmStatic
-    @Deprecated("Use `injector.vimState`")
+    public fun getInstance(editor: Editor): CommandState {
-    fun getInstance(editor: Editor): CommandState {
+      return CommandState(editor.vim.vimStateMachine)
-      return CommandState(injector.vimState)
     }
   }
 }
+
+internal val CommandState.SubMode.engine: SelectionType
+  get() = when (this) {
+    CommandState.SubMode.NONE -> error("Unexpected value")
+    CommandState.SubMode.VISUAL_CHARACTER -> SelectionType.CHARACTER_WISE
+    CommandState.SubMode.VISUAL_LINE -> SelectionType.LINE_WISE
+    CommandState.SubMode.VISUAL_BLOCK -> SelectionType.BLOCK_WISE
+  }

src/main/java/com/maddyhome/idea/vim/common/CharacterPosition.kt

@@ -12,18 +12,18 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.LogicalPosition
 import com.maddyhome.idea.vim.newapi.vim
 
-class CharacterPosition(line: Int, col: Int) : LogicalPosition(line, col) {
+public class CharacterPosition(line: Int, col: Int) : LogicalPosition(line, col) {
-  fun toOffset(editor: Editor): Int = editor.vim.getLineStartOffset(line) + column
+  public fun toOffset(editor: Editor): Int = editor.vim.getLineStartOffset(line) + column
 
-  companion object {
+  public companion object {
-    fun fromOffset(editor: Editor, offset: Int): CharacterPosition {
+    public fun fromOffset(editor: Editor, offset: Int): CharacterPosition {
       // logical position "expands" tabs
       val logicalPosition = editor.offsetToLogicalPosition(offset)
       val lineStartOffset = editor.vim.getLineStartOffset(logicalPosition.line)
       return CharacterPosition(logicalPosition.line, offset - lineStartOffset)
     }
 
-    fun atCaret(editor: Editor): CharacterPosition {
+    public fun atCaret(editor: Editor): CharacterPosition {
       return fromOffset(editor, editor.caretModel.offset)
     }
   }

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

@@ -9,20 +9,22 @@
 package com.maddyhome.idea.vim.common
 
 import com.intellij.application.options.CodeStyle
+import com.intellij.openapi.actionSystem.DataContext
+import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.codeStyle.CommonCodeStyleSettings.IndentOptions
-import com.maddyhome.idea.vim.api.VimIndentConfig
 
-internal class IndentConfig private constructor(indentOptions: IndentOptions): VimIndentConfig {
+internal class IndentConfig private constructor(indentOptions: IndentOptions) {
   private val indentSize = indentOptions.INDENT_SIZE
   private val tabSize = indentOptions.TAB_SIZE
   private val isUseTabs = indentOptions.USE_TAB_CHARACTER
 
-  override fun getIndentSize(depth: Int): Int = indentSize * depth
+  fun getTotalIndent(count: Int): Int = indentSize * count
-  override fun createIndentByDepth(depth: Int): String = createIndentBySize(getIndentSize(depth))
 
-  override fun createIndentBySize(size: Int): String {
+  fun createIndentByCount(count: Int): String = createIndentBySize(getTotalIndent(count))
+
+  fun createIndentBySize(size: Int): String {
     val tabCount: Int
     val spaceCount: Int
     if (isUseTabs) {
@@ -37,12 +39,13 @@ internal class IndentConfig private constructor(indentOptions: IndentOptions): V
 
   companion object {
     @JvmStatic
-    fun create(editor: Editor): IndentConfig {
+    fun create(editor: Editor, context: DataContext): IndentConfig {
-      return create(editor, editor.project)
+      return create(editor, PlatformDataKeys.PROJECT.getData(context))
     }
 
     @JvmStatic
-    fun create(editor: Editor, project: Project?): IndentConfig {
+    @JvmOverloads
+    fun create(editor: Editor, project: Project? = editor.project): IndentConfig {
       val indentOptions = if (project != null) {
         CodeStyle.getIndentOptions(project, editor.document)
       } else {

src/main/java/com/maddyhome/idea/vim/config/VimState.kt

@@ -18,8 +18,6 @@ import kotlin.reflect.KProperty
 internal class VimState {
   var isIdeaJoinNotified by StateProperty("idea-join")
   var isIdeaPutNotified by StateProperty("idea-put")
-  var isNewUndoNotified by StateProperty("idea-undo")
-  var wasSubscibedToEAPAutomatically by StateProperty("was-automatically-subscribed-to-eap")
 
   fun readData(element: Element) {
     val notifications = element.getChild("notifications")

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

@@ -9,142 +9,40 @@ package com.maddyhome.idea.vim.ex
 
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.api.VimOutputPanelBase
+import com.maddyhome.idea.vim.api.VimExOutputPanel
-import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.helper.vimExOutput
 import com.maddyhome.idea.vim.ui.ExOutputPanel
-import java.lang.ref.WeakReference
-import javax.swing.KeyStroke
 
-// TODO: We need a nicer way to handle output, especially wrt testing, appending + clearing
+/**
-class ExOutputModel(private val myEditor: WeakReference<Editor>) : VimOutputPanelBase() {
+ * @author vlan
-  private var isActiveInTestMode = false
+ */
+public class ExOutputModel private constructor(private val myEditor: Editor) : VimExOutputPanel {
+  override var text: String? = null
+    private set
 
-  val editor get() = myEditor.get()
+  override fun output(text: String) {
-
-  val isActive: Boolean
-    get() = if (!ApplicationManager.getApplication().isUnitTestMode) {
-      editor?.let { ExOutputPanel.getNullablePanel(it) }?.myActive ?: false
-    } else {
-      isActiveInTestMode
-    }
-
-  override fun addText(text: String, isNewLine: Boolean) {
-    if (this.text.isNotEmpty() && isNewLine) this.text += "\n$text" else this.text += text
-  }
-
-  override fun show() {
-    if (editor == null) return
-    val currentPanel = injector.outputPanel.getCurrentOutputPanel()
-    if (currentPanel != null && currentPanel != this) currentPanel.close()
-
-    editor!!.vimExOutput = this
-    val exOutputPanel = ExOutputPanel.getInstance(editor!!)
-    if (!exOutputPanel.myActive) {
-      if (ApplicationManager.getApplication().isUnitTestMode) {
-        isActiveInTestMode = true
-      } else {
-        exOutputPanel.activate()
-      }
-    }
-  }
-
-  override fun scrollPage() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.scrollPage()
-  }
-
-  override fun scrollHalfPage() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.scrollHalfPage()
-  }
-
-  override fun scrollLine() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.scrollLine()
-  }
-
-  override var text: String = ""
-    get() = if (!ApplicationManager.getApplication().isUnitTestMode) {
-      editor?.let { ExOutputPanel.getInstance(it).text } ?: ""
-    } else {
-      // ExOutputPanel always returns a non-null string
-      field
-    }
-    set(value) {
-      // ExOutputPanel will strip a trailing newline. We'll do it now so that tests have the same behaviour. We also
-      // never pass null to ExOutputPanel, but we do store it for tests, so we know if we're active or not
-      val newValue = value.removeSuffix("\n")
-      if (!ApplicationManager.getApplication().isUnitTestMode) {
-        editor?.let { ExOutputPanel.getInstance(it).setText(newValue) }
-      } else {
-        field = newValue
-        isActiveInTestMode = newValue.isNotEmpty()
-      }
-    }
-  override var label: String
-    get() {
-      val notNullEditor = editor ?: return ""
-      val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return ""
-      return panel.myLabel.text
-    }
-    set(value) {
-      val notNullEditor = editor ?: return
-      val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-      panel.myLabel.text = value
-    }
-
-  fun output(text: String) {
     this.text = text
-  }
-
-  fun clear() {
-    text = ""
-  }
-
-  override val atEnd: Boolean
-    get() {
-      val notNullEditor = editor ?: return false
-      val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return false
-      return panel.isAtEnd()
-    }
-
-  override fun onBadKey() {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.onBadKey()
-  }
-
-  override fun close(key: KeyStroke?) {
-    val notNullEditor = editor ?: return
-    val panel = ExOutputPanel.getNullablePanel(notNullEditor) ?: return
-    panel.close(key)
-  }
-
-  override fun close() {
     if (!ApplicationManager.getApplication().isUnitTestMode) {
-      editor?.let { ExOutputPanel.getInstance(it).close() }
+      ExOutputPanel.getInstance(myEditor).setText(text)
-    }
-    else {
-      isActiveInTestMode = false
     }
   }
 
-  companion object {
+  override fun clear() {
+    text = null
+    if (!ApplicationManager.getApplication().isUnitTestMode) {
+      ExOutputPanel.getInstance(myEditor).deactivate(false)
+    }
+  }
+
+  public companion object {
     @JvmStatic
-    fun getInstance(editor: Editor): ExOutputModel {
+    public fun getInstance(editor: Editor): ExOutputModel {
       var model = editor.vimExOutput
       if (model == null) {
-        model = ExOutputModel(WeakReference(editor))
+        model = ExOutputModel(editor)
         editor.vimExOutput = model
       }
       return model
     }
-
-    @JvmStatic
-    fun tryGetInstance(editor: Editor) = editor.vimExOutput
   }
 }