Set plugin version to chylex-15

Remove update checker
[VIM-696] Restore visual mode after undo/redo, and disable incompatible actions
2024-10-18 19:42:46 +02:00 · 2023-01-02 01:16:20 +01:00 · 2023-01-02 01:16:19 +01:00 · 2023-01-02 01:10:45 +01:00 · 2023-01-02 01:10:44 +01:00 · 2023-01-02 01:10:44 +01:00
1335 changed files with 54250 additions and 78929 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -7,4 +7,3 @@ indent_style = space
 [*.kt]
 indent_size = 2
 indent_style = space
-ktlint_standard_no-wildcard-imports = disabled
--- a/.github/workflows/closeYoutrackOnCommit.yml
+++ b/.github/workflows/closeYoutrackOnCommit.yml
@ -14,11 +14,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
        with:
          fetch-depth: 300
-      - name: Get tags
-        run: git fetch --tags origin
      - name: Set up JDK 11
        uses: actions/setup-java@v2
        with:
@ -27,20 +25,15 @@ jobs:
          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
          settings-path: ${{ github.workspace }} # location for the settings.xml file

-        # The last successful job was marked with a tag
-      - name: Get commit with last workflow
-        run: |
-          echo "LAST_COMMIT=$(git rev-list -n 1 tags/workflow-close-youtrack)" >> $GITHUB_ENV
+      - uses: nrwl/last-successful-commit-action@v1
+        id: last_successful_commit
+        with:
+          branch: 'master'
+          workflow_id: 'closeYoutrackOnCommit.yml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

      - name: Update YouTrack
        run: ./gradlew updateYoutrackOnCommit
        env:
-          SUCCESS_COMMIT: ${{ env.LAST_COMMIT }}
+          SUCCESS_COMMIT: ${{ steps.last_successful_commit.outputs.commit_hash }}
          YOUTRACK_TOKEN: ${{ secrets.YOUTRACK_TOKEN }}
-
-      - name: Update tags
-        run: |
-          git tag --delete workflow-close-youtrack || true
-          git push origin :refs/tags/workflow-close-youtrack || true
-          git tag workflow-close-youtrack
-          git push origin workflow-close-youtrack
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -39,7 +39,7 @@ jobs:

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@ -50,7 +50,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v1

    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@ -64,4 +64,4 @@ jobs:
    #   make release

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/integrationsTest.yml
+++ b/.github/workflows/integrationsTest.yml
@ -29,4 +29,4 @@ jobs:
        run: ./gradlew integrationsTest
        env:
          YOUTRACK_TOKEN: ${{ secrets.YOUTRACK_TOKEN }}
-          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_OAUTH: ${{ secrets.MERGE_PR }}
--- a/.github/workflows/mergeDependabotPR.yml
+++ b/.github/workflows/mergeDependabotPR.yml
@ -1,17 +0,0 @@
-name: Dependabot auto-merge
-on: pull_request
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Auto-merge Dependabot PR
-        run: gh pr merge --auto --rebase "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
--- a/.github/workflows/mergePr.yml
+++ b/.github/workflows/mergePr.yml
@ -18,8 +18,6 @@ jobs:
      - uses: actions/checkout@v2
        with:
          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 11
        uses: actions/setup-java@v2
        with:
@ -34,12 +32,25 @@ jobs:
        env:
          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}

+      # Reuse from update changelog
+      - uses: nrwl/last-successful-commit-action@v1
+        id: last_successful_commit
+        with:
+          branch: 'master'
+          workflow_id: 'updateChangelog.yml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update changelog
+        run: ./gradlew updateChangelog
+        env:
+          SUCCESS_COMMIT: ${{ steps.last_successful_commit.outputs.commit_hash }}
+
      - name: Commit changes
        uses: stefanzweifel/git-auto-commit-action@v4
        with:
          branch: master
          commit_message: Update changelog after merging PR
-          commit_user_name: IdeaVim Bot
-          commit_user_email: maintainers@ideavim.dev
-          commit_author: IdeaVim Bot <maintainers@ideavim.dev>
+          commit_user_name: Alex Plate
+          commit_user_email: aleksei.plate@jetbrains.com
+          commit_author: Alex Plate <aleksei.plate@jetbrains.com>
          file_pattern: CHANGES.md
--- a/.github/workflows/syncDoc.yml
+++ b/.github/workflows/syncDoc.yml
@ -20,8 +20,6 @@ jobs:
        uses: actions/checkout@v3
        with:
          path: origin
-          # See end of file updateChangeslog.yml for explanation of this secret
-          ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}

      - name: Fetch docs repo
        uses: actions/checkout@v3
@ -39,6 +37,6 @@ jobs:
          branch: master
          repository: docs
          commit_message: Update docs
-          commit_user_name: IdeaVim Bot
-          commit_user_email: maintainers@ideavim.dev
-          commit_author: IdeaVim Bot <maintainers@ideavim.dev>
+          commit_user_name: Alex Plate
+          commit_user_email: aleksei.plate@jetbrains.com
+          commit_author: Alex Plate <aleksei.plate@jetbrains.com>
--- a/.github/workflows/updateAffectedRate.yml
+++ b/.github/workflows/updateAffectedRate.yml
@ -1,33 +0,0 @@
-# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
-# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
-
-# 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
-
-    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 }}
--- a/.github/workflows/updateAuthors.yml
+++ b/.github/workflows/updateAuthors.yml
@ -5,11 +5,8 @@ name: Update Authors

 on:
  workflow_dispatch:
-  schedule:
-    - cron: '0 9 * * *'
-# Workflow run on push is disabled to avoid conflicts when merging PR
-#  push:
-#    branches: [ master ]
+  push:
+    branches: [ master ]

 jobs:
  build:
@ -17,13 +14,9 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
        with:
          fetch-depth: 300
-          # See end of file updateChangeslog.yml for explanation of this secret
-          ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
-      - name: Get tags
-        run: git fetch --tags origin
      - name: Set up JDK 11
        uses: actions/setup-java@v2
        with:
@ -32,30 +25,25 @@ jobs:
          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
          settings-path: ${{ github.workspace }} # location for the settings.xml file

-        # The last successful job was marked with a tag
-      - name: Get commit with last workflow
-        run: |
-          echo "LAST_COMMIT=$(git rev-list -n 1 tags/workflow-authors)" >> $GITHUB_ENV
+      - uses: nrwl/last-successful-commit-action@v1
+        id: last_successful_commit
+        with:
+          branch: 'master'
+          workflow_id: 'updateAuthors.yml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

      - name: Update authors
        id: update_authors
        run: ./gradlew updateAuthors --stacktrace
        env:
-          SUCCESS_COMMIT: ${{ env.LAST_COMMIT }}
+          SUCCESS_COMMIT: ${{ steps.last_successful_commit.outputs.commit_hash }}
          GITHUB_OAUTH: ${{ secrets.GITHUB_TOKEN }}

      - name: Commit changes
        uses: stefanzweifel/git-auto-commit-action@v4
        with:
          commit_message: Add ${{ steps.update_authors.outputs.authors }} to contributors list
-          commit_user_name: IdeaVim Bot
-          commit_user_email: maintainers@ideavim.dev
-          commit_author: IdeaVim Bot <maintainers@ideavim.dev>
+          commit_user_name: Alex Plate
+          commit_user_email: aleksei.plate@jetbrains.com
+          commit_author: Alex Plate <aleksei.plate@jetbrains.com>
          file_pattern: AUTHORS.md
-
-      - name: Update tags
-        run: |
-          git tag --delete workflow-authors || true
-          git push origin :refs/tags/workflow-authors || true
-          git tag workflow-authors
-          git push origin workflow-authors
--- a/.github/workflows/updateChangelog.yml
+++ b/.github/workflows/updateChangelog.yml
@ -5,25 +5,19 @@ name: Update Changelog

 on:
  workflow_dispatch:
-  schedule:
-    - cron: '0 10 * * *'
-# Workflow run on push is disabled to avoid conflicts when merging PR
-#  push:
-#    branches: [ master ]
+  push:
+    branches: [ master ]

 jobs:
  build:

+    if: github.event.pull_request.merged != true
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
        with:
          fetch-depth: 300
-          # See end of file updateChangeslog.yml for explanation of this secret
-          ssh-key: ${{ secrets.PUSH_TO_PROTECTED_BRANCH_SECRET }}
-      - name: Get tags
-        run: git fetch --tags origin
      - name: Set up JDK 11
        uses: actions/setup-java@v2
        with:
@ -32,34 +26,24 @@ jobs:
          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
          settings-path: ${{ github.workspace }} # location for the settings.xml file

-        # The last successful job was marked with a tag
-      - name: Get commit with last workflow
-        run: |
-          echo "LAST_COMMIT=$(git rev-list -n 1 tags/workflow-changelog)" >> $GITHUB_ENV
+      - uses: nrwl/last-successful-commit-action@v1
+        id: last_successful_commit
+        with:
+          branch: 'master'
+          workflow_id: 'updateChangelog.yml'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

      - name: Update changelog
        run: ./gradlew updateChangelog
        env:
-          SUCCESS_COMMIT: ${{ env.LAST_COMMIT }}
+          SUCCESS_COMMIT: ${{ steps.last_successful_commit.outputs.commit_hash }}

      - name: Commit changes
        uses: stefanzweifel/git-auto-commit-action@v4
        with:
-          commit_message: Update changelog. Action id - ${{ github.run_id }}
-          commit_user_name: IdeaVim Bot
-          commit_user_email: maintainers@ideavim.dev
-          commit_author: IdeaVim Bot <maintainers@ideavim.dev>
+          commit_message: Update changelog
+          commit_user_name: Alex Plate
+          commit_user_email: aleksei.plate@jetbrains.com
+          commit_author: Alex Plate <aleksei.plate@jetbrains.com>
          file_pattern: CHANGES.md
-
-      - name: Update tags
-        run: |
-          git tag --delete workflow-changelog || true
-          git push origin :refs/tags/workflow-changelog || true
-          git tag workflow-changelog
-          git push origin workflow-changelog
-
-# Regarding secrets.PUSH_TO_PROTECTED_BRANCH_SECRET - we use branch protection rules to automate merges of the
-#   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
+          skip_fetch: false
--- a/.github/workflows/updateFormatting.yml
+++ b/.github/workflows/updateFormatting.yml
@ -17,8 +17,6 @@ jobs:
      - uses: actions/checkout@v2
        with:
          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 11
        uses: actions/setup-java@v2
        with:
@ -27,15 +25,13 @@ jobs:
          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
          settings-path: ${{ github.workspace }} # location for the settings.xml file

-      - uses: findologic/intellij-format-action@1.0.1
-        with:
-          include-glob: '*.kt,*.java'
-          path: .
+      - name: Format files
+        run: ./gradlew ktlintFormat

      - name: Commit changes
        uses: stefanzweifel/git-auto-commit-action@v4
        with:
          commit_message: Update formatting
-          commit_user_name: IdeaVim Bot
-          commit_user_email: maintainers@ideavim.dev
-          commit_author: IdeaVim Bot <maintainers@ideavim.dev>
+          commit_user_name: Alex Plate
+          commit_user_email: aleksei.plate@jetbrains.com
+          commit_author: Alex Plate <aleksei.plate@jetbrains.com>
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -6,7 +6,6 @@
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </value>
    </option>
-    <option name="LINE_SEPARATOR" value="&#10;" />
    <JavaCodeStyleSettings>
      <option name="FIELD_NAME_PREFIX" value="my" />
      <option name="STATIC_FIELD_NAME_PREFIX" value="our" />
@ -192,10 +191,6 @@
    </codeStyleSettings>
    <codeStyleSettings language="kotlin">
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
    </codeStyleSettings>
  </code_scheme>
 </component>
--- a/.idea/copyright/IdeaVim.xml
+++ b/.idea/copyright/IdeaVim.xml
@ -1,6 +1,6 @@
 <component name="CopyrightManager">
  <copyright>
-    <option name="notice" value="Copyright 2003-2023 The IdeaVim authors&#10;&#10;Use of this source code is governed by an MIT-style&#10;license that can be found in the LICENSE.txt file or at&#10;https://opensource.org/licenses/MIT." />
+    <option name="notice" value="Copyright 2003-2022 The IdeaVim authors&#10;&#10;Use of this source code is governed by an MIT-style&#10;license that can be found in the LICENSE.txt file or at&#10;https://opensource.org/licenses/MIT." />
    <option name="myName" value="IdeaVim" />
  </copyright>
 </component>
--- a/.idea/scopes/Copyright.xml
+++ b/.idea/scopes/Copyright.xml
@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="Copyright" pattern="file:*/&amp;&amp;!file:.github//*&amp;&amp;!file:.idea//*&amp;&amp;!file:.teamcity//*&amp;&amp;!file:assets//*&amp;&amp;!file:config//*&amp;&amp;!file:doc//*&amp;&amp;!file:gradle//*&amp;&amp;!file:gradlew&amp;&amp;!file:gradlew.bat&amp;&amp;!file:src/main/resources//*&amp;&amp;!file:antlr//*&amp;&amp;!file:java/com/maddyhome/idea/vim/regexp/RegExp.kt&amp;&amp;!file:java/com/maddyhome/idea/vim/ui/Tutor.kt&amp;&amp;!file:java/com/maddyhome/idea/vim/helper/ScrollViewHelper.kt" />
+  <scope name="Copyright" pattern="file:*/&amp;&amp;!file:.github//*&amp;&amp;!file:.idea//*&amp;&amp;!file:.teamcity//*&amp;&amp;!file:assets//*&amp;&amp;!file:config//*&amp;&amp;!file:doc//*&amp;&amp;!file:gradle//*&amp;&amp;!file:gradlew&amp;&amp;!file:gradlew.bat&amp;&amp;!file:src/main/resources//*&amp;&amp;!file:antlr//*&amp;&amp;!file:java/com/maddyhome/idea/vim/regexp/RegExp.kt" />
 </component>
--- a/.teamcity/_Self/Constants.kt
+++ b/.teamcity/_Self/Constants.kt
@ -5,15 +5,16 @@ object Constants {
  const val EAP_CHANNEL = "eap"
  const val DEV_CHANNEL = "Dev"

-  const val VERSION = "2.4.0"
+  const val VERSION = "2.0.0"
+  const val DEV_VERSION = "2.1.0"

  const val GITHUB_TESTS = "LATEST-EAP-SNAPSHOT"
  const val NVIM_TESTS = "LATEST-EAP-SNAPSHOT"
  const val PROPERTY_TESTS = "LATEST-EAP-SNAPSHOT"
  const val LONG_RUNNING_TESTS = "LATEST-EAP-SNAPSHOT"
  const val QODANA_TESTS = "LATEST-EAP-SNAPSHOT"
-  const val RELEASE = "2023.1.2"
+  const val RELEASE = "LATEST-EAP-SNAPSHOT"

-  const val RELEASE_DEV = "2023.1.2"
-  const val RELEASE_EAP = "2023.1.2"
+  const val RELEASE_DEV = "LATEST-EAP-SNAPSHOT"
+  const val RELEASE_EAP = "LATEST-EAP-SNAPSHOT"
 }
--- a/.teamcity/_Self/Project.kt
+++ b/.teamcity/_Self/Project.kt
@ -6,25 +6,33 @@ import _Self.buildTypes.Nvim
 import _Self.buildTypes.PluginVerifier
 import _Self.buildTypes.PropertyBased
 import _Self.buildTypes.Qodana
-import _Self.buildTypes.TestingBuildType
+import _Self.buildTypes.TestsForIntelliJ20222
+import _Self.buildTypes.TestsForIntelliJEAP
 import _Self.subprojects.GitHub
 import _Self.subprojects.OldTests
 import _Self.subprojects.Releases
-import _Self.vcsRoots.GitHubPullRequest
-import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import _Self.vcsRoots.*
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project

 object Project : Project({
-  description = "Vim engine for IDEs based on the IntelliJ platform"
+  description = "Vim emulation plugin for the IntelliJ platform products"

  subProjects(Releases, OldTests, GitHub)

  // VCS roots
+  vcsRoot(Branch_183)
+  vcsRoot(Branch_181)
+  vcsRoot(Branch_191_193)
+  vcsRoot(Branch_201)
+  vcsRoot(Branch_202)
+  vcsRoot(Branch_203_212)
+  vcsRoot(Branch_213_221)
+  vcsRoot(Branch_222)
+  vcsRoot(Branch_Release)
  vcsRoot(GitHubPullRequest)

-  // Active tests
-  buildType(TestingBuildType("Latest EAP", "<default>", version = "LATEST-EAP-SNAPSHOT"))
-  buildType(TestingBuildType("Latest EAP With Xorg", "<default>", version = "LATEST-EAP-SNAPSHOT"))
+  // Builds
+  buildType(TestsForIntelliJEAP)

  buildType(PropertyBased)
  buildType(LongRunning)
@ -34,22 +42,52 @@ object Project : Project({
  buildType(Compatibility)

  buildType(Qodana)
+
+  // Unknown staff generated by TeamCity
+  features {
+    feature {
+      type = "CloudImage"
+      id = "PROJECT_EXT_768"
+      param("agent_pool_id", "41")
+      param("amazon-id", "ami-0fa17ce8238eb8868")
+      param("ebs-optimized", "false")
+      param("image-instances-limit", "")
+      param("image-name-prefix", "BuildAgentsIdeaVim")
+      param("instance-type", "c5d.xlarge")
+      param("key-pair-name", "teamcity-prod-pub")
+      param("profileId", "amazon-48")
+      param("security-group-ids", "sg-eda08696,sg-7332cf0f,")
+      param("source-id", "BuildAgentsIdeaVim")
+      param("spot-instance-price", "0.12")
+      param("subnet-id", "subnet-58839511")
+      param("use-spot-instances", "true")
+      param("user-tags", "project=idea-vim")
+      param("key-pair-name", "")
+      param("spot-instance-price", "")
+    }
+    feature {
+      type = "CloudProfile"
+      id = "amazon-48"
+      param("agentPushPreset", "")
+      param("cloud-code", "amazon")
+      param("description", "")
+      param("enabled", "true")
+      param("max-running-instances", "10")
+      param("name", "Cloud Agents")
+      param("next-hour", "")
+      param("not-checked", "")
+      param("profileId", "amazon-48")
+      param("profileServerUrl", "")
+      param("region", "eu-west-1")
+      param("secure:access-id", "credentialsJSON:dbcdb2a2-de5f-4bc9-9421-292b19e83947")
+      param("secure:secret-key", "credentialsJSON:65a87fe7-0977-4af9-96f1-344f2b82d269")
+      param("system.cloud.profile_id", "amazon-48")
+      param("terminate-idle-time", "15")
+      param("total-work-time", "")
+      param("user-script", "")
+      param("spot-fleet-config", "")
+      param("terminate-after-build", "true")
+      param("name", "Cloud Agents - Single Build")
+    }
+  }
 })
-
-// Common build type for all configurations
-abstract class IdeaVimBuildType(init: BuildType.() -> Unit) : BuildType({
-  init()
-
-  requirements {
-    // These requirements define Linux-Medium configuration.
-    // Unfortunately, requirement by name (teamcity.agent.name) doesn't work
-    //   IDK the reason for it, but on our agents this property is empty
-    equals("teamcity.agent.hardware.cpuCount", "4")
-    equals("teamcity.agent.os.family", "Linux")
-  }
-
-  failureConditions {
-    // Disable detection of the java OOM
-    javaCrash = false
-  }
-})
--- a/.teamcity/_Self/buildTypes/TestingBuildType.kt
+++ b/.teamcity/_Self/buildTypes/TestingBuildType.kt
@ -1,8 +1,6 @@
-@file:Suppress("ClassName")
-
 package _Self.buildTypes

-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
@ -10,47 +8,39 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailu
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

-open class TestingBuildType(
-  private val testName: String,
-  private val branch: String,
-  private val version: String = testName,
-  private val javaVersion: String? = null,
-  private val javaPlugin: Boolean = true,
-) : IdeaVimBuildType({
-  id("IdeaVimTests_${testName.vanish()}")
-  name = "Tests for IntelliJ $testName"
-
+sealed class ActiveTests(buildName: String, ijVersion: String) : BuildType({
+  name = buildName
  params {
    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
-    param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", javaPlugin.not().toString())
-    param("env.ORG_GRADLE_PROJECT_ideaVersion", version)
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", ijVersion)
    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
-    if (javaVersion != null) {
-      param("env.ORG_GRADLE_PROJECT_javaVersion", javaVersion)
-    }
  }

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:$branch"

    checkoutMode = CheckoutMode.AUTO
  }

  steps {
    gradle {
-      tasks = "clean test"
+      tasks = "clean check -x ktlintMainSourceSetCheck -x ktlintTestSourceSetCheck"
      buildFile = ""
      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
    }
  }

  triggers {
    vcs {
-      branchFilter = "+:$branch"
+      branchFilter = ""
    }
  }

+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
  failureConditions {
    failOnMetricChange {
      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
@ -64,9 +54,4 @@ open class TestingBuildType(
  }
 })

-private fun String.vanish(): String {
-  return this
-    .replace(' ', '_')
-    .replace('.', '_')
-    .replace('-', '_')
-}
+object TestsForIntelliJEAP : ActiveTests("Tests for IntelliJ Latest EAP", "LATEST-EAP-SNAPSHOT")
--- a/.teamcity/_Self/buildTypes/Compatibility.kt
+++ b/.teamcity/_Self/buildTypes/Compatibility.kt
@ -1,46 +1,31 @@
 package _Self.buildTypes

-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.golang
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule

-object Compatibility : IdeaVimBuildType({
+object Compatibility : BuildType({
  id("IdeaVimCompatibility")
  name = "IdeaVim compatibility with external plugins"

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"
  }

  steps {
-    script {
-      name = "Load Verifier"
-      scriptContent = """
-        mkdir verifier1
-        curl -f -L -o verifier1/verifier-cli-dev-all-1.jar "https://packages.jetbrains.team/files/p/ideavim/plugin-verifier/verifier-cli-dev-all-1.jar"
-      """.trimIndent()
-    }
    script {
      name = "Check"
      scriptContent = """
-              # We use a custom build of verifier that downloads IdeaVim from dev channel
-              # To create a custom build: Download plugin verifier repo, add an if that switches to dev channel for IdeaVim repo
-              # At the moment it's com.jetbrains.pluginverifier.repository.repositories.marketplace.MarketplaceRepository#getLastCompatibleVersionOfPlugin
-              # Build using gradlew :intellij-plugin-verifier:verifier-cli:shadowJar
-              # Upload verifier-cli-dev-all.jar artifact to the repo in IdeaVim space repo
-              
-              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.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
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}org.jetbrains.IdeaVim-EasyMotion' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}io.github.mishkun.ideavimsneak' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.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 verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
            """.trimIndent()
    }
  }
--- a/.teamcity/_Self/buildTypes/GithubTests.kt
+++ b/.teamcity/_Self/buildTypes/GithubTests.kt
@ -0,0 +1,77 @@
+package _Self.buildTypes
+
+import _Self.Constants.GITHUB_TESTS
+import _Self.vcsRoots.GitHubPullRequest
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object GithubTests : Github("clean test", "Tests")
+
+sealed class Github(command: String, desc: String) : BuildType({
+  name = "GitHub Pull Requests $desc"
+  description = "Test GitHub pull requests $desc"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", GITHUB_TESTS)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(GitHubPullRequest)
+
+    checkoutMode = CheckoutMode.AUTO
+    branchFilter = """
+            +:*
+            -:<default>
+        """.trimIndent()
+  }
+
+  steps {
+    gradle {
+      tasks = command
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
+      branchFilter = ""
+    }
+  }
+
+  features {
+    pullRequests {
+      provider = github {
+        authType = token {
+          token = "credentialsJSON:43afd6e5-6ad5-4d12-a218-cf1547717a7f"
+        }
+        filterTargetBranch = "refs/heads/master"
+        filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
+      }
+    }
+    commitStatusPublisher {
+      vcsRootExtId = "${GitHubPullRequest.id}"
+      publisher = github {
+        githubUrl = "https://api.github.com"
+        authType = personalToken {
+          token = "credentialsJSON:43afd6e5-6ad5-4d12-a218-cf1547717a7f"
+        }
+      }
+      param("github_oauth_user", "AlexPl292")
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+})
--- a/.teamcity/_Self/buildTypes/LongRunning.kt
+++ b/.teamcity/_Self/buildTypes/LongRunning.kt
@ -1,14 +1,13 @@
 package _Self.buildTypes

 import _Self.Constants.LONG_RUNNING_TESTS
-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

-object LongRunning : IdeaVimBuildType({
+object LongRunning : BuildType({
  name = "Long running tests"
  params {
    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
@ -18,7 +17,6 @@ object LongRunning : IdeaVimBuildType({

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"

    checkoutMode = CheckoutMode.AUTO
  }
@ -28,19 +26,17 @@ object LongRunning : IdeaVimBuildType({
      tasks = "clean testLongRunning"
      buildFile = ""
      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
    }
  }

  triggers {
    vcs {
-      enabled = false
-      branchFilter = "+:<default>"
-    }
-    schedule {
-      enabled = true
-      schedulingPolicy = daily {
-        hour = 5
-      }
+      branchFilter = ""
    }
  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
 })
--- a/.teamcity/_Self/buildTypes/Nvim.kt
+++ b/.teamcity/_Self/buildTypes/Nvim.kt
@ -1,7 +1,7 @@
 package _Self.buildTypes

 import _Self.Constants.NVIM_TESTS
-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
@ -10,7 +10,7 @@ import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailu
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

-object Nvim : IdeaVimBuildType({
+object Nvim : BuildType({
  name = "Tests with nvim"
  description = "Running tests with nvim integration"

@ -23,7 +23,6 @@ object Nvim : IdeaVimBuildType({

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"

    checkoutMode = CheckoutMode.AUTO
  }
@ -42,15 +41,20 @@ object Nvim : IdeaVimBuildType({
      tasks = "clean testWithNeovim"
      buildFile = ""
      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
    }
  }

  triggers {
    vcs {
-      branchFilter = "+:<default>"
+      branchFilter = ""
    }
  }

+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
  failureConditions {
    failOnMetricChange {
      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
--- a/.teamcity/_Self/buildTypes/PluginVerifier.kt
+++ b/.teamcity/_Self/buildTypes/PluginVerifier.kt
@ -1,12 +1,12 @@
 package _Self.buildTypes

-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

-object PluginVerifier : IdeaVimBuildType({
+object PluginVerifier : BuildType({
  name = "Plugin verification"
  params {
    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
@ -15,7 +15,6 @@ object PluginVerifier : IdeaVimBuildType({

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"

    checkoutMode = CheckoutMode.AUTO
  }
@ -25,12 +24,17 @@ object PluginVerifier : IdeaVimBuildType({
      tasks = "clean runPluginVerifier"
      buildFile = ""
      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
    }
  }

  triggers {
    vcs {
-      branchFilter = "+:<default>"
+      branchFilter = ""
    }
  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
 })
--- a/.teamcity/_Self/buildTypes/PropertyBased.kt
+++ b/.teamcity/_Self/buildTypes/PropertyBased.kt
@ -1,13 +1,13 @@
 package _Self.buildTypes

 import _Self.Constants.PROPERTY_TESTS
-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

-object PropertyBased : IdeaVimBuildType({
+object PropertyBased : BuildType({
  name = "Property based tests"
  params {
    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
@ -17,7 +17,6 @@ object PropertyBased : IdeaVimBuildType({

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"

    checkoutMode = CheckoutMode.AUTO
  }
@ -27,12 +26,17 @@ object PropertyBased : IdeaVimBuildType({
      tasks = "clean testPropertyBased"
      buildFile = ""
      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
    }
  }

  triggers {
    vcs {
-      branchFilter = "+:<default>"
+      branchFilter = ""
    }
  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
 })
--- a/.teamcity/_Self/buildTypes/PublishVimEngine.kt
+++ b/.teamcity/_Self/buildTypes/PublishVimEngine.kt
@ -1,63 +0,0 @@
-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.ParameterDisplay
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
-import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
-import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.ScheduleTrigger
-import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
-
-object PublishVimEngine : IdeaVimBuildType({
-  name = "Publish vim-engine"
-  description = "Build and publish vim-engine library"
-
-  artifactRules = "build/distributions/*"
-  buildNumberPattern = "0.0.%build.counter%"
-
-  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:790b4e43-ee83-4184-b81b-678afab60409", display = ParameterDisplay.HIDDEN)
-    param("env.ORG_GRADLE_PROJECT_spaceUsername", "Aleksei.Plate")
-  }
-
-  vcs {
-    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"
-
-    checkoutMode = CheckoutMode.AUTO
-  }
-
-  steps {
-    gradle {
-      tasks = ":vim-engine:publish"
-      buildFile = ""
-      enableStacktrace = true
-    }
-  }
-
-  triggers {
-    schedule {
-      enabled = true
-      schedulingPolicy = weekly {
-        dayOfWeek = ScheduleTrigger.DAY.Sunday
-      }
-      branchFilter = ""
-    }
-  }
-
-  failureConditions {
-    failOnMetricChange {
-      metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
-      threshold = 5
-      units = BuildFailureOnMetric.MetricUnit.PERCENTS
-      comparison = BuildFailureOnMetric.MetricComparison.DIFF
-      compareTo = build {
-        buildRule = lastSuccessful()
-      }
-    }
-  }
-})
--- a/.teamcity/_Self/buildTypes/Qodana.kt
+++ b/.teamcity/_Self/buildTypes/Qodana.kt
@ -1,18 +1,18 @@
 package _Self.buildTypes

 import _Self.Constants.QODANA_TESTS
-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.Qodana
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.ScheduleTrigger
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

-object Qodana : IdeaVimBuildType({
+object Qodana : BuildType({
  name = "Qodana checks"
  params {
    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
@ -22,48 +22,48 @@ object Qodana : IdeaVimBuildType({

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"

    checkoutMode = CheckoutMode.AUTO
  }

  steps {
-    gradle {
-      name = "Generate grammar"
-      tasks = "generateGrammarSource"
-    }
    qodana {
      name = "Qodana"
-      param("clonefinder-languages", "")
-      param("collect-anonymous-statistics", "")
-      param("licenseaudit-enable", "")
-      param("clonefinder-languages-container", "")
-      param("linterVersion", "")
-      param("clonefinder-queried-project", "")
-      param("clonefinder-enable", "")
-      param("clonefinder-reference-projects", "")
+/*
+      reportAsTestsEnable = ""
+      failBuildOnErrors = ""
+      codeInspectionXmlConfig = "Custom"
+      codeInspectionCustomXmlConfigPath = ".idea/inspectionProfiles/Qodana.xml"
+      reportAsTestsEnable = "true"
+*/
+      clearConditions()
+      param("licenseaudit-enable", "true")
+      param("clonefinder-languages", "Java")
+      param("clonefinder-mode", "")
+      param("report-version", "")
+      param("clonefinder-languages-container", "Java Kotlin")
+      param("namesAndTagsCustom", "repo.labs.intellij.net/static-analyser/qodana")
+      param("clonefinder-queried-project", "src")
+      param("clonefinder-enable", "true")
+      param("clonefinder-reference-projects", "src")
+      param("yaml-configuration", "")
      linter = jvm {
        version = Qodana.JVMVersion.LATEST
      }
-      reportAsTests = true
-      additionalDockerArguments = "-e QODANA_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb24iOiIzUFZrQSIsInByb2plY3QiOiIzN1FlQSIsInRva2VuIjoiM0t2bXoifQ.uohp81tM7iAfvvB6k8faarfpV-OjusAaEbWQ8iNrOgs"
-      additionalQodanaArguments = "--baseline qodana.sarif.json"
    }
  }

  triggers {
    vcs {
-      enabled = false
-      branchFilter = "+:<default>"
+      enabled = true
+      branchFilter = ""
    }
    schedule {
-      schedulingPolicy = daily {
-        hour = 12
-        minute = 0
-        timezone = "SERVER"
+      schedulingPolicy = weekly {
+        dayOfWeek = ScheduleTrigger.DAY.Tuesday
      }
-      param("dayOfWeek", "Sunday")
-      enabled = false
+      branchFilter = ""
+      triggerBuild = always()
    }
  }

@ -74,8 +74,11 @@ object Qodana : IdeaVimBuildType({
      comparison = BuildFailureOnMetric.MetricComparison.MORE
      compareTo = value()
      metric = BuildFailureOnMetric.MetricType.TEST_FAILED_COUNT
-      param("metricKey", "QodanaProblemsNew")
-      enabled = false
+      param("metricKey", "QodanaProblemsTotal")
    }
  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
 })
--- a/.teamcity/_Self/buildTypes/Release.kt
+++ b/.teamcity/_Self/buildTypes/Release.kt
@ -0,0 +1,76 @@
+package _Self.buildTypes
+
+import _Self.Constants.DEFAULT_CHANNEL
+import _Self.Constants.DEV_CHANNEL
+import _Self.Constants.EAP_CHANNEL
+import _Self.Constants.RELEASE
+import _Self.Constants.VERSION
+import _Self.vcsRoots.Branch_Release
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.vcsLabeling
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+
+object Release : BuildType({
+  name = "Publish Release"
+  description = "Build and publish IdeaVim plugin"
+
+  artifactRules = "build/distributions/*"
+  buildNumberPattern = VERSION
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE)
+    password(
+      "env.ORG_GRADLE_PROJECT_publishToken",
+      "credentialsJSON:61a36031-4da1-4226-a876-b8148bf32bde",
+      label = "Password"
+    )
+    param("env.ORG_GRADLE_PROJECT_version", "%build.number%")
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_publishChannels", "$DEFAULT_CHANNEL,$EAP_CHANNEL,$DEV_CHANNEL")
+    password(
+      "env.ORG_GRADLE_PROJECT_slackUrl",
+      "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
+      label = "Slack Token"
+    )
+  }
+
+  vcs {
+    root(Branch_Release)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean publishPlugin slackNotification"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  features {
+    vcsLabeling {
+      vcsRootId = "${DslContext.settingsRoot.id}"
+      labelingPattern = "%system.build.number%"
+      successfulOnly = true
+      branchFilter = ""
+    }
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
+      threshold = 5
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.DIFF
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
--- a/.teamcity/_Self/buildTypes/ReleaseDev.kt
+++ b/.teamcity/_Self/buildTypes/ReleaseDev.kt
@ -1,22 +1,22 @@
 package _Self.buildTypes

 import _Self.Constants.DEV_CHANNEL
+import _Self.Constants.DEV_VERSION
 import _Self.Constants.RELEASE_DEV
-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.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
 import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule

-object ReleaseDev : IdeaVimBuildType({
+object ReleaseDev : BuildType({
  name = "Publish Dev Build"
  description = "Build and publish Dev of IdeaVim plugin"

  artifactRules = "build/distributions/*"
+  buildNumberPattern = "$DEV_VERSION-dev.%build.counter%"

  params {
    param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE_DEV)
@ -25,35 +25,23 @@ object ReleaseDev : IdeaVimBuildType({
      "credentialsJSON:61a36031-4da1-4226-a876-b8148bf32bde",
      label = "Password"
    )
+    param("env.ORG_GRADLE_PROJECT_version", "%build.number%")
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
    param("env.ORG_GRADLE_PROJECT_publishChannels", DEV_CHANNEL)
  }

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"

    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 dev version"
-      tasks = "scripts:calculateNewDevVersion"
-    }
-    gradle {
-      name = "Set TeamCity build number"
-      tasks = "scripts:setTeamCityBuildNumber"
-    }
-    gradle {
-      tasks = "publishPlugin"
+      tasks = "clean publishPlugin"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
    }
  }

@ -67,12 +55,6 @@ object ReleaseDev : IdeaVimBuildType({
    }
  }

-  features {
-    sshAgent {
-      teamcitySshKey = "IdeaVim ssh keys"
-    }
-  }
-
  failureConditions {
    failOnMetricChange {
      metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
--- a/.teamcity/_Self/buildTypes/ReleaseEap.kt
+++ b/.teamcity/_Self/buildTypes/ReleaseEap.kt
@ -1,21 +1,22 @@
 package _Self.buildTypes

+import _Self.Constants.DEV_VERSION
 import _Self.Constants.EAP_CHANNEL
 import _Self.Constants.RELEASE_EAP
-import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
 import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
 import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.sshAgent
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.vcsLabeling
 import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
 import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange

-object ReleaseEap : IdeaVimBuildType({
+object ReleaseEap : BuildType({
  name = "Publish EAP Build"
  description = "Build and publish EAP of IdeaVim plugin"

  artifactRules = "build/distributions/*"
+  buildNumberPattern = "$DEV_VERSION-eap.%build.counter%"

  params {
    param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE_EAP)
@ -24,6 +25,8 @@ object ReleaseEap : IdeaVimBuildType({
      "credentialsJSON:61a36031-4da1-4226-a876-b8148bf32bde",
      label = "Password"
    )
+    param("env.ORG_GRADLE_PROJECT_version", "%build.number%")
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
    param("env.ORG_GRADLE_PROJECT_publishChannels", EAP_CHANNEL)
    password(
      "env.ORG_GRADLE_PROJECT_slackUrl",
@ -34,58 +37,25 @@ object ReleaseEap : IdeaVimBuildType({

  vcs {
    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"

    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"
-      tasks = "scripts:calculateNewEapVersion"
-    }
-    gradle {
-      name = "Set TeamCity build number"
-      tasks = "scripts:setTeamCityBuildNumber"
-    }
-    gradle {
-      name = "Add release tag"
-      tasks = "scripts:addReleaseTag"
-    }
-    gradle {
-      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)  
-      echo current branch is ${'$'}branch
-      if [ "master" != "${'$'}branch" ];
-      then
-        exit 1
-      fi
-      
-      git push origin %build.number%
-      """.trimIndent()
+      tasks = "clean publishPlugin"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
    }
  }

  features {
-    sshAgent {
-      teamcitySshKey = "IdeaVim ssh keys"
+    vcsLabeling {
+      vcsRootId = "${DslContext.settingsRoot.id}"
+      labelingPattern = "%system.build.number%"
+      successfulOnly = true
+      branchFilter = ""
    }
  }

@ -100,12 +70,4 @@ object ReleaseEap : IdeaVimBuildType({
      }
    }
  }
-
-  requirements {
-    // These requirements define Linux-XLarge configuration.
-    // Unfortunately, requirement by name (teamcity.agent.name) doesn't work
-    //   IDK the reason for it, but on our agents this property is empty
-//    equals("teamcity.agent.hardware.cpuCount", "16")
-//    equals("teamcity.agent.os.family", "Linux")
-  }
 })
--- a/.teamcity/_Self/buildTypes/ReleasePlugin.kt
+++ b/.teamcity/_Self/buildTypes/ReleasePlugin.kt
@ -1,155 +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 _Self.buildTypes
-
-import _Self.Constants.DEFAULT_CHANNEL
-import _Self.Constants.DEV_CHANNEL
-import _Self.Constants.EAP_CHANNEL
-import _Self.Constants.RELEASE
-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
-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")
-object ReleasePatch : ReleasePlugin("patch")
-
-sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
-  name = "Publish $releaseType release"
-  description = "Build and publish IdeaVim plugin"
-
-  artifactRules = "build/distributions/*"
-
-  params {
-    param("env.ORG_GRADLE_PROJECT_ideaVersion", RELEASE)
-    password(
-      "env.ORG_GRADLE_PROJECT_publishToken",
-      "credentialsJSON:61a36031-4da1-4226-a876-b8148bf32bde",
-      label = "Password"
-    )
-    param("env.ORG_GRADLE_PROJECT_publishChannels", "$DEFAULT_CHANNEL,$EAP_CHANNEL,$DEV_CHANNEL")
-    password(
-      "env.ORG_GRADLE_PROJECT_slackUrl",
-      "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
-      label = "Slack Token"
-    )
-    password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:3cd3e867-282c-451f-b958-bc95d56a8450", display = ParameterDisplay.HIDDEN)
-    param("env.ORG_GRADLE_PROJECT_releaseType", releaseType)
-  }
-
-  vcs {
-    root(DslContext.settingsRoot)
-    branchFilter = "+:<default>"
-
-    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 = "Select branch"
-      tasks = "scripts:selectBranch"
-    }
-    gradle {
-      name = "Calculate new version"
-      tasks = "scripts:calculateNewVersion"
-    }
-    gradle {
-      name = "Set TeamCity build number"
-      tasks = "scripts:setTeamCityBuildNumber"
-    }
-    gradle {
-      name = "Update change log"
-      tasks = "scripts:changelogUpdateUnreleased"
-    }
-    gradle {
-      name = "Commit preparation changes"
-      tasks = "scripts:commitChanges"
-    }
-    gradle {
-      name = "Add release tag"
-      tasks = "scripts:addReleaseTag"
-    }
-    gradle {
-      name = "Reset release branch"
-      tasks = "scripts:resetReleaseBranch"
-    }
-    gradle {
-      name = "Publish release"
-      tasks = "publishPlugin"
-    }
-//    gradle {
-//      name = "Push changes to the repo"
-//      tasks = "scripts:pushChangesWithReleaseBranch"
-//    }
-    script {
-      name = "Push changes to the repo"
-      scriptContent = """
-      branch=$(git branch --show-current)  
-      echo current branch is ${'$'}branch
-      if [ "master" != "${'$'}branch" ];
-      then
-        git checkout master
-      fi
-      
-      git push origin --tags
-      git push origin
-      
-      if [ "patch" != $releaseType  ];
-      then
-        git checkout release
-        echo checkout release branch
-        git push --tags
-        git push origin --force
-      fi
-      
-      git checkout ${'$'}branch
-      """.trimIndent()
-    }
-    gradle {
-      name = "Run Integrations"
-      tasks = "releaseActions"
-    }
-    gradle {
-      name = "Slack Notification"
-      tasks = "slackNotification"
-    }
-  }
-
-  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()
-      }
-    }
-  }
-})
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ20183.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ20183.kt
@ -0,0 +1,58 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object TestsForIntelliJ20183 : BuildType({
+  name = "Tests for IntelliJ 2018.3"
+  description = "branch 183"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-2018.3")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_183)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ_181-182.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ_181-182.kt
@ -0,0 +1,61 @@
+@file:Suppress("ClassName")
+
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class TestsForIntelliJ_181_branch(private val version: String) : BuildType({
+  name = "Tests for IntelliJ $version"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_181)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
+
+object TestsForIntelliJ20181 : TestsForIntelliJ_181_branch("2018.1")
+object TestsForIntelliJ20182 : TestsForIntelliJ_181_branch("2018.2")
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ_191-193.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ_191-193.kt
@ -0,0 +1,63 @@
+@file:Suppress("ClassName")
+
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class TestsForIntelliJ_191_193_branch(private val version: String) : BuildType({
+  name = "Tests for IntelliJ $version"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_191_193)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
+
+object TestsForIntelliJ20191 : TestsForIntelliJ_191_193_branch("2019.1")
+object TestsForIntelliJ20192 : TestsForIntelliJ_191_193_branch("2019.2")
+object TestsForIntelliJ20193 : TestsForIntelliJ_191_193_branch("2019.3")
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ_201.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ_201.kt
@ -0,0 +1,60 @@
+@file:Suppress("ClassName")
+
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class TestsForIntelliJ_201_branch(private val version: String) : BuildType({
+  name = "Tests for IntelliJ $version"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_201)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
+
+object TestsForIntelliJ20201 : TestsForIntelliJ_201_branch("2020.1")
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ_202.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ_202.kt
@ -0,0 +1,60 @@
+@file:Suppress("ClassName")
+
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class TestsForIntelliJ_202_branch(private val version: String) : BuildType({
+  name = "Tests for IntelliJ $version"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_202)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
+
+object TestsForIntelliJ20202 : TestsForIntelliJ_202_branch("2020.2")
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ_203-212.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ_203-212.kt
@ -0,0 +1,64 @@
+@file:Suppress("ClassName")
+
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class TestsForIntelliJ_203_212_branch(private val version: String) : BuildType({
+  name = "Tests for IntelliJ $version"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_203_212)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
+
+
+object TestsForIntelliJ20212 : TestsForIntelliJ_203_212_branch("2021.2.2")
+object TestsForIntelliJ20211 : TestsForIntelliJ_203_212_branch("2021.1")
+object TestsForIntelliJ20203 : TestsForIntelliJ_203_212_branch("2020.3")
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ_213-221.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ_213-221.kt
@ -0,0 +1,62 @@
+@file:Suppress("ClassName")
+
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class TestsForIntelliJ_213_221_branch(private val version: String) : BuildType({
+  name = "Tests for IntelliJ $version"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ORG_GRADLE_PROJECT_javaVersion", "1.8")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_213_221)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
+
+
+object TestsForIntelliJ20213 : TestsForIntelliJ_213_221_branch("2021.3.2")
--- a/.teamcity/_Self/buildTypes/TestsForIntelliJ_222.kt
+++ b/.teamcity/_Self/buildTypes/TestsForIntelliJ_222.kt
@ -0,0 +1,57 @@
+@file:Suppress("ClassName")
+
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+sealed class TestsForIntelliJ_222_branch(private val version: String) : BuildType({
+  name = "Tests for IntelliJ $version"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_legacyNoJavaPlugin", "true")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", "IC-$version")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(_Self.vcsRoots.Branch_222)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.TEST_COUNT
+      threshold = 20
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.LESS
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})
+
+
+object TestsForIntelliJ20222 : TestsForIntelliJ_222_branch("2022.2.3")
--- a/.teamcity/_Self/subprojects/GitHub.kt
+++ b/.teamcity/_Self/subprojects/GitHub.kt
@ -1,78 +1,11 @@
 package _Self.subprojects

-import _Self.Constants
-import _Self.IdeaVimBuildType
-import _Self.vcsRoots.GitHubPullRequest
-import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import _Self.buildTypes.GithubTests
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.PullRequests
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.commitStatusPublisher
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.pullRequests
-import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
-import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
-import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs

 object GitHub : Project({
  name = "Pull Requests checks"
  description = "Automatic checking of GitHub Pull Requests"

-  buildType(Github("clean test", "Tests"))
-})
-
-class Github(command: String, desc: String) : IdeaVimBuildType({
-  name = "GitHub Pull Requests $desc"
-  description = "Test GitHub pull requests $desc"
-
-  params {
-    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
-    param("env.ORG_GRADLE_PROJECT_ideaVersion", Constants.GITHUB_TESTS)
-    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
-  }
-
-  vcs {
-    root(GitHubPullRequest)
-
-    checkoutMode = CheckoutMode.AUTO
-    branchFilter = """
-            +:*
-            -:<default>
-        """.trimIndent()
-  }
-
-  steps {
-    gradle {
-      tasks = command
-      buildFile = ""
-      enableStacktrace = true
-    }
-  }
-
-  triggers {
-    vcs {
-      quietPeriodMode = VcsTrigger.QuietPeriodMode.USE_DEFAULT
-      branchFilter = ""
-    }
-  }
-
-  features {
-    pullRequests {
-      provider = github {
-        authType = token {
-          token = "credentialsJSON:90f3b439-6e91-40f7-a086-d4dd8e0ea9b8"
-        }
-        filterTargetBranch = "refs/heads/master"
-        filterAuthorRole = PullRequests.GitHubRoleFilter.EVERYBODY
-      }
-    }
-    commitStatusPublisher {
-      vcsRootExtId = "${GitHubPullRequest.id}"
-      publisher = github {
-        githubUrl = "https://api.github.com"
-        authType = personalToken {
-          token = "credentialsJSON:90f3b439-6e91-40f7-a086-d4dd8e0ea9b8"
-        }
-      }
-      param("github_oauth_user", "AlexPl292")
-    }
-  }
+  buildType(GithubTests)
 })
--- a/.teamcity/_Self/subprojects/OldTests.kt
+++ b/.teamcity/_Self/subprojects/OldTests.kt
@ -1,23 +1,35 @@
 package _Self.subprojects

-import _Self.buildTypes.TestingBuildType
+import _Self.buildTypes.TestsForIntelliJ20181
+import _Self.buildTypes.TestsForIntelliJ20182
+import _Self.buildTypes.TestsForIntelliJ20183
+import _Self.buildTypes.TestsForIntelliJ20191
+import _Self.buildTypes.TestsForIntelliJ20192
+import _Self.buildTypes.TestsForIntelliJ20193
+import _Self.buildTypes.TestsForIntelliJ20201
+import _Self.buildTypes.TestsForIntelliJ20202
+import _Self.buildTypes.TestsForIntelliJ20203
+import _Self.buildTypes.TestsForIntelliJ20211
+import _Self.buildTypes.TestsForIntelliJ20212
+import _Self.buildTypes.TestsForIntelliJ20213
+import _Self.buildTypes.TestsForIntelliJ20222
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project

 object OldTests : Project({
  name = "Old IdeaVim tests"
  description = "Tests for older versions of IJ"

-  buildType(TestingBuildType("IC-2018.1", "181-182", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2018.2", "181-182", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2018.3", "183", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2019.1", "191-193", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2019.2", "191-193", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2019.3", "191-193", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2020.1", "201", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2020.2", "202", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2020.3", "203-212", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2021.1", "203-212", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2021.2.2", "203-212", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2021.3.2", "213-221", javaVersion = "1.8", javaPlugin = false))
-  buildType(TestingBuildType("IC-2022.2.3", branch = "222", javaPlugin = false))
+  buildType(TestsForIntelliJ20181)
+  buildType(TestsForIntelliJ20182)
+  buildType(TestsForIntelliJ20183)
+  buildType(TestsForIntelliJ20191)
+  buildType(TestsForIntelliJ20192)
+  buildType(TestsForIntelliJ20193)
+  buildType(TestsForIntelliJ20201)
+  buildType(TestsForIntelliJ20202)
+  buildType(TestsForIntelliJ20203)
+  buildType(TestsForIntelliJ20211)
+  buildType(TestsForIntelliJ20212)
+  buildType(TestsForIntelliJ20213)
+  buildType(TestsForIntelliJ20222)
 })
--- a/.teamcity/_Self/subprojects/Releases.kt
+++ b/.teamcity/_Self/subprojects/Releases.kt
@ -1,41 +1,15 @@
 package _Self.subprojects

-import _Self.buildTypes.PublishVimEngine
+import _Self.buildTypes.Release
 import _Self.buildTypes.ReleaseDev
 import _Self.buildTypes.ReleaseEap
-import _Self.buildTypes.ReleaseMajor
-import _Self.buildTypes.ReleaseMinor
-import _Self.buildTypes.ReleasePatch
-import jetbrains.buildServer.configs.kotlin.v2019_2.ParameterDisplay
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project

 object Releases : Project({
  name = "IdeaVim releases"
  description = "Stable and EAP releases for IdeaVim"

-  params {
-    password(
-      "env.CERTIFICATE_CHAIN",
-      "credentialsJSON:1bab4a88-10e7-4bf9-856c-e6253499dc95",
-      display = ParameterDisplay.HIDDEN
-    )
-    password(
-      "env.PRIVATE_KEY_PASSWORD",
-      "credentialsJSON:7c12c867-fe09-4a2f-884d-6fd0ec0a1e79",
-      display = ParameterDisplay.HIDDEN
-    )
-    password(
-      "env.PRIVATE_KEY",
-      "credentialsJSON:5d8b553d-fd7e-4347-abd2-51d8d0f2b3f7",
-      display = ParameterDisplay.HIDDEN
-    )
-  }
-
-//  buildType(Release)
-  buildType(ReleaseMajor)
-  buildType(ReleaseMinor)
-  buildType(ReleasePatch)
+  buildType(Release)
  buildType(ReleaseEap)
  buildType(ReleaseDev)
-  buildType(PublishVimEngine)
 })
--- a/.teamcity/_Self/vcsRoots/Branch_181.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_181.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_181 : GitVcsRoot({
+  name = "https://github.com/JetBrains/ideavim (branch 181)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "181"
+  useMirrors = false
+})
--- a/.teamcity/_Self/vcsRoots/Branch_183.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_183.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_183 : GitVcsRoot({
+  name = "https://github.com/JetBrains/ideavim (branch 183)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "183"
+  useMirrors = false
+})
--- a/.teamcity/_Self/vcsRoots/Branch_191_193.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_191_193.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_191_193 : GitVcsRoot({
+  name = "https://github.com/JetBrains/ideavim (branch 191-193)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "191-193"
+  useMirrors = false
+})
--- a/.teamcity/_Self/vcsRoots/Branch_201.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_201.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_201 : GitVcsRoot({
+  name = "https://github.com/JetBrains/ideavim (branch 201)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "201"
+  useMirrors = false
+})
--- a/.teamcity/_Self/vcsRoots/Branch_202.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_202.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_202 : GitVcsRoot({
+  name = "https://github.com/JetBrains/ideavim (branch 202)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "202"
+  useMirrors = false
+})
--- a/.teamcity/_Self/vcsRoots/Branch_203_212.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_203_212.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_203_212 : GitVcsRoot({
+  name = "https://github.com/JetBrains/ideavim (branch 203-212)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "203-212"
+  useMirrors = false
+})
--- a/.teamcity/_Self/vcsRoots/Branch_213_221.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_213_221.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_213_221 : GitVcsRoot({
+  id("HttpsGithubComJetBrainsIdeavimBranch213221")
+  name = "https://github.com/JetBrains/ideavim (branch 213-221)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "213-221"
+})
--- a/.teamcity/_Self/vcsRoots/Branch_222.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_222.kt
@ -0,0 +1,12 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_222 : GitVcsRoot({
+  id("HttpsGithubComJetBrainsIdeavimBranch222")
+  name = "https://github.com/JetBrains/ideavim (branch 222)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "222"
+})
--- a/.teamcity/_Self/vcsRoots/Branch_Release.kt
+++ b/.teamcity/_Self/vcsRoots/Branch_Release.kt
@ -0,0 +1,11 @@
+@file:Suppress("ClassName")
+
+package _Self.vcsRoots
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.vcs.GitVcsRoot
+
+object Branch_Release : GitVcsRoot({
+  name = "https://github.com/JetBrains/ideavim (branch release)"
+  url = "https://github.com/JetBrains/ideavim.git"
+  branch = "release"
+})
--- a/.teamcity/_Self/vcsRoots/GitHubPullRequest.kt
+++ b/.teamcity/_Self/vcsRoots/GitHubPullRequest.kt
@ -7,6 +7,6 @@ object GitHubPullRequest : GitVcsRoot({
  url = "git@github.com:JetBrains/ideavim.git"
  branchSpec = "+:refs/(pull/*)/head"
  authMethod = uploadedKey {
-    uploadedKey = "IdeaVim ssh keys"
+    uploadedKey = "Alex Plate TeamCity key"
  }
 })
--- a/.teamcity/patches/buildTypes/IdeaVimCompatibility.kts
+++ b/.teamcity/patches/buildTypes/IdeaVimCompatibility.kts
@ -0,0 +1,65 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.ScriptBuildStep
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+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 = 'IdeaVimCompatibility'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("IdeaVimCompatibility")) {
+    vcs {
+        remove(DslContext.settingsRoot.id!!)
+    }
+
+    expectSteps {
+        script {
+            name = "Check"
+            scriptContent = """
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}org.jetbrains.IdeaVim-EasyMotion' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}io.github.mishkun.ideavimsneak' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.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 verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.github.copilot' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.github.dankinsoid.multicursor' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}com.joshestein.ideavim-quickscope' [latest-IU] -team-city
+            """.trimIndent()
+        }
+    }
+    steps {
+        update<ScriptBuildStep>(0) {
+            name = "Load Verifier"
+            clearConditions()
+            scriptContent = """
+                mkdir verifier1
+                curl -f -L -o verifier1/verifier-cli-dev-all-1.jar "https://packages.jetbrains.team/files/p/ideavim/plugin-verifier/verifier-cli-dev-all-1.jar"
+            """.trimIndent()
+        }
+        insert(1) {
+            script {
+                name = "Check"
+                scriptContent = """
+                    # We use a custom build of verifier that downloads IdeaVim from dev channel
+                    # To create a custom build: Download plugin verifier repo, add an if that switches to dev channel for IdeaVim repo
+                    # At the moment it's com.jetbrains.pluginverifier.repository.repositories.marketplace.MarketplaceRepository#getLastCompatibleVersionOfPlugin
+                    # Build using gradlew :intellij-plugin-verifier:verifier-cli:shadowJar
+                    # Upload verifier-cli-dev-all.jar artifact to the repo in IdeaVim space repo
+                    
+                    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.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()
+            }
+        }
+    }
+}
--- a/.teamcity/patches/buildTypes/IdeaVimTests_Latest_EAP_With_Xorg.kts
+++ b/.teamcity/patches/buildTypes/IdeaVimTests_Latest_EAP_With_Xorg.kts
@ -1,20 +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 = 'IdeaVimTests_Latest_EAP_With_Xorg'
-accordingly, and delete the patch script.
-*/
-changeBuildType(RelativeId("IdeaVimTests_Latest_EAP_With_Xorg")) {
-    requirements {
-        add {
-            matches("teamcity.agent.jvm.os.family", "Linux")
-        }
-        add {
-            exists("env.DISPLAY")
-        }
-    }
-}
--- a/.teamcity/patches/buildTypes/Qodana.kts
+++ b/.teamcity/patches/buildTypes/Qodana.kts
@ -0,0 +1,101 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.Qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.ScheduleTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.VcsTrigger
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'Qodana'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("Qodana")) {
+    expectSteps {
+        qodana {
+            name = "Qodana"
+            linter = jvm {
+                version = Qodana.JVMVersion.LATEST
+            }
+            param("clonefinder-enable", "true")
+            param("clonefinder-languages", "Java")
+            param("clonefinder-languages-container", "Java Kotlin")
+            param("clonefinder-mode", "")
+            param("clonefinder-queried-project", "src")
+            param("clonefinder-reference-projects", "src")
+            param("licenseaudit-enable", "true")
+            param("namesAndTagsCustom", "repo.labs.intellij.net/static-analyser/qodana")
+            param("report-version", "")
+            param("yaml-configuration", "")
+        }
+    }
+    steps {
+        insert(0) {
+            gradle {
+                name = "Generate grammar"
+                tasks = "generateGrammarSource"
+                param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+            }
+        }
+        update<Qodana>(1) {
+            clearConditions()
+            reportAsTests = true
+            additionalDockerArguments = "-e QODANA_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb24iOiIzUFZrQSIsInByb2plY3QiOiIzN1FlQSIsInRva2VuIjoiM0t2bXoifQ.uohp81tM7iAfvvB6k8faarfpV-OjusAaEbWQ8iNrOgs"
+            additionalQodanaArguments = "--baseline qodana.sarif.json"
+            param("clonefinder-languages", "")
+            param("collect-anonymous-statistics", "")
+            param("licenseaudit-enable", "")
+            param("clonefinder-languages-container", "")
+            param("clonefinder-queried-project", "")
+            param("clonefinder-enable", "")
+            param("clonefinder-reference-projects", "")
+        }
+    }
+
+    triggers {
+        val trigger1 = find<VcsTrigger> {
+            vcs {
+                branchFilter = ""
+            }
+        }
+        trigger1.apply {
+            enabled = false
+
+        }
+        val trigger2 = find<ScheduleTrigger> {
+            schedule {
+                schedulingPolicy = weekly {
+                    dayOfWeek = ScheduleTrigger.DAY.Tuesday
+                }
+                branchFilter = ""
+                triggerBuild = always()
+            }
+        }
+        trigger2.apply {
+            enabled = false
+
+        }
+    }
+
+    failureConditions {
+        val feature1 = find<BuildFailureOnMetric> {
+            failOnMetricChange {
+                metric = BuildFailureOnMetric.MetricType.QODANA_TOTAL_PROBLEMS_COUNT
+                threshold = 0
+                units = BuildFailureOnMetric.MetricUnit.DEFAULT_UNIT
+                comparison = BuildFailureOnMetric.MetricComparison.MORE
+                compareTo = value()
+            }
+        }
+        feature1.apply {
+            param("metricKey", "QodanaProblemsNew")
+        }
+    }
+}
--- a/.teamcity/patches/buildTypes/Release.kts
+++ b/.teamcity/patches/buildTypes/Release.kts
@ -0,0 +1,48 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+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.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'Release'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("Release")) {
+    params {
+        add {
+            password("env.ORG_GRADLE_PROJECT_youtrackToken", "credentialsJSON:3cd3e867-282c-451f-b958-bc95d56a8450", display = ParameterDisplay.HIDDEN)
+        }
+    }
+
+    expectSteps {
+        gradle {
+            tasks = "clean publishPlugin slackNotification"
+            buildFile = ""
+            enableStacktrace = true
+            param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+        }
+    }
+    steps {
+        update<GradleBuildStep>(0) {
+            clearConditions()
+            tasks = "clean publishPlugin"
+        }
+        insert(1) {
+            gradle {
+                name = "Run Integrations"
+                tasks = "releaseActions"
+                param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+            }
+        }
+        insert(2) {
+            gradle {
+                name = "Slack Notification"
+                tasks = "slackNotification"
+                param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+            }
+        }
+    }
+}
--- a/.teamcity/patches/buildTypes/ReleaseEap.kts
+++ b/.teamcity/patches/buildTypes/ReleaseEap.kts
@ -0,0 +1,27 @@
+package patches.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.VcsLabeling
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildFeatures.vcsLabeling
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the buildType with id = 'ReleaseEap'
+accordingly, and delete the patch script.
+*/
+changeBuildType(RelativeId("ReleaseEap")) {
+    features {
+        val feature1 = find<VcsLabeling> {
+            vcsLabeling {
+                vcsRootId = "${DslContext.settingsRoot.id}"
+                labelingPattern = "%system.build.number%"
+                successfulOnly = true
+                branchFilter = ""
+            }
+        }
+        feature1.apply {
+            successfulOnly = false
+        }
+    }
+}
--- a/.teamcity/patches/buildTypes/ReleasePatch.kts
+++ b/.teamcity/patches/buildTypes/ReleasePatch.kts
@ -1,20 +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 = '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)
-        }
-    }
-}
--- a/.teamcity/patches/projects/_Self.kts
+++ b/.teamcity/patches/projects/_Self.kts
@ -0,0 +1,50 @@
+package patches.projects
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.*
+import jetbrains.buildServer.configs.kotlin.v2019_2.AmazonEC2CloudImage
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+import jetbrains.buildServer.configs.kotlin.v2019_2.amazonEC2CloudImage
+import jetbrains.buildServer.configs.kotlin.v2019_2.ui.*
+
+/*
+This patch script was generated by TeamCity on settings change in UI.
+To apply the patch, change the root project
+accordingly, and delete the patch script.
+*/
+changeProject(DslContext.projectId) {
+    features {
+        val feature1 = find<AmazonEC2CloudImage> {
+            amazonEC2CloudImage {
+                id = "PROJECT_EXT_768"
+                profileId = "amazon-48"
+                agentPoolId = "41"
+                name = "BuildAgentsIdeaVim"
+                vpcSubnetId = "subnet-58839511"
+                keyPairName = ""
+                instanceType = "c5d.xlarge"
+                securityGroups = listOf("sg-eda08696", "sg-7332cf0f")
+                useSpotInstances = true
+                instanceTags = mapOf(
+                    "project" to "idea-vim"
+                )
+                source = Source("ami-0fa17ce8238eb8868")
+                param("image-instances-limit", "")
+                param("spot-instance-price", "")
+            }
+        }
+        feature1.apply {
+            profileId = "amazon-48"
+            agentPoolId = "41"
+            name = "BuildAgentsIdeaVim"
+            vpcSubnetId = "subnet-58839511"
+            keyPairName = ""
+            instanceType = "c5d.xlarge"
+            securityGroups = listOf("sg-eda08696", "sg-7332cf0f")
+            useSpotInstances = true
+            instanceTags = mapOf(
+                "project" to "idea-vim"
+            )
+            source = Source("ami-07c529efaddafcf86")
+        }
+    }
+}
--- a/.teamcity/pom.xml
+++ b/.teamcity/pom.xml
@ -22,7 +22,7 @@
    </repository>
    <repository>
      <id>teamcity-server</id>
-      <url>https://ideavim.teamcity.com/app/dsl-plugins-repository</url>
+      <url>https://teamcity.jetbrains.com/app/dsl-plugins-repository</url>
      <snapshots>
        <enabled>true</enabled>
      </snapshots>
--- a/.teamcity/settings.kts
+++ b/.teamcity/settings.kts
@ -1,5 +1,4 @@
-import jetbrains.buildServer.configs.kotlin.v2019_2.project
-import jetbrains.buildServer.configs.kotlin.v2019_2.version
+import jetbrains.buildServer.configs.kotlin.v2019_2.*

 /*
 The settings script is an entry point for defining a single
@ -30,5 +29,5 @@ node (Plugins -> teamcity-configs -> teamcity-configs:generate),
 the 'Debug' option is available in the context menu for the task.
 */

-version = "2023.05"
-project(_Self.Project)
+version = "2020.2"
+project(_Self.Project)
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -455,34 +455,6 @@ Contributors:
  [![icon][github]](https://github.com/adaext)
  &nbsp;
  Ada
-* [![icon][mail]](mailto:dominic.palmer@outlook.com)
-  [![icon][github]](https://github.com/dominicpalmer)
-  &nbsp;
-  Dominic Palmer
-* [![icon][mail]](mailto:kawagh.dev@gmail.com)
-  [![icon][github]](https://github.com/kawagh)
-  &nbsp;
-  kawagh
-* [![icon][mail]](mailto:78074243+danisevas@users.noreply.github.com)
-  [![icon][github]](https://github.com/danisevas)
-  &nbsp;
-  Dani Sevastianov
-* [![icon][mail]](mailto:oskar.persson@polken.se)
-  [![icon][github]](https://github.com/oskarpersson/)
-  &nbsp;
-  Oskar Persson 
-* [![icon][mail]](mailto:silence.m@hotmail.com)
-  [![icon][github]](https://github.com/Stzx)
-  &nbsp;
-  Silence Tai
-* [![icon][mail]](mailto:tszsumng90@gmail.com)
-  [![icon][github]](https://github.com/samabcde)
-  &nbsp;
-  Sam Ng
-* [![icon][mail]](mailto:ludwig.valda.vasquez@jetbrains.com)
-  [![icon][github]](https://github.com/ludwig-jb)
-  &nbsp;
-  ludwig-jb

 Previous contributors:

--- a/CHANGES.md
+++ b/CHANGES.md
@ -25,109 +25,6 @@ usual beta standards.

 ## To Be Released

-### Fixes:
-* [VIM-3060](https://youtrack.jetbrains.com/issue/VIM-3060) Clipboard interaction stopped working
-
-### Merged PRs:
-* [697](https://github.com/JetBrains/ideavim/pull/697) by [Matt Ellis](https://github.com/citizenmatt): Support per-window "global" values for local-to-window options
-
-## 2.5.0, 2023-09-01
-
-### Fixes:
-* [VIM-802](https://youtrack.jetbrains.com/issue/VIM-802) IdeaVim vs. Vim: discrepancies in using registers
-* [VIM-2246](https://youtrack.jetbrains.com/issue/VIM-2246) X11/Xorg Primary selection register "* not supported
-* [VIM-2313](https://youtrack.jetbrains.com/issue/VIM-2313)
-  [VIM-2318](https://youtrack.jetbrains.com/issue/VIM-2318)
-  [VIM-2666](https://youtrack.jetbrains.com/issue/VIM-2666)
-  [VIM-2951](https://youtrack.jetbrains.com/issue/VIM-2951)
-  IdeaVim works correctly in read-only editors like log or tests output.
-
-### Merged PRs:
-* [666](https://github.com/JetBrains/ideavim/pull/666) by [Matt Ellis](https://github.com/citizenmatt): Improve formatting of `:set` command output
-* [667](https://github.com/JetBrains/ideavim/pull/667) by [Matt Ellis](https://github.com/citizenmatt): Eagerly initialise local options and introduce option scope
-* [672](https://github.com/JetBrains/ideavim/pull/672) by [Matt Ellis](https://github.com/citizenmatt): Fix issue adding back hidden status bar widget
-* [668](https://github.com/JetBrains/ideavim/pull/668) by [ludwig-jb](https://github.com/ludwig-jb): Handle unicode grapheme clusters
-
-## 2.4.0, 2023-07-18
-
-### Fixes:
-* [VIM-2975](https://youtrack.jetbrains.com/issue/VIM-2975) Fix the offset after the rendered docs
-* [VIM-2685](https://youtrack.jetbrains.com/issue/VIM-2685) Register command outputs different values for same registers
-* [VIM-1294](https://youtrack.jetbrains.com/issue/VIM-1294) unvoluntary unfolding when using ideavim
-* [VIM-2818](https://youtrack.jetbrains.com/issue/VIM-2818) Wrong caret position after multicaret paste
-
-### Merged PRs:
-* [662](https://github.com/JetBrains/ideavim/pull/662) by [ludwig-jb](https://github.com/ludwig-jb): Update VimMessages#updateStatusBar to accept VimEditor
-* [659](https://github.com/JetBrains/ideavim/pull/659) by [Sam Ng](https://github.com/samabcde): VIM-2920 fix select block expansion when enclose boundary is line break
-
-## 2.3.0, 2023-06-14
-
-### Features:
-* Matchit now supports PHP files | [VIM-2678](https://youtrack.jetbrains.com/issue/VIM-2678)
-
-### Fixes:
-* [VIM-2909](https://youtrack.jetbrains.com/issue/VIM-2909) Fix incorrect file detection while closing diff window
-* [VIM-2912](https://youtrack.jetbrains.com/issue/VIM-2912) Fix focus after :q
-* [VIM-2930](https://youtrack.jetbrains.com/issue/VIM-2930) vim-multiple-cursors + ReplaceWithRegister issue
-* [VIM-2945](https://youtrack.jetbrains.com/issue/VIM-2945) %-movement mismatches braces
-* [VIM-2953](https://youtrack.jetbrains.com/issue/VIM-2953) The previous fix for :q command caused weird behavior of tab closing
-* [VIM-2964](https://youtrack.jetbrains.com/issue/VIM-2964) Fix an issue with leaking caret instance
-
-### Merged PRs:
-* [616](https://github.com/JetBrains/ideavim/pull/616) by [Matt Ellis](https://github.com/citizenmatt): Refactor/option delegated properties
-* [626](https://github.com/JetBrains/ideavim/pull/626) by [Martin Yzeiri](https://github.com/myzeiri): Matchit bug fixes
-* [619](https://github.com/JetBrains/ideavim/pull/619) by [Matt Ellis](https://github.com/citizenmatt): Fix some local options being used as global options
-* [638](https://github.com/JetBrains/ideavim/pull/638) by [Sam Ng](https://github.com/samabcde): VIM-2615 add support to sort u command
-* [646](https://github.com/JetBrains/ideavim/pull/646) by [Sam Ng](https://github.com/samabcde): VIM-1990 fix repeat delete find or till wrong MotionType
-* [649](https://github.com/JetBrains/ideavim/pull/649) by [Martin Yzeiri](https://github.com/myzeiri): Add Matchit support for PHP 
-
-## 2.2.0, 2023-04-20
-
-### Features:
-* Now every secondary caret has its own marks. You can use marks and `gv` in multiple-caret mode now.
-
-### Fixes:
-* [VIM-1829](https://youtrack.jetbrains.com/issue/VIM-1829/key-combinations-are-not-working-in-visual-mode-IdeaVim) Fix marks when moving lines up/down
-* [VIM-2130](https://youtrack.jetbrains.com/issue/VIM-2130/Vim-visual-mode-mapping-isnt-behaving-correctly-in-ideavim-it-leaves-visual-mode-after-its-executed) Fix marks when moving lines up/down
-* [VIM-2428](https://youtrack.jetbrains.com/issue/VIM-2428/The-gv-command-doesnt-work) Fix marks when moving lines up/down
-* [VIM-2686](https://youtrack.jetbrains.com/issue/VIM-2686/Multiple-caret-marks) Add individual mark storage for each secondary caret
-* [VIM-2840](https://youtrack.jetbrains.com/issue/VIM-2840) Replace with register does not work with count
-* [VIM-658](https://youtrack.jetbrains.com/issue/VIM-658) Stop macro on error
-* [VIM-2787](https://youtrack.jetbrains.com/issue/VIM-2787) Save ideavimrc loading
-* [VIM-2850](https://youtrack.jetbrains.com/issue/VIM-2850) Marks exception during IDE startup 
-* [VIM-2804](https://youtrack.jetbrains.com/issue/VIM-2804) IdeaVim multiple-cursors copy and paste issue when "set clipboard+=unnamed"
-* [VIM-1768](https://youtrack.jetbrains.com/issue/VIM-1768) Delete surrounding character while in multiple cursors mode
-* [VIM-282](https://youtrack.jetbrains.com/issue/VIM-282) Cursor line wrapping support (whichwrap)
-* [VIM-2315](https://youtrack.jetbrains.com/issue/VIM-2315) Fix overlapping mappings execution
-* [VIM-44](https://youtrack.jetbrains.com/issue/VIM-44) Unify navigation history between ideavim and idea
-* [VIM-1735](https://youtrack.jetbrains.com/issue/VIM-1735) Fix enabling mulple carets after line selection
-* [VIM-2881](https://youtrack.jetbrains.com/issue/VIM-2881) ReplaceRegister does no longer worker with MultiCursor
-* [VIM-2244](https://youtrack.jetbrains.com/issue/VIM-2244) nnoremap mapping doesn't work correctly
-* [VIM-2885](https://youtrack.jetbrains.com/issue/VIM-2885) "v:searchforward" does't work for IdeaVim
-* [VIM-2733](https://youtrack.jetbrains.com/issue/VIM-2733) vim-surround emulation interacts incorrectly with unmatched quotes on previous lines
-* [VIM-2884](https://youtrack.jetbrains.com/issue/VIM-2884) Moving multiple lines in visual mode is not working
-* [VIM-2868](https://youtrack.jetbrains.com/issue/VIM-2868) Pasting in visual mode with P should not replace yank register like when pasting with p
-* [VIM-2819](https://youtrack.jetbrains.com/issue/VIM-2819) Move command works incorrectly
-* [VIM-795](https://youtrack.jetbrains.com/issue/VIM-795) Ctrl-w + h doesn't alway work (window navigation to the left window)
-* [VIM-1551](https://youtrack.jetbrains.com/issue/VIM-1551) Surround: line surround not working
-* [VIM-1746](https://youtrack.jetbrains.com/issue/VIM-1746) IdeaVim Surround removes unwanted characters
-* [VIM-1750](https://youtrack.jetbrains.com/issue/VIM-1750) Surround with tag wrong position
-* [VIM-2286](https://youtrack.jetbrains.com/issue/VIM-2286) Set surround not working for me as expected
-* [VIM-2433](https://youtrack.jetbrains.com/issue/VIM-2433) Do not clear clipboard after inserting with ideaput
-* [VIM-2896](https://youtrack.jetbrains.com/issue/VIM-2896) Correct ordering of handlers
-* [VIM-2912](https://youtrack.jetbrains.com/issue/VIM-2912) Fix focus after :q
-* [VIM-2909](https://youtrack.jetbrains.com/issue/VIM-2909) Fix incorrect file detection while closing diff window
-
-### Merged PRs:
-* [589](https://github.com/JetBrains/ideavim/pull/589) by [Matt Ellis](https://github.com/citizenmatt): Refactor option usage and introduce accessor API
-* [604](https://github.com/JetBrains/ideavim/pull/604) by [Dominic Palmer](https://github.com/dominicpalmer): VIM-2773: Include empty lines in the selection when dragging backwards from EOL
-* [603](https://github.com/JetBrains/ideavim/pull/603) by [Dominic Palmer](https://github.com/dominicpalmer): VIM-2773: Prevent viewport displacement on undo
-* [602](https://github.com/JetBrains/ideavim/pull/602) by [Matt Ellis](https://github.com/citizenmatt): Refactor options service
-* [612](https://github.com/JetBrains/ideavim/pull/612) by [Dani Sevastianov](https://github.com/danisevas): Fix quick-scope setup documentation
-* [617](https://github.com/JetBrains/ideavim/pull/617) by [Silence Tai](https://github.com/Stzx): Fix dispose operation
-
-## 2.1.0, 2023-01-10
-
 ### Features:
 * Add IdeaVim tutor. You can access it via the status bar icon.

@ -136,7 +33,6 @@ usual beta standards.
 * [VIM-758](https://youtrack.jetbrains.com/issue/VIM-758) Support d mappings
 * [VIM-2577](https://youtrack.jetbrains.com/issue/VIM-2577) Fix paste at the end of notebook cell
 * [VIM-2813](https://youtrack.jetbrains.com/issue/VIM-2813) Migrate update checker to VimStandalonePluginUpdateChecker
-* [VIM-2833](https://youtrack.jetbrains.com/issue/VIM-2833) Fix rare deadlock during put in insert mode from clipboard

 ### Merged PRs:
 * [558](https://github.com/JetBrains/ideavim/pull/558) by [Matt Ellis](https://github.com/citizenmatt): Fix incorrect normalising for trailing inlay
@ -147,9 +43,6 @@ usual beta standards.
 * [561](https://github.com/JetBrains/ideavim/pull/561) by [Matt Ellis](https://github.com/citizenmatt): Fix incremental search not scrolling to current match
 * [559](https://github.com/JetBrains/ideavim/pull/559) by [Runinho](https://github.com/Runinho): Fix(VIM-2760) notebookCommandMode detection
 * [579](https://github.com/JetBrains/ideavim/pull/579) by [Martin Yzeiri](https://github.com/myzeiri): VIM-2799: Add Matchit support for cshtml files
-* [580](https://github.com/JetBrains/ideavim/pull/580) by [Martin Yzeiri](https://github.com/myzeiri): Matchit: Add more Rider file types
-* [583](https://github.com/JetBrains/ideavim/pull/583) by [Matt Ellis](https://github.com/citizenmatt): Introduce ScrollGroup
-* [586](https://github.com/JetBrains/ideavim/pull/586) by [Patrick Elmquist](https://github.com/patrick-elmquist): Fixed number references in Tutor

 ## 2.0.0, 2022-11-01

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -32,10 +32,6 @@ OK, ready to do some coding?
 Yoo hoo! You’re all set to begin contributing.
 We've prepared some useful configurations for you:

- `Start IJ with IdeaVim`
- `IdeaVim tests`
- `IdeaVim full verification`
-
 ![Prepared configurations light](assets/contributing/configs-light.png#gh-light-mode-only)![Prepared configurations dark](assets/contributing/configs-dark.png#gh-dark-mode-only)

 And here are useful gradle commands:
@ -91,16 +87,9 @@ Here are some guides for testing:

 1. Read the javadoc for the `@VimBehaviorDiffers` annotation in the source code.

-2. Please avoid senseless text like "dhjkwaldjwa", "asdasdasd", "123 123 123 123", etc. Use a few lines of code or
-the following template:
-```text
-Lorem Ipsum
-
-Lorem ipsum dolor sit amet,
-consectetur adipiscing elit
-Sed in orci mauris.
-Cras id tellus in ex imperdiet egestas.
-```
+2. Please avoid senseless text like "dhjkwaldjwa", "asdasdasd", "123 123 123 123", etc. Try to choose an example
+text that is easy to read and understand what is wrong if the test fails. For example, take a few lines from your
+favorite poem, or use Vladimir Nabokov’s “A Discovery" if you don't have one.

 3. Don't forget to test your functionality with line start, line end, file start, file end, empty line, multiple
 carets, dollar motion, etc.
@ -160,7 +149,7 @@ This is just terrible. [You know what to do](https://github.com/JetBrains/ideavi

 ### Resources:

-* [Continuous integration builds](https://ideavim.teamcity.com/)
+* [Continuous integration builds](https://teamcity.jetbrains.com/project.html?projectId=IdeaVim&guest=1)
 * [Bug tracker](https://youtrack.jetbrains.com/issues/VIM)
 * [Chat on gitter](https://gitter.im/JetBrains/ideavim)
 * [IdeaVim Channel](https://jb.gg/bi6zp7) on [JetBrains Server](https://discord.gg/jetbrains)
@ -168,5 +157,5 @@ This is just terrible. [You know what to do](https://github.com/JetBrains/ideavi
 * [Changelog](CHANGES.md)
 * [Contributors listing](AUTHORS.md)

-[teamcity-build-status]: https://ideavim.teamcity.com/viewType.html?buildTypeId=Ideavim_IdeaVimTests_Latest_EAP&guest=1
-[teamcity-build-status-svg]: https://ideavim.teamcity.com/app/rest/builds/buildType:(id:Ideavim_IdeaVimTests_Latest_EAP)/statusIcon.svg?guest=1
+[teamcity-build-status]: https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJEAP&guest=1
+[teamcity-build-status-svg]: https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJEAP)/statusIcon.svg?guest=1
--- a/README.md
+++ b/README.md
@ -22,10 +22,9 @@ IdeaVim is a Vim engine for JetBrains IDEs.

 ##### Resources:

-* [Plugin homepage](https://lp.jetbrains.com/ideavim/)
-* [Plugin on Marketplace](https://plugins.jetbrains.com/plugin/164-ideavim)
+* [Plugin homepage](https://plugins.jetbrains.com/plugin/164-ideavim)
 * [Changelog](CHANGES.md)
-* [Continuous integration builds](https://ideavim.teamcity.com/)
+* [Continuous integration builds](https://teamcity.jetbrains.com/project.html?projectId=IdeaVim&guest=1)

 #### Compatibility

@ -54,7 +53,7 @@ Would you like to try new features and fixes? Join the Early Access Program and
 receive EAP builds as updates!  

 1. Click the  IdeaVim icon <img src="src/main/resources/META-INF/pluginIcon_noBorders.svg" width="16" height="16" alt="icon"/>
-in the status bar  | `Early Access Program` | `Subscribe to EAP`
+in the status bar  | `Early Access Program` | `Subscibe to EAP`


 Or subscribe to EAP updates manually:
@ -204,7 +203,7 @@ Put your settings to `$XDG_CONFIG_HOME/ideavim/ideavimrc` file.
 IdeaVim Plugins
 --------------------

-See [doc/IdeaVim Plugins.md](https://github.com/JetBrains/ideavim/wiki/IdeaVim-Plugins)
+See [doc/emulated-plugins.md](https://github.com/JetBrains/ideavim/wiki/IdeaVim-Plugins)

 Executing IDE Actions
 ---------------------
@ -213,14 +212,14 @@ IdeaVim adds various commands for listing and executing arbitrary IDE actions as
 Ex commands or via `:map` command mappings:

 ### Executing actions:
+* `:action {action_id}`
+    * Execute an action by `{action_id}`. Works from Ex command line.
+    * Please don't use `:action` in mappings. Use `<Action>` instead.
 * `<Action>({action_id})`
    * For the mappings you can use a special `<Action>` keyword. Don't forget the parentheses.
    * E.g. `map gh <Action>(ShowErrorDescription)`  <- execute hover on `gh`.
    * :warning: Mappings to `<Action>` don't work with `noremap`. 
      If you know the case when it's needed, please [let us know](https://github.com/JetBrains/ideavim#contact-maintainers).
-* `:action {action_id}`
-    * Execute an action by `{action_id}`. Works from Ex command line.
-    * Please don't use `:action` in mappings. Use `<Action>` instead.

 ### Finding action ids:

@ -353,12 +352,9 @@ is the source of this knowledge.
 [Here](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/normal.c#L5365)
 is the full list of synonyms.

- You can read a [post](https://github.com/JetBrains/ideavim/wiki/how-many-modes-does-vim-have) about how modes work in Vim and IdeaVim.
-
 - Have you ever used `U` after `dd`? [Don't even try](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/ops.c#L874).

- A lot of variables that refer to visual mode start with two uppercase letters, e.g. `VIsual_active`. [Some examples](https://github.com/vim/vim/blob/master/src/normal.c#L17).
-  As mentioned [here](https://vi.stackexchange.com/a/42885/12441), this was done this way to avoid the clash with X11.
+- A lot of variables that refers to visual mode start with two uppercase letters, e.g. `VIsual_active`. [Some examples](https://github.com/vim/vim/blob/master/src/normal.c#L17).

 - Other [strange things](https://github.com/vim/vim/blob/759d81549c1340185f0d92524c563bb37697ea88/src/ex_docmd.c#L1845) from vi:
    * ":3"       jumps to line 3
@ -367,9 +363,6 @@ is the full list of synonyms.

 - Vim script doesn't skip white space before comma. `F(a ,b)` => E475.

- 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.
-
 License
 -------

--- a/ThirdPartyLicenses.md
+++ b/ThirdPartyLicenses.md
@ -1,8 +1,7 @@
 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.
+File [RegExp.kt](src/main/java/com/maddyhome/idea/vim/regexp/RegExp.kt) is licensed under Vim License.  
+File [Tutor.kt](src/main/java/com/maddyhome/idea/vim/ui/Tutor.kt) is licensed under Vim License.

 ```
 VIM LICENSE
@ -28,8 +27,8 @@ II) It is allowed to distribute a modified (or extended) version of Vim,
          maintainer will do with your changes and under what license they
          will be distributed is negotiable.  If there has been no negotiation
          then this license, or a later version, also applies to your changes.
-          The current maintainers are listed here: https://github.com/orgs/vim/people.
-          If this changes it will be announced in appropriate places (most likely
+          The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+          changes it will be announced in appropriate places (most likely
          vim.sf.net, www.vim.org and/or comp.editors). When it is completely
          impossible to contact the maintainer, the obligation to send him
          your changes ceases.  Once the maintainer has confirmed that he has
--- a/annotation-processors/.gitignore
+++ b/annotation-processors/.gitignore
@ -1,42 +0,0 @@
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store
--- a/annotation-processors/build.gradle.kts
+++ b/annotation-processors/build.gradle.kts
@ -1,23 +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.
- */
-
-plugins {
-  kotlin("jvm")
-}
-
-group = "com.intellij"
-version = "SNAPSHOT"
-
-repositories {
-  mavenCentral()
-}
-
-dependencies {
-  compileOnly("com.google.devtools.ksp:symbol-processing-api:1.9.10-1.0.13")
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.0")
-}
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/annotations/ExCommand.kt
+++ b/annotation-processors/src/main/kotlin/com/intellij/vim/annotations/ExCommand.kt
@ -1,16 +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 com.intellij.vim.annotations
-
-/**
- * [command] is formatted the same way it is formatted in Vim (with optional part in square brackets).
- */
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-annotation class ExCommand(val command: String)
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/annotations/VimscriptFunction.kt
+++ b/annotation-processors/src/main/kotlin/com/intellij/vim/annotations/VimscriptFunction.kt
@ -1,13 +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 com.intellij.vim.annotations
-
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-annotation class VimscriptFunction(val name: String)
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/processors/ExCommandProcessor.kt
+++ b/annotation-processors/src/main/kotlin/com/intellij/vim/processors/ExCommandProcessor.kt
@ -1,55 +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 com.intellij.vim.processors
-
-import com.google.devtools.ksp.KspExperimental
-import com.google.devtools.ksp.getAnnotationsByType
-import com.google.devtools.ksp.processing.Resolver
-import com.google.devtools.ksp.processing.SymbolProcessor
-import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
-import com.google.devtools.ksp.symbol.KSAnnotated
-import com.google.devtools.ksp.symbol.KSClassDeclaration
-import com.google.devtools.ksp.symbol.KSFile
-import com.google.devtools.ksp.symbol.KSVisitorVoid
-import com.intellij.vim.annotations.ExCommand
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import kotlin.io.path.Path
-import kotlin.io.path.writeText
-
-class ExCommandProcessor(private val environment: SymbolProcessorEnvironment): SymbolProcessor {
-  private val visitor = EXCommandVisitor()
-  private val commandToClass = mutableMapOf<String, String>()
-
-  private val json = Json { prettyPrint = true }
-
-  override fun process(resolver: Resolver): List<KSAnnotated> {
-    resolver.getAllFiles().forEach { it.accept(visitor, Unit) }
-    val filePath = Path(environment.options["generated_directory"]!!, environment.options["ex_commands_file"]!!)
-    val fileContent = json.encodeToString(commandToClass)
-    filePath.writeText(fileContent)
-
-    return emptyList()
-  }
-
-  private inner class EXCommandVisitor : KSVisitorVoid() {
-    @OptIn(KspExperimental::class)
-    override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
-      val exCommandAnnotation = classDeclaration.getAnnotationsByType(ExCommand::class).firstOrNull() ?: return
-      val commands = exCommandAnnotation.command.split(",")
-      for (command in commands) {
-        commandToClass[command] = classDeclaration.qualifiedName!!.asString()
-      }
-    }
-
-    override fun visitFile(file: KSFile, data: Unit) {
-      file.declarations.forEach { it.accept(this, Unit) }
-    }
-  }
-}
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/processors/VimscriptFunctionProcessor.kt
+++ b/annotation-processors/src/main/kotlin/com/intellij/vim/processors/VimscriptFunctionProcessor.kt
@ -1,55 +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 com.intellij.vim.processors
-
-import com.google.devtools.ksp.KspExperimental
-import com.google.devtools.ksp.getAnnotationsByType
-import com.google.devtools.ksp.processing.Resolver
-import com.google.devtools.ksp.processing.SymbolProcessor
-import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
-import com.google.devtools.ksp.symbol.KSAnnotated
-import com.google.devtools.ksp.symbol.KSClassDeclaration
-import com.google.devtools.ksp.symbol.KSFile
-import com.google.devtools.ksp.symbol.KSVisitorVoid
-import com.intellij.vim.annotations.VimscriptFunction
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import kotlin.io.path.Path
-import kotlin.io.path.writeText
-
-class VimscriptFunctionProcessor(private val environment: SymbolProcessorEnvironment) : SymbolProcessor {
-  private val visitor = VimscriptFunctionVisitor()
-  private val nameToClass = mutableMapOf<String, String>()
-
-  private val json = Json { prettyPrint = true }
-
-  override fun process(resolver: Resolver): List<KSAnnotated> {
-    resolver.getAllFiles().forEach { it.accept(visitor, Unit) }
-    val filePath = Path(environment.options["generated_directory"]!!, environment.options["vimscript_functions_file"]!!)
-    val fileContent = json.encodeToString(nameToClass)
-    filePath.writeText(fileContent)
-
-    return emptyList()
-  }
-
-  // todo inspection that annotation is properly used on proper classes
-  private inner class VimscriptFunctionVisitor : KSVisitorVoid() {
-    @OptIn(KspExperimental::class)
-    override fun visitClassDeclaration(classDeclaration: KSClassDeclaration, data: Unit) {
-      val vimscriptFunctionAnnotation = classDeclaration.getAnnotationsByType(VimscriptFunction::class).firstOrNull() ?: return
-      val functionName = vimscriptFunctionAnnotation.name
-      nameToClass[functionName] = classDeclaration.qualifiedName!!.asString()
-    }
-
-    override fun visitFile(file: KSFile, data: Unit) {
-      file.declarations.forEach { it.accept(this, Unit) }
-    }
-  }
-}
-
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/providers/ExCommandProcessorProvider.kt
+++ b/annotation-processors/src/main/kotlin/com/intellij/vim/providers/ExCommandProcessorProvider.kt
@ -1,20 +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 com.intellij.vim.providers
-
-import com.google.devtools.ksp.processing.SymbolProcessor
-import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
-import com.google.devtools.ksp.processing.SymbolProcessorProvider
-import com.intellij.vim.processors.ExCommandProcessor
-
-class ExCommandProcessorProvider : SymbolProcessorProvider {
-  override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
-    return ExCommandProcessor(environment)
-  }
-}
--- a/annotation-processors/src/main/kotlin/com/intellij/vim/providers/VimscriptFunctionProcessorProvider.kt
+++ b/annotation-processors/src/main/kotlin/com/intellij/vim/providers/VimscriptFunctionProcessorProvider.kt
@ -1,20 +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 com.intellij.vim.providers
-
-import com.google.devtools.ksp.processing.SymbolProcessor
-import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
-import com.google.devtools.ksp.processing.SymbolProcessorProvider
-import com.intellij.vim.processors.VimscriptFunctionProcessor
-
-public class VimscriptFunctionProcessorProvider : SymbolProcessorProvider {
-  override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor {
-    return VimscriptFunctionProcessor(environment)
-  }
-}
--- a/annotation-processors/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
+++ b/annotation-processors/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider
@ -1,2 +0,0 @@
-com.intellij.vim.providers.VimscriptFunctionProcessorProvider
-com.intellij.vim.providers.ExCommandProcessorProvider
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2022 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
@ -31,9 +31,6 @@ import kotlinx.serialization.json.putJsonObject
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.RepositoryBuilder
 import org.intellij.markdown.ast.getTextInNode
-import org.jetbrains.changelog.Changelog
-import org.jetbrains.changelog.exceptions.MissingVersionException
-import org.kohsuke.github.GHUser
 import java.net.HttpURLConnection
 import java.net.URL

@ -44,19 +41,16 @@ buildscript {
    }

    dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20")
        classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
-        classpath("org.eclipse.jgit:org.eclipse.jgit:6.6.0.202305301015-r")
-
-        // This is needed for jgit to connect to ssh
-        classpath("org.eclipse.jgit:org.eclipse.jgit.ssh.apache:6.7.0.202309050840-r")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r")
        classpath("org.kohsuke:github-api:1.305")

-        classpath("io.ktor:ktor-client-core:2.3.4")
-        classpath("io.ktor:ktor-client-cio:2.3.4")
-        classpath("io.ktor:ktor-client-auth:2.3.4")
-        classpath("io.ktor:ktor-client-content-negotiation:2.3.4")
-        classpath("io.ktor:ktor-serialization-kotlinx-json:2.3.4")
+        classpath("io.ktor:ktor-client-core:2.1.3")
+        classpath("io.ktor:ktor-client-cio:2.1.3")
+        classpath("io.ktor:ktor-client-auth:2.1.3")
+        classpath("io.ktor:ktor-client-content-negotiation:2.1.3")
+        classpath("io.ktor:ktor-serialization-kotlinx-json:2.1.3")

        // This comes from the changelog plugin
 //        classpath("org.jetbrains:markdown:0.3.1")
@ -66,31 +60,17 @@ buildscript {
 plugins {
    antlr
    java
-    kotlin("jvm") version "1.8.21"
+    kotlin("jvm") version "1.7.20"
    application

-    id("org.jetbrains.intellij") version "1.15.0"
-    id("org.jetbrains.changelog") version "2.2.0"
+    id("org.jetbrains.intellij") version "1.11.1-SNAPSHOT"
+    id("org.jetbrains.changelog") version "1.3.1"

    // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
-//    id("org.jlleitschuh.gradle.ktlint") version "11.3.1"
+    id("org.jlleitschuh.gradle.ktlint") version "10.3.0"

    id("org.jetbrains.kotlinx.kover") version "0.6.1"
-    id("com.dorongold.task-tree") version "2.1.1"
-
-    id("com.google.devtools.ksp") version "1.8.21-1.0.11"
-}
-
-ksp {
-  arg("generated_directory", "$projectDir/src/main/resources")
-  arg("vimscript_functions_file", "intellij_vimscript_functions.json")
-  arg("ex_commands_file", "intellij_ex_commands.json")
-}
-
-afterEvaluate {
-//  tasks.named("kspKotlin").configure { dependsOn("clean") }
-  tasks.named("kspKotlin").configure { dependsOn("generateGrammarSource") }
-  tasks.named("kspTestKotlin").configure { enabled = false }
+    id("com.dorongold.task-tree") version "2.1.0"
 }

 // Import variables from gradle.properties file
@ -114,8 +94,8 @@ repositories {
 }

 dependencies {
-    compileOnly("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
-    compileOnly("org.jetbrains:annotations:24.0.1")
+    compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
+    compileOnly("org.jetbrains:annotations:23.0.0")

    // https://mvnrepository.com/artifact/com.ensarsarajcic.neovim.java/neovim-api
    testImplementation("com.ensarsarajcic.neovim.java:neovim-api:0.2.3")
@ -125,7 +105,7 @@ dependencies {
    testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")

    // https://mvnrepository.com/artifact/org.mockito.kotlin/mockito-kotlin
-    testImplementation("org.mockito.kotlin:mockito-kotlin:5.1.0")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")

    testImplementation("com.intellij.remoterobot:remote-robot:$remoteRobotVersion")
    testImplementation("com.intellij.remoterobot:remote-fixtures:$remoteRobotVersion")
@ -135,14 +115,7 @@ dependencies {

    api(project(":vim-engine"))

-    ksp(project(":annotation-processors"))
-    compileOnly(project(":annotation-processors"))
-
-    testApi("com.squareup.okhttp3:okhttp:4.11.0")
-
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.0")
+    testApi("com.squareup.okhttp3:okhttp:4.10.0")
 }

 configurations {
@ -159,19 +132,16 @@ tasks.register<Test>("testWithNeovim") {
    exclude("/ui/**")
    exclude("**/longrunning/**")
    exclude("**/propertybased/**")
-    useJUnitPlatform()
 }

 tasks.register<Test>("testPropertyBased") {
    group = "verification"
 //    include("**/propertybased/**")
-    useJUnitPlatform()
 }

 tasks.register<Test>("testLongRunning") {
    group = "verification"
 //    include("**/longrunning/**")
-    useJUnitPlatform()
 }

 tasks {
@ -244,7 +214,6 @@ java {
 }

 kotlin {
-    explicitApi()
    jvmToolchain {
        languageVersion.set(JavaLanguageVersion.of(javaVersion))
    }
@ -269,7 +238,7 @@ intellij {
    instrumentCode.set(instrumentPluginCode.toBoolean())
    intellijRepository.set("https://www.jetbrains.com/intellij-repository")
    // Yaml is only used for testing. It's part of the IdeaIC distribution, but needs to be included as a reference
-    plugins.set(listOf("java", "AceJump:3.8.11", "yaml"/*, "Pythonid:231.8109.2", "com.intellij.clion-swift:231.8109.4"*/))
+    plugins.set(listOf("java", "AceJump:3.8.4", "yaml"))
 }

 tasks {
@ -282,12 +251,6 @@ tasks {
        token.set(publishToken)
    }

-    signPlugin {
-        certificateChain.set(providers.environmentVariable("CERTIFICATE_CHAIN"))
-        privateKey.set(providers.environmentVariable("PRIVATE_KEY"))
-        password.set(providers.environmentVariable("PRIVATE_KEY_PASSWORD"))
-    }
-
    runIdeForUiTests {
        systemProperty("robot-server.port", "8082")
        systemProperty("ide.mac.message.dialogs.as.sheets", "false")
@ -321,16 +284,10 @@ tasks {
        from(sourceSets.main.get().java) {
            include("**/com/maddyhome/idea/vim/**/*.java")
        }
-        from(project(":vim-engine").sourceSets.main.get().java) {
-            include("**/com/maddyhome/idea/vim/**/*.java")
-        }
        // Kotlin sources
        from(kotlin.sourceSets.main.get().kotlin) {
            include("**/com/maddyhome/idea/vim/**/*.kt")
        }
-        from(project(":vim-engine").kotlin.sourceSets.main.get().kotlin) {
-            include("**/com/maddyhome/idea/vim/**/*.kt")
-        }
        destinationDirectory.set(layout.buildDirectory.dir("libs"))
        archiveClassifier.set("src")
    }
@ -340,41 +297,23 @@ tasks {
        from(createOpenApiSourceJar) { into("lib/src") }
    }

-    val pluginVersion = version
    // Don't forget to update plugin.xml
    patchPluginXml {
-        sinceBuild.set("231.7515.13")
-
-        // Get the latest available change notes from the changelog file
-        changeNotes.set(
-            provider {
-                with(changelog) {
-                    val log = try {
-                        getUnreleased()
-                    } catch (e: MissingVersionException) {
-                        getOrNull(pluginVersion.toString()) ?: getLatest()
-                    }
-                    renderItem(
-                        log,
-                        org.jetbrains.changelog.Changelog.OutputType.HTML,
-                    )
-                }
-            },
-        )
+        sinceBuild.set("223.7401.7")
    }
 }

 // --- Linting

-//ktlint {
-//    version.set("0.48.2")
-//}
+ktlint {
+    disabledRules.add("no-wildcard-imports")
+    version.set("0.43.0")
+}

 // --- Tests

 tasks {
    test {
-        useJUnitPlatform()
        exclude("**/propertybased/**")
        exclude("**/longrunning/**")
        exclude("/ui/**")
@ -383,7 +322,6 @@ tasks {

 tasks.register<Test>("testUi") {
    group = "verification"
-    useJUnitPlatform()
    include("/ui/**")
 }

@ -399,6 +337,14 @@ changelog {
 //    version = "0.60"
 }

+tasks.register("getUnreleasedChangelog") {
+    group = "changelog"
+    doLast {
+        val log = changelog.getUnreleased().toHTML()
+        println(log)
+    }
+}
+
 // --- Kover

 koverMerged {
@ -423,8 +369,7 @@ tasks.register("slackNotification") {
            println("Slack Url is not defined")
            return@doLast
        }
-
-        val changeLog = changelog.renderItem(changelog.getLatest(), Changelog.OutputType.PLAIN_TEXT)
+        val changeLog = changelog.getLatest().toText()
        val slackDown = DownParser(changeLog, true).toSlack().toString()

        //language=JSON
@ -523,7 +468,7 @@ tasks.register("releaseActions") {
        if (tickets.isNotEmpty()) {
            println("Updating statuses for tickets: $tickets")
            setYoutrackStatus(tickets, "Fixed")
-            if (getVersionIdByName(version.toString()) != null) {
+            if (!checkReleaseVersionExists(version.toString())) {
                addReleaseToYoutrack(version.toString())
            } else {
                println("Version $version is already exists in YouTrack")
@ -557,17 +502,14 @@ tasks.register("integrationsTest") {
        setYoutrackStatus(listOf(testTicketId), prevStatus)

        // Check adding and removing release
-        val existingVersionId = getVersionIdByName("TEST_VERSION")
-        if (existingVersionId != null) {
-            deleteVersionById(existingVersionId)
-        }
+        guard(!checkReleaseVersionExists("TEST_VERSION")) { "Test version already exists" }
        val versionId = addReleaseToYoutrack("TEST_VERSION")
-        guard(getVersionIdByName("TEST_VERSION") != null) { "Test version isn't created" }
+        guard(checkReleaseVersionExists("TEST_VERSION")) { "Test version isn't created" }
        setYoutrackStatus(listOf(testTicketId), "Fixed")
        setYoutrackFixVersion(listOf(testTicketId), "TEST_VERSION")
        deleteVersionById(versionId)
        setYoutrackStatus(listOf(testTicketId), "Open")
-        guard(getVersionIdByName("TEST_VERSION") == null) { "Test version isn't deleted" }
+        guard(!checkReleaseVersionExists("TEST_VERSION")) { "Test version isn't deleted" }

        updateMergedPr(525)
        // TODO: test Ticket parsing
@ -618,12 +560,12 @@ fun addReleaseToYoutrack(name: String): String {
    }
 }

-fun getVersionIdByName(name: String): String? {
+fun checkReleaseVersionExists(name: String): Boolean {
    val client = httpClient()

    return runBlocking {
        val response = client.get("https://youtrack.jetbrains.com/api/admin/projects/$vimProjectId/customFields/$fixVersionsFieldId/bundle/values?fields=id,name&query=$name")
-        response.body<JsonArray>().singleOrNull()?.jsonObject?.get("id")?.jsonPrimitive?.content
+        response.body<JsonArray>().isNotEmpty()
    }
 }

@ -797,15 +739,7 @@ fun updateAuthors(uncheckedEmails: Set<String>) {
            println("Email '$email' is from dependabot. Skip it")
            continue
        }
-        if ("tcuser" in email) {
-            println("Email '$email' is from teamcity. Skip it")
-            continue
-        }
-        val user: GHUser? = ghRepository.getCommit(hash).author
-        if (user == null) {
-            println("Cant get the commit author. Email: $email. Commit: $hash")
-            continue
-        }
+        val user = ghRepository.getCommit(hash).author
        val htmlUrl = user.htmlUrl.toString()
        val name = user.name ?: user.login
        users.add(Author(name, htmlUrl, email))
@ -823,7 +757,7 @@ fun updateAuthors(uncheckedEmails: Set<String>) {
    for (child in contributorsSection.children) {
        if (child.children.size > 1) {
            existingEmails.add(
-                child.children[1].children[0].children[2].children[2].getTextInNode(authors).toString(),
+                child.children[1].children[0].children[2].children[2].getTextInNode(authors).toString()
            )
        }
    }
@ -968,7 +902,7 @@ fun changes(): List<Change> {
    val newFixes = mutableListOf<Change>()
    println("Last successful commit: $lastSuccessfulCommit")
    println("Amount of commits: ${messages.size}")
-    println("Start changes processing")
+    println("Start emails processing")
    for (message in messages) {
        println("Processing '$message'...")
        val lowercaseMessage = message.toLowerCase()
@ -1002,7 +936,7 @@ fun httpClient(): HttpClient {
                Json {
                    prettyPrint = true
                    isLenient = true
-                },
+                }
            )
        }
    }
--- a/config/ktlint/baseline.xml
+++ b/config/ktlint/baseline.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<baseline version="1.0">
+	<file name="src/main/java/com/maddyhome/idea/vim/listener/RiderSpecifics.kt">
+		<error line="1" column="1" source="filename" />
+	</file>
+</baseline>
--- a/doc/IdeaVim
+++ b/doc/IdeaVim
@ -1,7 +1,7 @@
 IdeaVim Plugins
 --------------------

-IdeaVim plugins work like the original Vim plugins. If you want to turn any of them on, you have to enable it via this command in your `~/.ideavimrc`:
+IdeaVim plugins work like the original Vim plugins. If you want to turn of any of them, you have to enable it via this command in your `~/.ideavimrc`:

 ```
 Plug '<plugin-github-reference>'
@ -388,7 +388,7 @@ https://github.com/adelarsq/vim-matchit/blob/master/doc/matchit.txt
 Original plugin: [quick-scope](https://github.com/unblevable/quick-scope).

 ### Setup:
- Install [IdeaVim-Quickscope](https://plugins.jetbrains.com/plugin/19417-ideavim-quickscope) plugin.
+- Install [IdeaVim-sneak](https://plugins.jetbrains.com/plugin/15348-ideavim-sneak) plugin.
 - Add the following command to `~/.ideavimrc`: `set quickscope`

 ### Instructions
--- a/doc/NERDTree-support.md
+++ b/doc/NERDTree-support.md
@ -2,7 +2,7 @@

 IdeaVim supports the NERDTree plugin. Update your `~/.ideavimrc` to turn it on:
 ```vim
-Plug 'preservim/nerdtree'
+Plug 'preservim/nerdtree`
 ```
 or
 ```vim
@ -15,7 +15,7 @@ Use `set noNERDTree` to disable this extension.

 ```vim
 set NERDTree
-Plug 'preservim/nerdtree'
+Plug 'preservim/nerdtree`
 Plug 'https://github.com/preservim/nerdtree'
 Plug 'https://github.com/scrooloose/nerdtree'
 Plug 'scrooloose/nerdtree'
--- a/doc/images/action-id-notification.png
+++ b/doc/images/action-id-notification.png
--- a/doc/marketplace-plugin-example.md
+++ b/doc/marketplace-plugin-example.md
@ -1,13 +0,0 @@
-Using actions from external plugins is the same, as tracking and reusing any IDE action. As an example, let's create a mapping that will toggle case of the word under caret using the CamelCase plugin when you press `<leader>t`.
-
-**Steps to make this mapping**
-
-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
-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)```
--- a/doc/posts/how-many-modes-does-vim-have.md
+++ b/doc/posts/how-many-modes-does-vim-have.md
@ -1,43 +0,0 @@
-# How Many Modes Does Vim Have?
-
-When asked this question, many people will say three: Normal, Visual, and Insert. Some will have heard about One-command mode, while others will know about the two types of modes that are available during selection: Visual and Select. The official documentation, however, identifies seven main modes and seven additional ones (search for `:h vim-mode` [here](https://vimhelp.org/intro.txt.html#vim-modes)). What’s more, the documentation for the built-in `mode()` function states that up to 35 different mode values may be returned (search for `:h mode()` [here](https://vimhelp.org/builtin.txt.html#mode%28%29)).
-
-
-## Modes in Vim
-
-The `mode()` function returns a string. Each character in this string represents a mode or its sub-mode. For example:
-
-
-
-* n          Normal
-* i           Insert
-* no        Operator-pending
-* niI        Normal using |i_CTRL-O| in |Insert-mode|
-* niR      Normal using |i_CTRL-O| in |Replace-mode|
-
-The documentation for the function states that, if you check the mode, you should only compare by prefix rather than the whole string. Moreover, the list of modes can be extended.
-
-During the development of IdeaVim, it turned out that even 35 modes were not enough to represent the full range of Vim states. For example, the `mode()` function does not cover the state when we enter Operator-pending mode after One-command mode. This information is important because we have to know that Vim should enter Insert mode after this particular Operator-pending command is finished.
-
-All of the above shows that Vim itself doesn’t have a strictly bounded set of modes. Rather, the list can be extended with new ones, and the regular modes, like Visual or Normal, may have “submodes” that specify certain details of Vim’s state.
-
-Inside the code, the state of Vim is defined by the `State` variable in the `globals.h` file ([source](https://github.com/neovim/neovim/blob/master/src/nvim/globals.h#L637)). This is an integer variable with a [list of possible values](https://github.com/neovim/neovim/blob/master/src/nvim/vim.h#L47). However, this list does not define the full range of modes, and other variables from the `globals.h `file store information about specifics. For example, <code>[restart_edit](https://github.com/neovim/neovim/blob/389165cac1596bf602c50904a789722d65ceaac7/src/nvim/globals.h#L670)</code> is set when we enter One-command mode, and <code>[VIsual_active](https://github.com/neovim/neovim/blob/389165cac1596bf602c50904a789722d65ceaac7/src/nvim/globals.h#L535)</code> defines whether Visual mode is enabled (check out [this README](https://github.com/JetBrains/ideavim#some-facts-about-vim) to learn why this variable starts with two uppercase letters). Meanwhile, the <code>[get_real_mode](https://github.com/neovim/neovim/blob/389165cac1596bf602c50904a789722d65ceaac7/src/nvim/state.c#L154)</code> function helps determine whether Vim is in Select or Visual mode.
-
-The `mode()` function, which delegates to <code>[get_mode()](https://github.com/neovim/neovim/blob/389165cac1596bf602c50904a789722d65ceaac7/src/nvim/state.c#L173)</code>, is a big set of “if” commands that collect the information from different variables and combine them into a string representation.
-
-
-## Modes in IdeaVim
-
-For a long time, IdeaVim used a stack to store the information about the current mode:
-
-
-
-* The default value is Normal mode
-* When entering Insert mode, an “INSERT” command is added to the stack
-* If the user presses _Ctrl-O_ to enter One-time command mode, a “NORMAL” command is added to the stack.
-* On _Esc_, the top value of the stack is popped, activating Insert mode.
-* On the second _Esc_, the top value is popped again, deactivating Insert mode.
-
-This solution worked well for a long time. However, it sometimes led to programming mistakes, as this structure allowed incorrect states when the stack contained a senseless mix of modes. For the most part, these downsides were manageable, and we were generally able to keep the state consistent. Nevertheless, we recently decided to perform a refactoring.
-
-Now IdeaVim has a single `Mode` interface ([source](https://github.com/JetBrains/ideavim/blob/98886cb269752a5f989c90b1da90fc624b3a381c/vim-engine/src/main/kotlin/com/maddyhome/idea/vim/state/mode/Mode.kt#L27)) that represents the mode and all possible states of it. This solution is type-safe and helps developers of IdeaVim avoid setting illegal states.
--- a/doc/support-guide.md
+++ b/doc/support-guide.md
@ -1,38 +0,0 @@
-# Support Guide
-
-This document is created to help our support team.
-It's not intended to be read by the users as it brings to value to them.
-
-## Support channels
-
- Main, YouTrack: https://youtrack.jetbrains.com/issues/VIM
- [Chat on gitter](https://gitter.im/JetBrains/ideavim)
- [IdeaVim Channel](https://jb.gg/bi6zp7) on [JetBrains Server](https://discord.gg/jetbrains)
- Rare: GitHub discussions - https://github.com/JetBrains/ideavim/discussions
-
-## Expectations from the support
-
- Process incoming requests from all the support channels
- Request for an additional information
- Help users to answer simple cases
- Try to reproduce the issue
- Try to help user if this is misconfiguration / incorrect usage
- Pass actual bugs to the dev team
- Update "State" and "Area" fields
-
-## YouTrack statuses
-
-IdeaVim has multiple YouTrack statuses, main are:
-
- Submitted: issue is created by user, but not processed by our team. This is the default status for new tickets.
- Open: issues is processed by out team, what means that the issues is reproduced and accepted
- Waiting For Reply: Waiting for further information from the user. These issues are automatically closed if the
-     user doesn't reply in 30 days.
- Ready To Release: Bug is fixed, but not yet released
- Fixed: Bug is fixed
- Closed: Issue is closed by some other reason
-
-# ~.ideavimrc file
-
-`~/.ideavimrc` is the file that is used for IdeaVim configuration. It may affect behaviour of the program,
-so it makes sense to additionally request this file in case the issues can't be reproduced.
--- a/gradle.properties
+++ b/gradle.properties
@ -1,5 +1,5 @@
 #
-# Copyright 2003-2023 The IdeaVim authors
+# Copyright 2003-2022 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
@ -8,16 +8,16 @@

 # suppress inspection "UnusedProperty" for whole file

-ideaVersion=2023.2.1
+ideaVersion=2022.3
 downloadIdeaSources=true
 instrumentPluginCode=true
-version=chylex-16
+version=chylex-15
 javaVersion=17
-remoteRobotVersion=0.11.17
+remoteRobotVersion=0.11.15
 antlrVersion=4.10.1

 # Please don't forget to update kotlin version in buildscript section
-kotlinVersion=1.8.21
+kotlinVersion=1.7.20
 publishToken=token
 publishChannels=eap

@ -29,6 +29,3 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'

 # Disable warning from gradle-intellij-plugin. Kotlin stdlib is included as compileOnly, so the warning is unnecessary
 kotlin.stdlib.default.dependency=false
-
-# Disable incremental annotation processing
-ksp.incremental=false
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
-networkTimeout=10000
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/25
+++ b/25
@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@ -80,11 +80,14 @@ do
    esac
 done

-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

@ -140,16 +143,12 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
    case $MAX_FD in  #(
      '' | soft) :;; #(
      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@ -194,10 +193,6 @@ if "$cygwin" || "$msys" ; then
    done
 fi

-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@ -210,12 +205,6 @@ set -- \
        org.gradle.wrapper.GradleWrapperMain \
        "$@"

-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
--- a/gradlew.bat
+++ b/gradlew.bat
@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem  Gradle startup script for Windows
@ -25,8 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal

 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 :end
@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd

 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1

 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
--- a/qodana.sarif.json
+++ b/qodana.sarif.json
--- a/scripts/build.gradle.kts
+++ b/scripts/build.gradle.kts
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2022 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
@ -7,135 +7,45 @@
 */

 plugins {
-  java
-  kotlin("jvm")
-  application
+    java
+    kotlin("jvm")
+    application
 }

 // group 'org.jetbrains.ideavim'
 // version 'SNAPSHOT'

 repositories {
-  mavenCentral()
+    mavenCentral()
 }

 dependencies {
-  compileOnly("org.jetbrains.kotlin:kotlin-stdlib:1.9.10")
+    compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20")

-  implementation("io.ktor:ktor-client-core:2.3.4")
-  implementation("io.ktor:ktor-client-cio:2.3.4")
-  implementation("io.ktor:ktor-client-content-negotiation:2.3.4")
-  implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.4")
-  implementation("io.ktor:ktor-client-auth:2.3.4")
-  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.7.0.202309050840-r")
-  implementation("com.vdurmont:semver4j:3.1.0")
+    implementation("io.ktor:ktor-client-core:2.1.3")
+    implementation("io.ktor:ktor-client-cio:2.1.3")
+    implementation("io.ktor:ktor-client-content-negotiation:2.1.3")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.3")
 }

-val releaseType: String? by project
-
 tasks {
-  compileKotlin {
-    kotlinOptions {
-      freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
+    compileKotlin {
+        kotlinOptions {
+            freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
+        }
    }
-  }
 }

 tasks.register("generateIdeaVimConfigurations", JavaExec::class) {
-  group = "verification"
-  description = "This job tracks if there are any new plugins in marketplace we don't know about"
-  mainClass.set("scripts.MainKt")
-  classpath = sourceSets["main"].runtimeClasspath
+    group = "verification"
+    description = "This job tracks if there are any new plugins in marketplace we don't know about"
+    mainClass.set("scripts.MainKt")
+    classpath = sourceSets["main"].runtimeClasspath
 }

 tasks.register("checkNewPluginDependencies", JavaExec::class) {
-  group = "verification"
-  description = "This job tracks if there are any new plugins in marketplace we don't know about"
-  mainClass.set("scripts.CheckNewPluginDependenciesKt")
-  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")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf("${rootProject.rootDir}", releaseType ?: "")
-}
-
-tasks.register("changelogUpdateUnreleased", JavaExec::class) {
-  group = "release"
-  mainClass.set("scripts.release.ChangelogUpdateUnreleasedKt")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
-}
-
-tasks.register("commitChanges", JavaExec::class) {
-  group = "release"
-  mainClass.set("scripts.release.CommitChangesKt")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
-}
-
-tasks.register("addReleaseTag", JavaExec::class) {
-  group = "release"
-  mainClass.set("scripts.release.AddReleaseTagKt")
-  classpath = sourceSets["main"].runtimeClasspath
-  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")
-  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")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf("${rootProject.rootDir}")
-}
-
-tasks.register("calculateNewDevVersion", JavaExec::class) {
-  group = "release"
-  mainClass.set("scripts.release.CalculateNewDevVersionKt")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf("${rootProject.rootDir}")
-}
-
-tasks.register("setTeamCityBuildNumber", JavaExec::class) {
-  group = "release"
-  mainClass.set("scripts.release.SetTeamCityBuildNumberKt")
-  classpath = sourceSets["main"].runtimeClasspath
-  args = listOf(project.version.toString(), rootProject.rootDir.toString(), releaseType ?: "")
+    group = "verification"
+    description = "This job tracks if there are any new plugins in marketplace we don't know about"
+    mainClass.set("scripts.CheckNewPluginDependenciesKt")
+    classpath = sourceSets["main"].runtimeClasspath
 }
--- a/scripts/src/main/kotlin/scripts/Main.kt
+++ b/scripts/src/main/kotlin/scripts/Main.kt
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2022 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
@ -10,4 +10,4 @@ package scripts

 fun main() {
  println("Hello")
-}
+}
--- a/scripts/src/main/kotlin/scripts/checkNewPluginDependencies.kt
+++ b/scripts/src/main/kotlin/scripts/checkNewPluginDependencies.kt
@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2022 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
@ -8,20 +8,22 @@

 package scripts

+import io.ktor.client.*
 import io.ktor.client.call.*
+import io.ktor.client.engine.cio.*
+import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.request.*
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.jsonPrimitive
+import io.ktor.serialization.kotlinx.json.*
+import kotlinx.coroutines.runBlocking

 /**
- * Marketplace has an API to get all plugins that depend on our plugin.
- * Here we have a list of dependent plugins at some moment, and we check if something changed in that.
+ * Marketplace has a API to get all plugins that depend on our plugin.
+ * Here we have a list of dependent plugins at some moment and we check if something changed in that.
 * If so, we need to update our list of plugins.
 *
 * This script makes no actions and aimed to notify the devs in case they need to update the list of IdeaVim plugins.
 */

-@Suppress("SpellCheckingInspection")
 val knownPlugins = listOf(
  "IdeaVimExtension",
  "github.zgqq.intellij-enhance",
@ -31,36 +33,22 @@ val knownPlugins = listOf(
  "com.github.copilot",
  "com.github.dankinsoid.multicursor",
  "com.joshestein.ideavim-quickscope",
-  "ca.alexgirard.HarpoonIJ",
-
-//   "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
 )

-suspend fun main() {
-  val response = client.get("https://plugins.jetbrains.com/api/plugins/") {
-    parameter("dependency", "IdeaVIM")
-    parameter("includeOptional", true)
+fun main() {
+  val client = HttpClient(CIO) {
+    install(ContentNegotiation) {
+      json()
+    }
  }
-  val output = response.body<List<String>>()
-  println(output)
-  if (knownPlugins != output) {
-    val newPlugins = (output - knownPlugins).map { it to (getPluginLinkByXmlId(it) ?: "Can't find plugin link") }
-    val removedPlugins = (knownPlugins - output.toSet()).map { it to (getPluginLinkByXmlId(it) ?: "Can't find plugin link") }
-    error(
-      """
-        
-      Unregistered plugins:
-      ${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()
-    )
-  }
-}

-private suspend fun getPluginLinkByXmlId(it: String): String? {
-  val newPluginLink = client.get("https://plugins.jetbrains.com/api/plugins/intellij/$it")
-    .body<JsonObject>()["link"]?.jsonPrimitive?.content
-  return newPluginLink?.let { "https://plugins.jetbrains.com$it" }
+  runBlocking {
+    val res = client.get("https://plugins.jetbrains.com/api/plugins/") {
+      parameter("dependency", "IdeaVIM")
+      parameter("includeOptional", true)
+    }
+    val output = res.body<List<String>>()
+    println(output)
+    if (knownPlugins != output) error("Unknown plugins list: ${output}")
+  }
 }
--- a/scripts/src/main/kotlin/scripts/ktor.kt
+++ b/scripts/src/main/kotlin/scripts/ktor.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
-
-import io.ktor.client.*
-import io.ktor.client.engine.cio.*
-import io.ktor.client.plugins.*
-import io.ktor.client.plugins.auth.*
-import io.ktor.client.plugins.auth.providers.*
-import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.serialization.kotlinx.json.*
-import kotlinx.serialization.json.Json
-
-internal val client = HttpClient(CIO) {
-  install(ContentNegotiation) {
-    json()
-  }
-}
-
-fun httpClient(): HttpClient {
-  return HttpClient(CIO) {
-    expectSuccess = true
-    defaultRequest {
-      url("https://youtrack.jetbrains.com/api/")
-    }
-    install(Auth) {
-      bearer {
-        loadTokens {
-          val accessToken = System.getenv("YOUTRACK_TOKEN")!!
-          BearerTokens(accessToken, "")
-        }
-      }
-    }
-    install(ContentNegotiation) {
-      json(
-        Json {
-          prettyPrint = true
-          isLenient = true
-        },
-      )
-    }
-  }
-}
--- a/scripts/src/main/kotlin/scripts/pushChanges.kt
+++ b/scripts/src/main/kotlin/scripts/pushChanges.kt
@ -1,37 +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
-
-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")
-  }
-}
--- a/scripts/src/main/kotlin/scripts/pushChangesWithReleaseBranch.kt
+++ b/scripts/src/main/kotlin/scripts/pushChangesWithReleaseBranch.kt
@ -1,54 +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
-
-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")
-  }
-}
--- a/scripts/src/main/kotlin/scripts/release/addReleaseTag.kt
+++ b/scripts/src/main/kotlin/scripts/release/addReleaseTag.kt
@ -1,27 +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 (newVersion, rootDir, _) = readArgs(args)
-
-  withGit(rootDir) { git ->
-    git
-      .tag()
-      .setName(newVersion)
-      .call()
-
-    val tagFound = git.tagList().call()
-      .map { it.name }
-      .find { it == "refs/tags/$newVersion" }
-      .isNullOrBlank()
-      .not()
-    println("Tag added. New tag found: '$tagFound'")
-  }
-}
--- a/scripts/src/main/kotlin/scripts/release/calculateNewDevVersion.kt
+++ b/scripts/src/main/kotlin/scripts/release/calculateNewDevVersion.kt
@ -1,37 +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>) {
-  println("HI!")
-  val projectDir = args[0]
-  println("Working directory: $projectDir")
-  val (lastVersion, objectId) = getVersion(projectDir, onlyStable = true)
-  println("Last version: $lastVersion, hash: ${objectId.name}")
-
-  val branch = withRepo(projectDir) { it.branch }
-  check(branch == "master") {
-    "We should be on master branch"
-  }
-  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 != objectId.name }
-    val numCommits = logDiff.size
-    println("Log diff size is $numCommits")
-    check(numCommits < 450) {
-      "More than 450 commits detected since the last release. This is suspicious."
-    }
-
-    val nextVersion = lastVersion.nextMinor().withSuffix("dev.$numCommits")
-
-    println("Next dev version: $nextVersion")
-    println("##teamcity[setParameter name='env.ORG_GRADLE_PROJECT_version' value='$nextVersion']")
-  }
-}
--- a/scripts/src/main/kotlin/scripts/release/calculateNewEapVersion.kt
+++ b/scripts/src/main/kotlin/scripts/release/calculateNewEapVersion.kt
@ -1,34 +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>) {
-  println("HI!")
-  val projectDir = args[0]
-  println("Working directory: $projectDir")
-  val (lastVersion, _) = getVersion(projectDir, onlyStable = false)
-
-  val nextVersion = if (lastVersion.suffixTokens.isEmpty()) {
-    lastVersion.nextMinor().withSuffix("eap.1").value
-  }
-  else {
-    check(lastVersion.suffixTokens.size == 2) {
-      "We should have exactly two suffix tokens. Current tokens: ${lastVersion.suffixTokens.toList()}"
-    }
-    check(lastVersion.suffixTokens[0] == "eap") {
-      "First suffix token must be eap. Current tokens: ${lastVersion.suffixTokens.toList()}"
-    }
-
-    val newEapNumber = lastVersion.suffixTokens[1].toInt().inc()
-    lastVersion.withSuffix("eap.$newEapNumber").value
-  }
-
-  println("Next eap version: $nextVersion")
-  println("##teamcity[setParameter name='env.ORG_GRADLE_PROJECT_version' value='$nextVersion']")
-}
--- a/scripts/src/main/kotlin/scripts/release/calculateNewVersion.kt
+++ b/scripts/src/main/kotlin/scripts/release/calculateNewVersion.kt
@ -1,27 +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>) {
-  println("HI!")
-  val projectDir = args[0]
-  val releaseType = args[1]
-  println("Working directory: $projectDir")
-  println("Release type: $releaseType")
-  val (lastVersion, _) = getVersion(projectDir, onlyStable = true)
-
-  val nextVersion = when (releaseType) {
-    "major" -> lastVersion.nextMajor()
-    "minor" -> lastVersion.nextMinor()
-    "patch" -> lastVersion.nextPatch()
-    else -> error("Only major, minor, and patch versions are supported. Got '$releaseType'")
-  }
-  println("Next $releaseType version: $nextVersion")
-  println("##teamcity[setParameter name='env.ORG_GRADLE_PROJECT_version' value='$nextVersion']")
-}
--- a/scripts/src/main/kotlin/scripts/release/changelogUpdateUnreleased.kt
+++ b/scripts/src/main/kotlin/scripts/release/changelogUpdateUnreleased.kt
@ -1,35 +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
-
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-import kotlin.io.path.Path
-import kotlin.io.path.readText
-import kotlin.io.path.writeText
-
-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 = changelog.replace("## To Be Released", newItem)
-  changelogPath.writeText(newChangelog)
-}
--- a/scripts/src/main/kotlin/scripts/release/commitChanges.kt
+++ b/scripts/src/main/kotlin/scripts/release/commitChanges.kt
@ -1,33 +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 (newVersion, rootDir, releaseType) = readArgs(args)
-
-  checkReleaseType(releaseType)
-
-  if (releaseType == "patch") {
-    println("Skip committing changes because release type is 'patch'")
-    return
-  }
-
-  withGit(rootDir) { git ->
-    git
-      .commit()
-      .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")
-  }
-}
--- a/scripts/src/main/kotlin/scripts/release/resetReleaseBranch.kt
+++ b/scripts/src/main/kotlin/scripts/release/resetReleaseBranch.kt
@ -1,38 +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 (_, 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")
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
chylex	8e162bce95	Set plugin version to chylex-15	2023-01-02 01:16:20 +01:00
chylex	2cdd62371e	Remove update checker	2023-01-02 01:16:19 +01:00
chylex	d461f61438	[VIM-696] Restore visual mode after undo/redo, and disable incompatible actions	2023-01-02 01:10:45 +01:00
chylex	de7fe30a97	Change matchit plugin to use HTML patterns in unrecognized files	2023-01-02 01:10:44 +01:00
chylex	6d80c21344	Fix vim-surround not working with multiple cursors Fixes multiple cursors with vim-surround commands `cs, ds, S` (but not `ys`). Conflicts: src/main/java/com/maddyhome/idea/vim/extension/surround/VimSurroundExtension.kt	2023-01-02 01:10:44 +01:00
chylex	a57a80442c	Add VimScript 'renaming()' function	2023-01-02 01:10:44 +01:00
chylex	866e6dc831	Add support for repeatable actions with ':raction'	2023-01-02 01:10:44 +01:00
chylex	f11bb12f19	Disable taking over arrow keys and Home/End	2023-01-02 01:10:44 +01:00
chylex	70ea1bd46f	Set custom plugin version	2023-01-02 01:10:44 +01:00