Set plugin version to chylex-13

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

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "wednesday"
+  - package-ecosystem: "maven"
+    directory: "/.teamcity/"
+    schedule:
+      interval: "weekly"
+      day: "wednesday"

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '44 12 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      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.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # 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@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/mergePr.yml

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

.github/workflows/mergePrTest.yml

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

.github/workflows/runUiTests.yml

@@ -0,0 +1,77 @@
+name: Run UI Tests
+on:
+  workflow_dispatch:
+  schedule:
+      - cron: '0 12 * * *'
+jobs:
+  build-for-ui-test-mac-os:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Java
+        uses: actions/setup-java@v2.1.0
+        with:
+          distribution: zulu
+          java-version: 11
+      - name: Setup FFmpeg
+        uses: FedericoCarboni/setup-ffmpeg@v1
+        with:
+          # Not strictly necessary, but it may prevent rate limit
+          # errors especially on GitHub-hosted macos machines.
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build Plugin
+        run: gradle :buildPlugin
+      - name: Run Idea
+        run: |
+          mkdir -p build/reports
+          gradle :runIdeForUiTests > build/reports/idea.log &
+      - name: Wait for Idea started
+        uses: jtalk/url-health-check-action@1.5
+        with:
+          url: http://127.0.0.1:8082
+          max-attempts: 20
+          retry-delay: 10s
+      - name: Tests
+        run: gradle :testUi
+      - name: Move video
+        if: ${{ failure() }}
+        run: mv video build/reports
+      - name: Save fails report
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: ui-test-fails-report-mac
+          path: |
+            build/reports
+#  build-for-ui-test-linux:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v2
+#      - name: Setup Java
+#        uses: actions/setup-java@v2.1.0
+#        with:
+#          distribution: zulu
+#          java-version: 11
+#      - name: Build Plugin
+#        run: gradle :buildPlugin
+#      - name: Run Idea
+#        run: |
+#          export DISPLAY=:99.0
+#          Xvfb -ac :99 -screen 0 1920x1080x16 &
+#          mkdir -p build/reports
+#          gradle :runIdeForUiTests #> build/reports/idea.log
+#      - name: Wait for Idea started
+#        uses: jtalk/url-health-check-action@1.5
+#        with:
+#          url: http://127.0.0.1:8082
+#          max-attempts: 15
+#          retry-delay: 30s
+#      - name: Tests
+#        run: gradle :testUi
+#      - name: Save fails report
+#        if: ${{ failure() }}
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: ui-test-fails-report-linux
+#          path: |
+#            ui-test-example/build/reports

.github/workflows/updateAuthors.yml

@@ -0,0 +1,49 @@
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+name: Update Authors
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 300
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - 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: ${{ 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: Alex Plate
+          commit_user_email: aleksei.plate@jetbrains.com
+          commit_author: Alex Plate <aleksei.plate@jetbrains.com>
+          file_pattern: AUTHORS.md

.github/workflows/updateChangelog.yml

@@ -0,0 +1,47 @@
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+name: Update Changelog
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 300
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - 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:
+          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

.github/workflows/updateFormatting.yml

@@ -0,0 +1,37 @@
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+name: Update Formatting
+
+on:
+  schedule:
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 50
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+          server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+          settings-path: ${{ github.workspace }} # location for the settings.xml file
+
+      - name: Format files
+        run: ./gradlew ktlintFormat
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: Update formatting
+          commit_user_name: Alex Plate
+          commit_user_email: aleksei.plate@jetbrains.com
+          commit_author: Alex Plate <aleksei.plate@jetbrains.com>

.gitignore

@@ -5,9 +5,23 @@
 !/.idea/scopes
 !/.idea/copyright
 !/.idea/icon.png
+!/.idea/inspectionProfiles
+!/.idea/fileTemplates
+!/.idea/runConfigurations
+!/.idea/codeStyles
 
-/build/
-/out/
-/tmp/
+**/build/
+**/out/
+**/tmp/
 
-*.DS_Store
+*.DS_Store
+
+.teamcity/.idea
+.teamcity/target
+.teamcity/*.iml
+
+# Generated by gradle task "generateGrammarSource"
+src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated
+
+# Created by github automation
+settings.xml

.idea/codeStyles/Project.xml

@@ -0,0 +1,196 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="AUTODETECT_INDENTS" value="false" />
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </value>
+    </option>
+    <JavaCodeStyleSettings>
+      <option name="FIELD_NAME_PREFIX" value="my" />
+      <option name="STATIC_FIELD_NAME_PREFIX" value="our" />
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="ALLOW_TRAILING_COMMA" value="true" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+    <ADDITIONAL_INDENT_OPTIONS fileType="rb">
+      <option name="INDENT_SIZE" value="2" />
+    </ADDITIONAL_INDENT_OPTIONS>
+    <codeStyleSettings language="CFML">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+    </codeStyleSettings>
+    <codeStyleSettings language="ECMA Script Level 4">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+    </codeStyleSettings>
+    <codeStyleSettings language="GSP">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Groovy">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="5" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="8" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+      <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+      <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="5" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="8" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+    </codeStyleSettings>
+    <codeStyleSettings language="JSP">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="8" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="ELSE_ON_NEW_LINE" value="true" />
+      <option name="WHILE_ON_NEW_LINE" value="true" />
+      <option name="CATCH_ON_NEW_LINE" value="true" />
+      <option name="FINALLY_ON_NEW_LINE" value="true" />
+      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="BINARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_WRAP" value="5" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="5" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="1" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="1" />
+    </codeStyleSettings>
+    <codeStyleSettings language="Python">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="8" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/fileTemplates/code/I18nized Concatenation.java

@@ -0,0 +1 @@
+com.maddyhome.idea.vim.helper.MessageHelper.message("${PROPERTY_KEY}", ${PARAMETERS})

.idea/fileTemplates/code/I18nized Expression.java

@@ -0,0 +1 @@
+com.maddyhome.idea.vim.helper.MessageHelper.message("${PROPERTY_KEY}")

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,69 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="HardCodedStringLiteral" enabled="false" level="WARNING" enabled_by_default="false">
+      <scope name="Production" level="WARNING" enabled="false">
+        <option name="ignoreForAssertStatements" value="true" />
+        <option name="ignoreForExceptionConstructors" value="true" />
+        <option name="ignoreForSpecifiedExceptionConstructors" value="" />
+        <option name="ignoreForJUnitAsserts" value="true" />
+        <option name="ignoreForClassReferences" value="true" />
+        <option name="ignoreForPropertyKeyReferences" value="true" />
+        <option name="ignoreForNonAlpha" value="true" />
+        <option name="ignoreAssignedToConstants" value="false" />
+        <option name="ignoreToString" value="true" />
+        <option name="nonNlsCommentPattern" value="NON-NLS" />
+      </scope>
+      <option name="ignoreForAssertStatements" value="true" />
+      <option name="ignoreForExceptionConstructors" value="true" />
+      <option name="ignoreForSpecifiedExceptionConstructors" value="" />
+      <option name="ignoreForJUnitAsserts" value="true" />
+      <option name="ignoreForClassReferences" value="true" />
+      <option name="ignoreForPropertyKeyReferences" value="true" />
+      <option name="ignoreForNonAlpha" value="true" />
+      <option name="ignoreAssignedToConstants" value="false" />
+      <option name="ignoreToString" value="false" />
+      <option name="nonNlsCommentPattern" value="NON-NLS" />
+    </inspection_tool>
+    <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_requireAnnotationsFirst" value="true" />
+    </inspection_tool>
+    <inspection_tool class="MoveVariableDeclarationIntoWhen" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PluginXmlI18n" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="SSBasedInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <replaceConfiguration name="IdeaVim run for each caret" description="Please use IdeaVim version of `runForEachCaret` function" suppressId="ideavimRunForEachCaret" problemDescriptor="Replace with IdeaVim version" text="$editor$.caretModel.runForEachCaret { $expr$ }" recursive="false" caseInsensitive="false" type="Kotlin" pattern_context="default" reformatAccordingToStyle="true" shortenFQN="false" replacement="$editor$.vimForEachCaret { $expr$ }">
+        <constraint name="__context__" within="" contains="" />
+        <constraint name="editor" within="" contains="" />
+        <constraint name="expr" minCount="0" maxCount="2147483647" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="Use IdeaVim method instead of the fixture" uuid="0f74da52-7360-33ae-9b40-d771aa128de6" description="Use assertState and other functions instead of myFixture.checkResult.&#10;This function also preformes assertion in neovim" suppressId="IdeaVimAssertState" problemDescriptor="Use IdeaVim testing methods" text="$fixture$.$check$($data$)" recursive="false" caseInsensitive="false" type="Kotlin" pattern_context="default" reformatAccordingToStyle="true" shortenFQN="false" replacement="assertState($data$)">
+        <constraint name="__context__" within="" contains="" />
+        <constraint name="fixture" regexp="myFixture" nameOfExprType="CodeInsightTestFixture" within="" contains="" />
+        <constraint name="check" regexp="checkResult" within="" contains="" />
+        <constraint name="data" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="Use IdeaVim method instead of the fixture" uuid="0f74da52-7360-33ae-9b40-d771aa128de6" text="$fixture$.$check$($fileName$, $text$)" recursive="false" caseInsensitive="false" type="Kotlin" pattern_context="default" reformatAccordingToStyle="true" shortenFQN="false" replacement="configureByText($text$)">
+        <constraint name="__context__" within="" contains="" />
+        <constraint name="fixture" regexp="myFixture" nameOfExprType="CodeInsightTestFixture" within="" contains="" />
+        <constraint name="check" regexp="configureByText" within="" contains="" />
+        <constraint name="text" within="" contains="" />
+        <constraint name="fileName" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="Use IdeaVim method instead of the fixture" uuid="0f74da52-7360-33ae-9b40-d771aa128de6" text="$fixture$.$check$($data$)" recursive="false" caseInsensitive="false" type="JAVA" pattern_context="default" reformatAccordingToStyle="true" shortenFQN="true" replacement="assertState($data$)">
+        <constraint name="__context__" within="" contains="" />
+        <constraint name="fixture" regexp="myFixture" within="" contains="" />
+        <constraint name="check" regexp="checkResult" within="" contains="" />
+        <constraint name="data" within="" contains="" />
+      </replaceConfiguration>
+      <replaceConfiguration name="Use IdeaVim method instead of the fixture" uuid="0f74da52-7360-33ae-9b40-d771aa128de6" text="$fixture$.$configure$($first$, $second$)" recursive="false" caseInsensitive="false" type="JAVA" pattern_context="default" reformatAccordingToStyle="true" shortenFQN="true" replacement="configureByText($second$)">
+        <constraint name="__context__" within="" contains="" />
+        <constraint name="fixture" regexp="myFixture" within="" contains="" />
+        <constraint name="configure" regexp="configureByText" within="" contains="" />
+        <constraint name="first" within="" contains="" />
+        <constraint name="second" within="" contains="" />
+      </replaceConfiguration>
+    </inspection_tool>
+    <inspection_tool class="UnstableApiUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

.idea/inspectionProfiles/Qodana.xml

@@ -0,0 +1,48 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <description>Inspections profile for Qodana</description>
+    <option name="myName" value="Qodana" />
+    <inspection_tool class="BooleanMethodIsAlwaysInverted" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="CanBeFinal" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="REPORT_CLASSES" value="false" />
+      <option name="REPORT_METHODS" value="false" />
+      <option name="REPORT_FIELDS" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GrUnresolvedAccess" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="HardCodedStringLiteral" enabled="false" level="WARNING" enabled_by_default="false">
+      <scope name="Production" level="WARNING" enabled="false">
+        <option name="ignoreForAssertStatements" value="true" />
+        <option name="ignoreForExceptionConstructors" value="true" />
+        <option name="ignoreForSpecifiedExceptionConstructors" value="" />
+        <option name="ignoreForJUnitAsserts" value="true" />
+        <option name="ignoreForClassReferences" value="true" />
+        <option name="ignoreForPropertyKeyReferences" value="true" />
+        <option name="ignoreForNonAlpha" value="true" />
+        <option name="ignoreAssignedToConstants" value="false" />
+        <option name="ignoreToString" value="true" />
+        <option name="nonNlsCommentPattern" value="NON-NLS" />
+      </scope>
+      <option name="ignoreForAssertStatements" value="true" />
+      <option name="ignoreForExceptionConstructors" value="true" />
+      <option name="ignoreForSpecifiedExceptionConstructors" value="" />
+      <option name="ignoreForJUnitAsserts" value="true" />
+      <option name="ignoreForClassReferences" value="true" />
+      <option name="ignoreForPropertyKeyReferences" value="true" />
+      <option name="ignoreForNonAlpha" value="true" />
+      <option name="ignoreAssignedToConstants" value="false" />
+      <option name="ignoreToString" value="false" />
+      <option name="nonNlsCommentPattern" value="NON-NLS" />
+    </inspection_tool>
+    <inspection_tool class="MissortedModifiers" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_requireAnnotationsFirst" value="true" />
+    </inspection_tool>
+    <inspection_tool class="SameReturnValue" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+    <inspection_tool class="SuperTearDownInFinally" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UnstableApiUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

.idea/runConfigurations/IdeaVim_full_verification.xml

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

.idea/runConfigurations/IdeaVim_tests.xml

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

.idea/runConfigurations/Start_IJ_with_IdeaVim.xml

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

.idea/scopes/Copyright.xml

@@ -1,3 +1,3 @@
 <component name="DependencyValidationManager">
-  <scope name="Copyright" pattern="file[IdeaVIM.main]:com//*||file[IdeaVIM.test]:*/" />
+  <scope name="Copyright" pattern="(file[IdeaVIM.main]:*/||file[IdeaVIM.test]:*/)&amp;&amp;!file[IdeaVIM.main]:resources//*" />
 </component>

.teamcity/_Self/Constants.kt

@@ -0,0 +1,20 @@
+package _Self
+
+object Constants {
+  const val DEFAULT_CHANNEL = "default"
+  const val EAP_CHANNEL = "eap"
+  const val DEV_CHANNEL = "Dev"
+
+  const val VERSION = "1.11.1"
+  const val DEV_VERSION = "1.12.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 = "LATEST-EAP-SNAPSHOT"
+
+  const val RELEASE_DEV = "LATEST-EAP-SNAPSHOT"
+  const val RELEASE_EAP = "LATEST-EAP-SNAPSHOT"
+}

.teamcity/_Self/Project.kt

@@ -0,0 +1,101 @@
+package _Self
+
+import _Self.buildTypes.Compatibility
+import _Self.buildTypes.LongRunning
+import _Self.buildTypes.Nvim
+import _Self.buildTypes.PluginVerifier
+import _Self.buildTypes.PropertyBased
+import _Self.buildTypes.Qodana
+import _Self.buildTypes.TestsForIntelliJ20222
+import _Self.buildTypes.TestsForIntelliJEAP
+import _Self.subprojects.GitHub
+import _Self.subprojects.OldTests
+import _Self.subprojects.Releases
+import _Self.vcsRoots.Branch_181
+import _Self.vcsRoots.Branch_183
+import _Self.vcsRoots.Branch_191_193
+import _Self.vcsRoots.Branch_201
+import _Self.vcsRoots.Branch_202
+import _Self.vcsRoots.Branch_203_212
+import _Self.vcsRoots.Branch_213_221
+import _Self.vcsRoots.Branch_Release
+import _Self.vcsRoots.GitHubPullRequest
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+
+object Project : Project({
+  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_Release)
+  vcsRoot(GitHubPullRequest)
+
+  // Builds
+  buildType(TestsForIntelliJEAP)
+  buildType(TestsForIntelliJ20222)
+
+  buildType(PropertyBased)
+  buildType(LongRunning)
+
+  buildType(Nvim)
+  buildType(PluginVerifier)
+  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")
+    }
+  }
+})

.teamcity/_Self/buildTypes/ActiveTests.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.DslContext
+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 ActiveTests(buildName: String, ijVersion: String) : BuildType({
+  name = buildName
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", ijVersion)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean check -x ktlintMainSourceSetCheck -x ktlintTestSourceSetCheck"
+      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 TestsForIntelliJEAP : ActiveTests("Tests for IntelliJ Latest EAP", "LATEST-EAP-SNAPSHOT")
+object TestsForIntelliJ20222 : ActiveTests("Tests for IntelliJ 2022.2", "2022.2.1")

.teamcity/_Self/buildTypes/Compatibility.kt

@@ -0,0 +1,49 @@
+package _Self.buildTypes
+
+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 : BuildType({
+  id("IdeaVimCompatibility")
+  name = "IdeaVim compatibility with external plugins"
+
+  vcs {
+    root(DslContext.settingsRoot)
+  }
+
+  steps {
+    script {
+      name = "Check"
+      scriptContent = """
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}org.jetbrains.IdeaVim-EasyMotion' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}io.github.mishkun.ideavimsneak' [latest-IU] -team-city
+                java -jar verifier/verifier-cli-dev-all.jar check-plugin '${'$'}eu.theblob42.idea.whichkey' [latest-IU] -team-city
+                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()
+    }
+  }
+
+  triggers {
+    schedule {
+      schedulingPolicy = daily {
+        hour = 4
+      }
+      branchFilter = ""
+      triggerBuild = always()
+      withPendingChangesOnly = false
+    }
+  }
+
+  features {
+    golang {
+      testFormat = "json"
+    }
+  }
+})

.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")
+  }
+})

.teamcity/_Self/buildTypes/LongRunning.kt

@@ -0,0 +1,42 @@
+package _Self.buildTypes
+
+import _Self.Constants.LONG_RUNNING_TESTS
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object LongRunning : BuildType({
+  name = "Long running tests"
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", LONG_RUNNING_TESTS)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean testLongRunning"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+})

.teamcity/_Self/buildTypes/Nvim.kt

@@ -0,0 +1,69 @@
+package _Self.buildTypes
+
+import _Self.Constants.NVIM_TESTS
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.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.vcs
+
+object Nvim : BuildType({
+  name = "Tests with nvim"
+  description = "Running tests with nvim integration"
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", NVIM_TESTS)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.ideavim.nvim.path", "./nvim-linux64/bin/nvim")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    script {
+      name = "Set up NeoVim"
+      scriptContent = """
+              wget https://github.com/neovim/neovim/releases/download/v0.7.2/nvim-linux64.tar.gz
+              tar xzf nvim-linux64.tar.gz
+              cd nvim-linux64/bin
+              chmod +x nvim
+              """.trimIndent()
+    }
+    gradle {
+      tasks = "clean testWithNeovim"
+      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()
+      }
+    }
+  }
+})

.teamcity/_Self/buildTypes/PluginVerifier.kt

@@ -0,0 +1,40 @@
+package _Self.buildTypes
+
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object PluginVerifier : BuildType({
+  name = "Plugin verification"
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean runPluginVerifier"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+})

.teamcity/_Self/buildTypes/PropertyBased.kt

@@ -0,0 +1,42 @@
+package _Self.buildTypes
+
+import _Self.Constants.PROPERTY_TESTS
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.gradle
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object PropertyBased : BuildType({
+  name = "Property based tests"
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", PROPERTY_TESTS)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean testPropertyBased"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+})

.teamcity/_Self/buildTypes/Qodana.kt

@@ -0,0 +1,84 @@
+package _Self.buildTypes
+
+import _Self.Constants.QODANA_TESTS
+import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.Qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.qodana
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+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 : BuildType({
+  name = "Qodana checks"
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_ideaVersion", QODANA_TESTS)
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    qodana {
+      name = "Qodana"
+/*
+      reportAsTestsEnable = ""
+      failBuildOnErrors = ""
+      codeInspectionXmlConfig = "Custom"
+      codeInspectionCustomXmlConfigPath = ".idea/inspectionProfiles/Qodana.xml"
+      reportAsTestsEnable = "true"
+*/
+      clearConditions()
+      param("licenseaudit-enable", "true")
+      param("clonefinder-languages", "Java")
+      param("clonefinder-mode", "")
+      param("report-version", "")
+      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
+      }
+    }
+  }
+
+  triggers {
+    vcs {
+      enabled = true
+      branchFilter = ""
+    }
+    schedule {
+      schedulingPolicy = weekly {
+        dayOfWeek = ScheduleTrigger.DAY.Tuesday
+      }
+      branchFilter = ""
+      triggerBuild = always()
+    }
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      threshold = 0
+      units = BuildFailureOnMetric.MetricUnit.DEFAULT_UNIT
+      comparison = BuildFailureOnMetric.MetricComparison.MORE
+      compareTo = value()
+      metric = BuildFailureOnMetric.MetricType.TEST_FAILED_COUNT
+      param("metricKey", "QodanaProblemsTotal")
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+})

.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()
+      }
+    }
+  }
+})

.teamcity/_Self/buildTypes/ReleaseDev.kt

@@ -0,0 +1,69 @@
+package _Self.buildTypes
+
+import _Self.Constants.DEV_CHANNEL
+import _Self.Constants.DEV_VERSION
+import _Self.Constants.RELEASE_DEV
+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.failureConditions.BuildFailureOnMetric
+import jetbrains.buildServer.configs.kotlin.v2019_2.failureConditions.failOnMetricChange
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.schedule
+
+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)
+    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", DEV_CHANNEL)
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean publishPlugin"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    schedule {
+      enabled = true
+      schedulingPolicy = daily {
+        hour = 2
+      }
+      branchFilter = ""
+    }
+  }
+
+  failureConditions {
+    failOnMetricChange {
+      metric = BuildFailureOnMetric.MetricType.ARTIFACT_SIZE
+      threshold = 5
+      units = BuildFailureOnMetric.MetricUnit.PERCENTS
+      comparison = BuildFailureOnMetric.MetricComparison.DIFF
+      compareTo = build {
+        buildRule = lastSuccessful()
+      }
+    }
+  }
+})

.teamcity/_Self/buildTypes/ReleaseEap.kt

@@ -0,0 +1,73 @@
+package _Self.buildTypes
+
+import _Self.Constants.DEV_VERSION
+import _Self.Constants.EAP_CHANNEL
+import _Self.Constants.RELEASE_EAP
+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 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)
+    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", EAP_CHANNEL)
+    password(
+      "env.ORG_GRADLE_PROJECT_slackUrl",
+      "credentialsJSON:a8ab8150-e6f8-4eaf-987c-bcd65eac50b5",
+      label = "Slack Token"
+    )
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    gradle {
+      tasks = "clean publishPlugin"
+      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()
+      }
+    }
+  }
+})

.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()
+      }
+    }
+  }
+})

.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")

.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")

.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")

.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")

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

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

.teamcity/_Self/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")

.teamcity/_Self/subprojects/GitHub.kt

@@ -0,0 +1,11 @@
+package _Self.subprojects
+
+import _Self.buildTypes.GithubTests
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+
+object GitHub : Project({
+  name = "Pull Requests checks"
+  description = "Automatic checking of GitHub Pull Requests"
+
+  buildType(GithubTests)
+})

.teamcity/_Self/subprojects/OldTests.kt

@@ -0,0 +1,33 @@
+package _Self.subprojects
+
+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 jetbrains.buildServer.configs.kotlin.v2019_2.Project
+
+object OldTests : Project({
+  name = "Old IdeaVim tests"
+  description = "Tests for older versions of IJ"
+
+  buildType(TestsForIntelliJ20181)
+  buildType(TestsForIntelliJ20182)
+  buildType(TestsForIntelliJ20183)
+  buildType(TestsForIntelliJ20191)
+  buildType(TestsForIntelliJ20192)
+  buildType(TestsForIntelliJ20193)
+  buildType(TestsForIntelliJ20201)
+  buildType(TestsForIntelliJ20202)
+  buildType(TestsForIntelliJ20203)
+  buildType(TestsForIntelliJ20211)
+  buildType(TestsForIntelliJ20212)
+  buildType(TestsForIntelliJ20213)
+})

.teamcity/_Self/subprojects/Releases.kt

@@ -0,0 +1,15 @@
+package _Self.subprojects
+
+import _Self.buildTypes.Release
+import _Self.buildTypes.ReleaseDev
+import _Self.buildTypes.ReleaseEap
+import jetbrains.buildServer.configs.kotlin.v2019_2.Project
+
+object Releases : Project({
+  name = "IdeaVim releases"
+  description = "Stable and EAP releases for IdeaVim"
+
+  buildType(Release)
+  buildType(ReleaseEap)
+  buildType(ReleaseDev)
+})

.teamcity/_Self/vcsRoots/Branch_181.kt

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

.teamcity/_Self/vcsRoots/Branch_183.kt

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

.teamcity/_Self/vcsRoots/Branch_191_193.kt

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

.teamcity/_Self/vcsRoots/Branch_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
+})

.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
+})

.teamcity/_Self/vcsRoots/Branch_203_212.kt

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

.teamcity/_Self/vcsRoots/Branch_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"
+})

.teamcity/_Self/vcsRoots/Branch_Release.kt

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

.teamcity/_Self/vcsRoots/GitHubPullRequest.kt

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

.teamcity/patches/buildTypes/Qodana.kts

@@ -0,0 +1,55 @@
+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.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
+            argumentsCommandDocker = "-e QODANA_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb24iOiIzUFZrQSIsInByb2plY3QiOiIzN1FlQSIsInRva2VuIjoiM0t2bXoifQ.uohp81tM7iAfvvB6k8faarfpV-OjusAaEbWQ8iNrOgs"
+            argumentsEntryPointDocker = "--baseline qodana.sarif.json"
+            param("clonefinder-languages", "")
+            param("collect-anonymous-statistics", "")
+            param("licenseaudit-enable", "")
+            param("clonefinder-languages-container", "")
+            param("clonefinder-queried-project", "")
+            param("clonefinder-enable", "")
+            param("clonefinder-reference-projects", "")
+        }
+    }
+}

.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
+        }
+    }
+}

.teamcity/pom.xml

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

.teamcity/settings.kts

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

AUTHORS.md

@@ -10,10 +10,6 @@ The original author:
 
 The current maintainers:
 
-* [![icon][mail]](mailto:andrey.vlasovskikh@gmail.com)
-  [![icon][github]](https://github.com/vlasovskikh)
-   
-  Andrey Vlasovskikh
 * [![icon][mail]](mailto:alexpl292@gmail.com)
   [![icon][github]](https://github.com/AlexPl292)
    
@@ -25,22 +21,59 @@ Previous maintainers:
   [![icon][github]](https://github.com/olegs)
    
   Oleg Shpynov
+* [![icon][mail]](mailto:andrey.vlasovskikh@gmail.com)
+  [![icon][github]](https://github.com/vlasovskikh)
+   
+  Andrey Vlasovskikh
 
 Contributors:
+
 * [![icon][mail]](mailto:yole@jetbrains.com)
   [![icon][github]](https://github.com/yole)
    
   Dmitry Jemerov
+* [![icon][mail]](mailto:tony.kay@gmail.com)
+  [![icon][github]](https://github.com/awkay)
+   
+  Tony Kay
+* [![icon][mail]](mailto:jamescmartinez@gmail.com)
+  [![icon][github]](https://github.com/jamescmartinez)
+   
+  James Martinez
+* [![icon][mail]](mailto:almas337519@gmail.com)
+  [![icon][github]](https://github.com/strogiyotec)
+   
+  strogiyotec
+* [![icon][mail]](mailto:raimon49@hotmail.com)
+  [![icon][github]](https://github.com/raimon49)
+   
+  raimon
+* [![icon][mail]](mailto:agrsbm@gmail.com)
+  [![icon][github-off]](#)
+   
+  Alexander Griesbaum
+* [![icon][mail]](mailto:manwe64@gmail.com)
+  [![icon][github]](https://github.com/baldrs)
+   
+  Baldrs
+* [![icon][mail]](mailto:yury@shurup.com)
+  [![icon][github]](https://github.com/zyv)
+   
+  Yury V. Zaytsev
+* [![icon][mail]](mailto:jflorian@doubledog.org)
+  [![icon][github]](https://github.com/jflorian)
+   
+  John Florian
 * [![icon][mail]](mailto:marquis@marquiswang.com)
   [![icon][github]](https://github.com/marquiswang)
    
   Marquis Wang
 * [![icon][mail]](mailto:madgnome@gmail.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/madgnome)
    
   Julien Hoarau  
 * [![icon][mail]](mailto:masanobu.imai@gmail.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/masanobuimai)
    
   Masanobu Imai
 * [![icon][mail]](mailto:poxvuibr@gmail.com)
@@ -56,7 +89,7 @@ Contributors:
    
   John Lindquist
 * [![icon][mail]](mailto:iklotzko@ltech.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/iklotzko)
    
   Ira Klotzko
 * [![icon][mail]](mailto:alex@selesse.com)
@@ -64,7 +97,7 @@ Contributors:
    
   Alex Selesse
 * [![icon][mail]](mailto:dbennett@palantir.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/dathanb)
    
   Dathan Bennett
 * [![icon][mail]](mailto:kphayen@gmail.com)
@@ -76,11 +109,11 @@ Contributors:
    
   Alexey Shmalko
 * [![icon][mail]](mailto:a.m.brookins@gmail.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/abrookins)
    
   Andrew Brookins
 * [![icon][mail]](mailto:changwang83@gmail.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/changwang)
    
   Chang Wang
 * [![icon][mail]](mailto:josejaime.sanchez@gmail.com)
@@ -88,19 +121,19 @@ Contributors:
    
   Jaime Sanchez
 * [![icon][mail]](mailto:thomas@homburg.dk)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/homburg)
    
   Thomas B Homburg
 * [![icon][mail]](mailto:smartbomb@server.fake)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/smartbomb)
    
   smartbomb
 * [![icon][mail]](mailto:tuomas.tynkkynen@iki.fi)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/dezgeg)
    
   Tuomas Tynkkynen
 * [![icon][mail]](mailto:jackson@donorschoose.org)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/jdpopkin)
    
   Jackson Popkin
 * [![icon][mail]](mailto:yuyuyu1999@gmail.com)
@@ -108,7 +141,7 @@ Contributors:
    
   Teruo Kunihiro
 * [![icon][mail]](mailto:lubashka.994@mail.ru)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/lubba)
    
   Liubov Paina
 * [![icon][mail]](mailto:me@dhleong.net)
@@ -136,7 +169,7 @@ Contributors:
    
   tieTYT
 * [![icon][mail]](mailto:nickgieschen@gmail.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/nickgieschen)
    
   Nick Gieschen
 * [![icon][mail]](mailto:ikenox@gmail.com)
@@ -148,7 +181,7 @@ Contributors:
    
   Maximilian Luz
 * [![icon][mail]](mailto:vparfinenko@excelsior-usa.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/cypok)
    
   Vladimir Parfinenko
 * [![icon][mail]](mailto:hassmann@hwdev.de)
@@ -192,7 +225,7 @@ Contributors:
    
   Marcel Hild
 * [![icon][mail]](mailto:vedranb@gmail.com)
-  [![icon][github-off]](#)
+  [![icon][github]](https://github.com/vedran)
    
   Vedran Budimcic
 * [![icon][mail]](mailto:andreigasparovici1@gmail.com)
@@ -207,10 +240,13 @@ Contributors:
   [![icon][github]](https://github.com/TonyArra)
    
   Tony Arra
-* [![icon][mail]](mailto:bradziolko@gmail.com)
-  [![icon][github]](https://github.com/bradziolko)
+* [![icon][mail]](mailto:mj@ziolko.dev)
+  [![icon][github]](https://github.com/mjziolko)
    
-  Brad Ziolko
+  Madeline Ziolko
+  [Original contribution from:
+  [![icon][mail]](mailto:bradziolko@gmail.com)
+  [![icon][github]](https://github.com/bradziolko)]
 * [![icon][mail]](mailto:sumoooru2@gmail.com)
   [![icon][github]](https://github.com/sumoooru2)
    
@@ -323,13 +359,109 @@ Contributors:
   [![icon][github]](https://github.com/i-e-b)
    
   Iain Ballard
+* [![icon][mail]](mailto:brandoncc@gmail.com)
+  [![icon][github]](https://github.com/brandoncc)
+   
+  Brandon Conway
+* [![icon][mail]](mailto:ga@anadoxin.org)
+  [![icon][github]](https://github.com/antekone)
+   
+  Grzegorz Antoniak
+* [![icon][mail]](mailto:shaunpatterson@gmail.com)
+  [![icon][github]](https://github.com/shaunpatterson)
+   
+  Shaun Patterson
+* [![icon][mail]](mailto:vladimir.petrenko@jetbrains.com)
+  [![icon][github]](https://github.com/vladimir-petrenko)
+   
+  Vladimir Petrenko
+* [![icon][mail]](mailto:sergey.vorobyov@jetbrains.com)
+  [![icon][github]](https://github.com/DeveloperHacker)
+   
+  Sergei Vorobyov
+* [![icon][mail]](mailto:daya0576@gmail.com)
+  [![icon][github]](https://github.com/daya0576)
+   
+  大牙(Henry Zhu)
+* [![icon][mail]](mailto:mplacek@skilltech.pl)
+  [![icon][github]](https://github.com/MichalPlacek)
+   
+  MichalPlacek
+* [![icon][mail]](mailto:shrikantsharat.k@gmail.com)
+  [![icon][github]](https://github.com/sharat87)
+   
+  Shrikant Sharat Kandula
+* [![icon][mail]](mailto:michal.placek@yandex.com)
+  [![icon][github]](https://github.com/MichalPlacek)
+   
+  Michal Placek
+* [![icon][mail]](mailto:eugene.nizienko@jetbrains.com)
+  [![icon][github]](https://github.com/nizienko)
+   
+  eugene nizienko
+* [![icon][mail]](mailto:x@lipp.fi)
+  [![icon][github]](https://github.com/lippfi)
+   
+  Filipp Vakhitov
+* [![icon][mail]](mailto:yzeiri.1@osu.edu)
+  [![icon][github]](https://github.com/myzeiri)
+   
+  Martin Yzeiri
+* [![icon][mail]](mailto:jeyko1@gmail.com)
+  [![icon][github]](https://github.com/wrightwriter)
+   
+  Petar Guglev
+* [![icon][mail]](mailto:contact@chylex.com)
+  [![icon][github]](https://github.com/chylex)
+   
+  chylex
+* [![icon][mail]](mailto:daniel.egger@gmail.com)
+  [![icon][github]](https://github.com/DanEEStar)
+   
+  DanEEStar
+* [![icon][mail]](mailto:ksrbkevinsuen@gmail.com)
+  [![icon][github]](https://github.com/ksrb)
+   
+  Kevin Suen
+* [![icon][mail]](mailto:michael.schertenleib@inftec.ch)
+  [![icon][github]](https://github.com/cravay)
+   
+  Michael Schertenleib
+* [![icon][mail]](mailto:piotr@near.org)
+  [![icon][github]](https://github.com/pmnoxx)
+   
+  Piotr Mikulski
+* [![icon][mail]](mailto:lonrevip@gmail.com)
+  [![icon][github]](https://github.com/lonre)
+   
+  Lonre Wang
+* [![icon][mail]](mailto:AlexPl292@gmail.com)
+  [![icon][github]](https://github.com/AlexPl292)
+   
+  Alex Pláte
+* [![icon][mail]](mailto:david@dadon.fr)
+  [![icon][github]](https://github.com/ddadon10)
+   
+  David Dadon
+* [![icon][mail]](mailto:hollandpirates@gmail.com)
+  [![icon][github]](https://github.com/PHPirates)
+   
+  Thomas Schouten
+* [![icon][mail]](mailto:sr@mail25.de)
+  [![icon][github]](https://github.com/Vvalter)
+   
+  Simon Rainer
+* [![icon][mail]](mailto:filipp.vakhitov@jetbrains.com)
+  [![icon][github]](https://github.com/lippfi)
+   
+  lippfi
                         
 If you are a contributor and your name is not listed here, feel free to
 contact the maintainers.
 
 <a href="https://icons8.com">Icons by Icons8</a>
 
-[mail]: resources/icons/mail.png
-[github]: resources/icons/github.png
+[mail]: assets/icons/mail.png
+[github]: assets/icons/github.png
 
-[github-off]: resources/icons/github-off.png
+[github-off]: assets/icons/github-off.png

CHANGES.md

@@ -4,17 +4,18 @@ The Changelog
 History of changes in IdeaVim for the IntelliJ platform.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project DOES NOT adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-Stable versions use X.Y format.
-EAP versions use X.Y.Z format.
+Before version 1.7.0:  
+Stable versions use X.Y format.  
+EAP ([Early Access Program](https://jb.gg/ideavim-eap)) versions use X.Y.Z format.
 
 
 Get an Early Access
 -------------------
 
 Would you like to try new features and fixes? Join the Early Access Program and
-receive EAP builds as updates! Use the `EAP` option in the status bar or
+receive EAP builds as updates! Use the `Early Access Program` option in the status bar or
 add this URL to "Settings | Plugins | Manage Plugin Repositories":
 `https://plugins.jetbrains.com/plugins/eap/ideavim`
 
@@ -22,13 +23,373 @@ It is important to distinguish EAP from traditional pre-release software.
 Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
-0.60, 2020-10-09
------------
+## To Be Released
 
-**Features:**
+### Fixes:
+* [VIM-1758](https://youtrack.jetbrains.com/issue/VIM-1758) Commentary plugin in rider
+* [VIM-1903](https://youtrack.jetbrains.com/issue/VIM-1903) Autoindent now works in rider
+* [VIM-2744](https://youtrack.jetbrains.com/issue/VIM-2744) Fix undo from ex line
+* [VIM-2749](https://youtrack.jetbrains.com/issue/VIM-2749) Fix :tabn and :tabN commands
+* [VIM-2718](https://youtrack.jetbrains.com/issue/VIM-2718) Fixed case where the primary caret was changed
+* [VIM-2766](https://youtrack.jetbrains.com/issue/VIM-2766) Move NERDTree update to background thread
+* [VIM-2768](https://youtrack.jetbrains.com/issue/VIM-2768) Refactor listeners
+
+## 1.11.0, 2022-08-09
+
+### Features:
+* Add `gcu` command for Commentary plugin
+* Add `:Commentary` command, which works great for commands such as `:%g/fun/Commentary`
+* Support `gc` – commentary text objects. E.g. `dgc`: delete commented text.
+* Support `redo-register feature` | [VIM-2643](https://youtrack.jetbrains.com/issue/VIM-2643/Dot-operator-doesn-t-increment-number-register-after-pasting-fro) | [viminfo](http://vimdoc.sourceforge.net/htmldoc/undo.html#redo-register)
+
+### Changes:
+* Uses the same mappings as Commentary, so custom bindings for the Vim plugin will work with IdeaVim, too.
+  E.g. `<Plug>Commentary` instead of `<Plug>(CommentMotion)`. Old mappings are maintained for compatibility.
+* If you open `~/.ideavimrc` in IDE, remove a mapping, and reload the config using the reload button,
+  the mapping will actually be unmapped.
+* New vim (and IdeaVim) behaviour: `ci(`& friends searches for the brackets in the line.
+
+### Fixes:
+* [VIM-2587](https://youtrack.jetbrains.com/issue/VIM-2587) Use ctrl-6 as ctrl-^
+* [VIM-2590](https://youtrack.jetbrains.com/issue/VIM-2590) Fix caret shape in PyCharm
+* [VIM-2553](https://youtrack.jetbrains.com/issue/VIM-2553) Substitute consecutive matches
+* [VIM-1687](https://youtrack.jetbrains.com/issue/VIM-1687) Support count for `gcc`
+* [VIM-2381](https://youtrack.jetbrains.com/issue/VIM-2381) Fall back to line comment if block comment is not available
+* [VIM-2589](https://youtrack.jetbrains.com/issue/VIM-2589) Add `gc` text object
+* [VIM-2604](https://youtrack.jetbrains.com/issue/VIM-2604) Update action execution rules
+* [VIM-2654](https://youtrack.jetbrains.com/issue/VIM-2654) Add support for `return` without expression
+* [VIM-2630](https://youtrack.jetbrains.com/issue/VIM-2630/Please-fix-warning-Shall-not-be-called-on-a-template-presentatio) Fix IDE freeze
+* [VIM-2661](https://youtrack.jetbrains.com/issue/VIM-2661/Spamming-does-not-work) Fix repeating the `@@` command
+* [VIM-2668](https://youtrack.jetbrains.com/issue/VIM-2668/tabm-or-tabm-with-no-number-does-not-match-vim-behavior) Fix omitted numbers in `tabm` command
+* [VIM-2595](https://youtrack.jetbrains.com/issue/VIM-2595) Support plugins in macro execution
+* [VIM-2671](https://youtrack.jetbrains.com/issue/VIM-2671) Fix using plugins from mappings
+* [VIM-2675](https://youtrack.jetbrains.com/issue/VIM-2675) Fix numbering register in visual mode
+* [VIM-744](https://youtrack.jetbrains.com/issue/VIM-744/Use-undoredo-with-count-modifier) Add count to undo/redo
+* [VIM-1862](https://youtrack.jetbrains.com/issue/VIM-1862/Ex-commands-executed-in-keymaps-and-macros-are-added-to-the-command-history) Fix command history
+* [VIM-2227](https://youtrack.jetbrains.com/issue/VIM-2227) Wrong behavior when deleting / changing surround with invalid character
+* [VIM-2691](https://youtrack.jetbrains.com/issue/VIM-2691) Save file on :w
+* [VIM-2710](https://youtrack.jetbrains.com/issue/VIM-2710) Show options value on `set opt`
+* [VIM-913](https://youtrack.jetbrains.com/issue/VIM-913) Partially fix the issue with macros and autocompletion
+* [VIM-2723](https://youtrack.jetbrains.com/issue/VIM-2723) Move focus to editor after :q
+* [VIM-2728](https://youtrack.jetbrains.com/issue/VIM-2728) Give access to global variables
+
+### Merged PRs:
+* [468](https://github.com/JetBrains/ideavim/pull/468) by [Thomas Schouten](https://github.com/PHPirates): Implement UserDataHolder for EditorDataContext
+* [483](https://github.com/JetBrains/ideavim/pull/483) by [Simon Rainer](https://github.com/Vvalter): Fix(VIM-2553): Substitute consecutive matches
+* [488](https://github.com/JetBrains/ideavim/pull/488) by [Martin Yzeiri](https://github.com/myzeiri): Add Matchit support for the C family of languages
+* [493](https://github.com/JetBrains/ideavim/pull/493) by [Matt Ellis](https://github.com/citizenmatt): Improvements to Commentary extension
+* [494](https://github.com/JetBrains/ideavim/pull/494) by [Matt Ellis](https://github.com/citizenmatt): Cleanup pre-212 CaretVisualAttributes compatibility code
+* [504](https://github.com/JetBrains/ideavim/pull/504) by [Matt Ellis](https://github.com/citizenmatt): Minor bug fixes
+* [519](https://github.com/JetBrains/ideavim/pull/519) by [chylex](https://github.com/chylex): Fix(VIM-2227): Wrong behavior when deleting / changing surround with invalid character
+* [525](https://github.com/JetBrains/ideavim/pull/525) by [Matt Ellis](https://github.com/citizenmatt): Improve handling of fractional width fonts
+* [526](https://github.com/JetBrains/ideavim/pull/526) by [Alex Pláte](https://github.com/AlexPl292): Create gradle.properties
+* [528](https://github.com/JetBrains/ideavim/pull/528) by [chylex](https://github.com/chylex): Implement partial code completion support in macros
+* [531](https://github.com/JetBrains/ideavim/pull/531) by [Matt Ellis](https://github.com/citizenmatt): Consolidate doTest methods
+
+## 1.10.0, 2022-02-17
+
+### Features:
+* Add register support to let command | [VIM-749](https://youtrack.jetbrains.com/issue/VIM-749), [VIM-1783](https://youtrack.jetbrains.com/issue/VIM-1783)
+* Add tabmove command | [VIM-1164](https://youtrack.jetbrains.com/issue/VIM-1164)
+
+### Fixes:
+* [VIM-2502](https://youtrack.jetbrains.com/issue/VIM-2502) Fix the shape of new carets
+* [VIM-2499](https://youtrack.jetbrains.com/issue/VIM-2499) Fix mapping to esc
+* [VIM-2500](https://youtrack.jetbrains.com/issue/VIM-2500) Fix esc for normal mode
+* [VIM-2523](https://youtrack.jetbrains.com/issue/VIM-2523) `i` command for the folder in the project tree
+* [VIM-2471](https://youtrack.jetbrains.com/issue/VIM-2471) Multiple [{ and ]} actions
+* [VIM-2504](https://youtrack.jetbrains.com/issue/VIM-2504) Fix esc with using python notebooks
+* [VIM-2540](https://youtrack.jetbrains.com/issue/VIM-2540) Fix option listeners
+* [VIM-2548](https://youtrack.jetbrains.com/issue/VIM-2548) Fix paste
+* [VIM-2470](https://youtrack.jetbrains.com/issue/VIM-2470) Fix incorrect reset of cursor shape
+* [VIM-2223](https://youtrack.jetbrains.com/issue/VIM-2223), [VIM-1684](https://youtrack.jetbrains.com/issue/VIM-1684), [VIM-2491](https://youtrack.jetbrains.com/issue/VIM-2491) Fix `gv`
+
+### Merged PRs:
+* [441](https://github.com/JetBrains/ideavim/pull/441) by [DanEEStar](https://github.com/DanEEStar): Add Matchit support for Vue.js files
+* [440](https://github.com/JetBrains/ideavim/pull/440) by [Kevin Suen](https://github.com/ksrb): Add matchit support for handlebars
+* [448](https://github.com/JetBrains/ideavim/pull/448) by [Michael Schertenleib](https://github.com/cravay): Support custom element names in vim-surround
+* [435](https://github.com/JetBrains/ideavim/pull/435) by [Piotr Mikulski](https://github.com/pmnoxx): Print stderr when running a command just like vim does
+* [449](https://github.com/JetBrains/ideavim/pull/449) by [Lonre Wang](https://github.com/lonre): Typo fix
+* [453](https://github.com/JetBrains/ideavim/pull/453) by [Matt Ellis](https://github.com/citizenmatt): fix(VIM-2470): Fix incorrect reset of cursor shape
+* [461](https://github.com/JetBrains/ideavim/pull/461) by [David Dadon](https://github.com/ddadon10): Add shortcut to ideajoin example
+
+## 1.9.0, 2021-12-10
+
+### Features:
+* Make IdeaVim compatible with CodeWithMe | [VIM-2332](https://youtrack.jetbrains.com/issue/VIM-2332)
+* expression register `<C-R>=` | [VIM-521](https://youtrack.jetbrains.com/issue/VIM-521)
+
+### Fixes:
+* [VIM-2442](https://youtrack.jetbrains.com/issue/VIM-2442) Fix `!` command
+* [VIM-2255](https://youtrack.jetbrains.com/issue/VIM-2255) Fix reload icon on windows
+* [VIM-2199](https://youtrack.jetbrains.com/issue/VIM-2199) Fix autocompletion for AppCode
+* [VIM-2445](https://youtrack.jetbrains.com/issue/VIM-2445) Fix spaces in range
+* [VIM-2450](https://youtrack.jetbrains.com/issue/VIM-2450) Fix set command
+* [VIM-2451](https://youtrack.jetbrains.com/issue/VIM-2451) Fix comments
+* [VIM-2452](https://youtrack.jetbrains.com/issue/VIM-2452) Fix augroup
+* [VIM-2453](https://youtrack.jetbrains.com/issue/VIM-2453) Fix split command
+* [VIM-2397](https://youtrack.jetbrains.com/issue/VIM-2397) Fix dollar motion as an operator
+* [VIM-2432](https://youtrack.jetbrains.com/issue/VIM-2432) Fix ctrl-d and ctrl-u motions with scrolloff
+* [VIM-2462](https://youtrack.jetbrains.com/issue/VIM-2462) Reset caret shape when disabling plugin
+* [VIM-2449](https://youtrack.jetbrains.com/issue/VIM-2449) Fix `I` for one-line block selection
+* [VIM-2213](https://youtrack.jetbrains.com/issue/VIM-2213) Close VCS change popup on esc
+* [VIM-2435](https://youtrack.jetbrains.com/issue/VIM-2435) Close diff window on esc
+* [VIM-2461](https://youtrack.jetbrains.com/issue/VIM-2461) Show action id before action execution
+* [VIM-2026](https://youtrack.jetbrains.com/issue/VIM-2026) Keep global marks after restart
+* [VIM-1691](https://youtrack.jetbrains.com/issue/VIM-1691) Fix default path for `!` command
+* [VIM-2487](https://youtrack.jetbrains.com/issue/VIM-2487)
+  [VIM-2434](https://youtrack.jetbrains.com/issue/VIM-2434)
+  Fix IdeaVim in PyCharm notebooks
+
+### Merged PRs:
+* [390](https://github.com/JetBrains/ideavim/pull/390) by [chylex](https://github.com/chylex): [VIM-2255] Missing reload icon in .ideavimrc on Windows
+* [391](https://github.com/JetBrains/ideavim/pull/391) by [Matt Ellis](https://github.com/citizenmatt): fix(VIM-2432): handle scrolloff with <C-D> and <C-U>
+* [401](https://github.com/JetBrains/ideavim/pull/401) by [Matt Ellis](https://github.com/citizenmatt): Reset caret shape when disabling plugin
+* [407](https://github.com/JetBrains/ideavim/pull/407) by [eugene nizienko](https://github.com/nizienko): Video recording for ui tests
+* [418](https://github.com/JetBrains/ideavim/pull/418) by [chylex](https://github.com/chylex): Fix compile errors in unit tests on Windows
+
+## 1.8.0, 2021-10-27
+
+### Features:
+* Support `matchit.vim` extension for Ruby and XML/HTML [VIM-539](https://youtrack.jetbrains.com/issue/VIM-539) | [matchit.vim](https://github.com/chrisbra/matchit)
+* IDE-specific configuration [VIM-1573](https://youtrack.jetbrains.com/issue/VIM-1573)
+* Call command [VIM-2416](https://youtrack.jetbrains.com/issue/VIM-2416)
+
+### Fixes:
+* [VIM-2417](https://youtrack.jetbrains.com/issue/VIM-2417) Fix bars in substitute command
+* [VIM-2425](https://youtrack.jetbrains.com/issue/VIM-2425) Fix reload button
+* [VIM-2422](https://youtrack.jetbrains.com/issue/VIM-2422) Fix freeze
+* [VIM-2420](https://youtrack.jetbrains.com/issue/VIM-2420) Fix freeze
+* [VIM-2359](https://youtrack.jetbrains.com/issue/VIM-2359) Fix selection with VimExchange
+* [VIM-2426](https://youtrack.jetbrains.com/issue/VIM-2426) Fix marks in commands
+* [VIM-2438](https://youtrack.jetbrains.com/issue/VIM-2438) Fix marks in commands
+* [DISCUSSION-386](https://github.com/JetBrains/ideavim/discussions/386) Fixed command with no spaces before argument
+
+### Merged PRs:
+* [337](https://github.com/JetBrains/ideavim/pull/337) by [Matt Ellis](https://github.com/citizenmatt): guicursor!
+* [343](https://github.com/JetBrains/ideavim/pull/343) by [Martin Yzeiri](https://github.com/myzeiri): Emulate matchit.vim
+* [387](https://github.com/JetBrains/ideavim/pull/387) by [Petar Guglev](https://github.com/wrightwriter): Update README.md link
+
+## 1.7.2, 2021-09-30
+
+### Fixes:
+* [VIM-2405](https://youtrack.jetbrains.com/issue/VIM-2405) ExExceptions during `map <expr>` execution are now displayed in status bar
+* [VIM-2406](https://youtrack.jetbrains.com/issue/VIM-2406) Fix go to line command 
+* [VIM-2408](https://youtrack.jetbrains.com/issue/VIM-2408) Fix vim script parser
+* [VIM-2409](https://youtrack.jetbrains.com/issue/VIM-2409) Fix substitute command
+* [VIM-2411](https://youtrack.jetbrains.com/issue/VIM-2411) Fix vim script parser
+
+## 1.7.1, 2021-09-20
+
+### Fixes:
+* [VIM-2400](https://youtrack.jetbrains.com/issue/VIM-2400) Fix vim script parser
+* [VIM-2401](https://youtrack.jetbrains.com/issue/VIM-2401) Exceptions occurred during execution of `map<expr>` are now shown in status bar
+* [VIM-2404](https://youtrack.jetbrains.com/issue/VIM-2404) Fix multiple pastes from unnamed clipboard
+
+## 1.7.0, 2021-09-16
+
+### Features:
+* New engine for Vim Script execution. Check out the [GitHub Discussion](https://jb.gg/vim-script-discussion).
+* Mapping keys to expressions (map \<expr>). See `:h map-expression`.
+
+### Fixes:
+* [VIM-2368](https://youtrack.jetbrains.com/issue/VIM-2368) Do not remove selection on right click
+* [VIM-2392](https://youtrack.jetbrains.com/issue/VIM-2392) Fix possible out of bounds exception
+* [VIM-2387](https://youtrack.jetbrains.com/issue/VIM-2387) Fix coping with unnamed and ideaput
+
+### Changes:
+* New versioning scheme. Current version is `1.7.0` instead of `0.70`.
+
+### Merged PRs:
+* [349](https://github.com/JetBrains/ideavim/pull/349) by [eugene nizienko](https://github.com/nizienko): Run UI test ci
+
+## 0.69, 2021-07-20
+
+### Features:
+* Support several buffer management commands [VIM-1062](https://youtrack.jetbrains.com/issue/VIM-1062),  [VIM-2335](https://youtrack.jetbrains.com/issue/VIM-2335)
+
+### Fixes:
+* [VIM-2317](https://youtrack.jetbrains.com/issue/VIM-2317) Fix memory leak
+* [VIM-1357](https://youtrack.jetbrains.com/issue/VIM-1357)
+  [VIM-1566](https://youtrack.jetbrains.com/issue/VIM-1566) Fix external filters
+* [VIM-2336](https://youtrack.jetbrains.com/issue/VIM-2336) Fix repeat for the `T` movement
+* [VIM-1192](https://youtrack.jetbrains.com/issue/VIM-1192) Fix dollar motion from single command
+* [VIM-1672](https://youtrack.jetbrains.com/issue/VIM-1672) IdeaVim correctly populates clipboard history
+* [VIM-2351](https://youtrack.jetbrains.com/issue/VIM-2351) Correctly select last character when selecting with mouse
+
+### Merged PRs:
+* [332](https://github.com/JetBrains/ideavim/pull/332) by [Matt Ellis](https://github.com/citizenmatt): VIM-1357+VIM-1566: Use OS shell to run filter command
+* [333](https://github.com/JetBrains/ideavim/pull/333) by [Michal Placek](https://github.com/MichalPlacek): VIM-1062
+* [334](https://github.com/JetBrains/ideavim/pull/334) by [Michal Placek](https://github.com/MichalPlacek): vim-2335 Support for navigation to previous buffer with :b#
+
+## 0.68, 2021-06-22
+
+### Features:
+* Support `:global` and `:vglobal` commands [VIM-831](https://youtrack.jetbrains.com/issue/VIM-831), [VIM-832](https://youtrack.jetbrains.com/issue/VIM-832)
+* Support `vim-indent-object` extension [VIM-1151](https://youtrack.jetbrains.com/issue/VIM-1151) | [vim-indent-object](https://github.com/michaeljsmith/vim-indent-object)
+* Support `:print` command
+
+### Fixes:
+* [VIM-2308](https://youtrack.jetbrains.com/issue/VIM-2308) Go to next tab doesn't move scrolling
+
+### Merged PRs:
+* [261](https://github.com/JetBrains/ideavim/pull/261) by [Shrikant Sharat Kandula](https://github.com/sharat87): New extension: Indentation based text objects
+* [308](https://github.com/JetBrains/ideavim/pull/308) by [Matt Ellis](https://github.com/citizenmatt): Fix unnecessary caret movement when switching tabs
+
+## 0.67, 2021-05-20
+
+### Features:
+* Support `sethandler` command to configure shortcuts conflicts via `~/.ideavimrc` file. See [docs](https://jb.gg/vim-sethandler).
+* Support `vim-paragraph-motion` extension [VIM-2290](https://youtrack.jetbrains.com/issue/VIM-2290) | [vim-paragraph-motion](https://github.com/dbakker/vim-paragraph-motion) 
+* Add "Reset Handlers" button for "Conflicting Shortcuts" setting table
+
+### Changes:
+* Rename "Vim Emulation" in settings to "Vim"
+
+### Fixes:
+* [VIM-2230](https://youtrack.jetbrains.com/issue/VIM-2230) Tweak caret position with inline rename options inlay
+* [VIM-2177](https://youtrack.jetbrains.com/issue/VIM-2177) Fix scrolling issues near bottom of file
+* [VIM-2276](https://youtrack.jetbrains.com/issue/VIM-2276) `:ls` returns correct path for files on Microsoft Windows.
+* [VIM-1953](https://youtrack.jetbrains.com/issue/VIM-1953) Execute live testing for `:w` command
+* [VIM-2284](https://youtrack.jetbrains.com/issue/VIM-2284) Values are not duplicated in set command
+* [VIM-2289](https://youtrack.jetbrains.com/issue/VIM-2289) Fix `<End>` command behaviour
+* [VIM-1476](https://youtrack.jetbrains.com/issue/VIM-1476) Last inserted text is stored in `.` register
+* [VIM-2295](https://youtrack.jetbrains.com/issue/VIM-2295) Fix `<S-Space>` in insert mode with an existing mapping
+* [VIM-1401](https://youtrack.jetbrains.com/issue/VIM-1401) IdeaVim triggers readonly handler
+* [VIM-1856](https://youtrack.jetbrains.com/issue/VIM-1856) Support defining shortcuts in .ideavimrc
+* [VIM-1523](https://youtrack.jetbrains.com/issue/VIM-1523) Allow different shortcut handlers in different modes
+
+### Merged PRs:
+* [280](https://github.com/JetBrains/ideavim/pull/280) by [Matt Ellis](https://github.com/citizenmatt): Caret position and view scrolling fixes
+* [289](https://github.com/JetBrains/ideavim/pull/289) by [MichalPlacek](https://github.com/MichalPlacek): VIM-2276 ls returns "absolute path" for files on Microsoft Windows.
+* [295](https://github.com/JetBrains/ideavim/pull/295) by [MichalPlacek](https://github.com/MichalPlacek): VIM-1476
+
+## 0.66, 2021-04-09
+
+Not a lot of changes for this release. Focused on internal improvements.
+
+### Features:
+* Support `startofline` option
+
+### Fixes:
+* [VIM-2238](https://youtrack.jetbrains.com/issue/VIM-2238) Fix `M` command for small files
+
+### Merged PRs:
+* [275](https://github.com/JetBrains/ideavim/pull/275) by [Matt Ellis](https://github.com/citizenmatt): Fix edge cases for H, L and M and introduce 'startofline' option
+* [276](https://github.com/JetBrains/ideavim/pull/276) by [Matt Ellis](https://github.com/citizenmatt): More refactoring of SearchGroup
+
+## 0.65, 2021-02-17
+
+### Features:
+* Support `NERDTree` extension [VIM-1042](https://youtrack.jetbrains.com/issue/VIM-1042) | [NERDTree](https://github.com/preservim/nerdtree)
+  
+    * <details>
+            <summary><strong>Click to see details</strong></summary>
+            <img src="assets/changes/0.65/nerdtree.gif" alt="NERDTree example"/>
+    </details>
+* Support `maxmapdepth` option to define the maximum depth of mappings
+
+### Fixes:
+* [VIM-2202](https://youtrack.jetbrains.com/issue/VIM-2202) Fix macro recording for ex command and search
+* [VIM-1799](https://youtrack.jetbrains.com/issue/VIM-1799)
+  [VIM-1794](https://youtrack.jetbrains.com/issue/VIM-1794)
+  Special characters are not interpreted on yanking
+* [VIM-2218](https://youtrack.jetbrains.com/issue/VIM-2218) Fix some shortcuts for 2021.+
+* [VIM-2217](https://youtrack.jetbrains.com/issue/VIM-2217) Fix adding new line at the end of the file for the AppCode
+* [VIM-2220](https://youtrack.jetbrains.com/issue/VIM-2220) Do not try to get a commandState for null editor
+* [VIM-2153](https://youtrack.jetbrains.com/issue/VIM-2153) Fix storing special characters after IDE closing
+
+### Merged PRs:
+* [269](https://github.com/JetBrains/ideavim/pull/269) by [大牙(Henry Zhu)](https://github.com/daya0576): fix invalid link of submodule docs
+
+## 0.64, 2020-12-23
+
+### Merged PRs:
+* [260](https://github.com/JetBrains/ideavim/pull/260) by [Matt Ellis](https://github.com/citizenmatt): Refactor SearchGroup
+
+### Fixes:
+* [VIM-2194](https://youtrack.jetbrains.com/issue/VIM-2194) Fix caret shape during editing a new file
+
+## 0.63, 2020-12-16
+
+### Changes:
+* Update the minimal required IJ version: 2020.2+
+
+### Fixes:
+* [CWM-927](https://youtrack.jetbrains.com/issue/CWM-927) Fix typing for CodeWithMe and IdeaVim
+
+### Merged PRs:
+* [259](https://github.com/JetBrains/ideavim/pull/259) by [Vladimir Petrenko](https://github.com/vladimir-petrenko): CWM-927 disable vim for client's hidden editor on host
+
+## 0.62, 2020-12-15
+
+### Features:
+* Support `unmap` and `mapclear` commands [VIM-1491](https://youtrack.jetbrains.com/issue/VIM-1491)
+* Support mappings in ex panel (`cmap`) [VIM-1227](https://youtrack.jetbrains.com/issue/VIM-1227)
+
+### Changes:
+* `octal` is now disabled by default for `nrformats`. [VIM-2181](https://youtrack.jetbrains.com/issue/VIM-2181)
+
+### Fixes:
+* [VIM-2113](https://youtrack.jetbrains.com/issue/VIM-2113) Fix `cit` for empty tags
+* [VIM-2114](https://youtrack.jetbrains.com/issue/VIM-2114) Unnamed register isn't changed after deleting empty tag
+* [VIM-1475](https://youtrack.jetbrains.com/issue/VIM-1475) Enable block caret to be used in insert mode.
+* [VIM-2170](https://youtrack.jetbrains.com/issue/VIM-2170) Fix an alternative range format for `s` command
+* [VIM-1913](https://youtrack.jetbrains.com/issue/VIM-1913)
+  [VIM-2154](https://youtrack.jetbrains.com/issue/VIM-2154) Several fixes for AppCode templates
+* [VIM-1756](https://youtrack.jetbrains.com/issue/VIM-1756) Fix startsel from insert mode
+
+### Merged PRs:
+* [249](https://github.com/JetBrains/ideavim/pull/249) by [Jan Palus](https://github.com/jpalus): VIM-2113 Increase tag range only in visual mode
+* [250](https://github.com/JetBrains/ideavim/pull/250) by [Jan Palus](https://github.com/jpalus): VIM-2114 Do not override registers when deleting empty range
+* [256](https://github.com/JetBrains/ideavim/pull/256) by [Brandon Conway](https://github.com/brandoncc): Fix typo
+* [254](https://github.com/JetBrains/ideavim/pull/254) by [Grzegorz Antoniak](https://github.com/antekone): VIM-1475: Add an option to use block caret in insert mode
+* [225](https://github.com/JetBrains/ideavim/pull/225) by [sumoooru2](https://github.com/sumoooru2): Implement cmap
+* [258](https://github.com/JetBrains/ideavim/pull/258) by [Matt Ellis](https://github.com/citizenmatt): Show the correct handler class in :map
+* [257](https://github.com/JetBrains/ideavim/pull/257) by [Matt Ellis](https://github.com/citizenmatt): Extract SearchHighlightsHelper from SearchGroup
+* [251](https://github.com/JetBrains/ideavim/pull/251) by [Shaun Patterson](https://github.com/shaunpatterson): VIM-1756: startSel works in insert mode
+
+## 0.61, 2020-11-12
+
+### Features:
+* Ability to map IDE actions via the `<Action>` keyword. E.g. `map <C-K> <Action>(CommentByLineComment)`.
+  Check out `README.md` for the details.
+* `IdeaVim: track action Ids` command to find action ids for the `:action` command.
+  Enable this option in "Search everywhere" (double shift).
+* Ability to enable extensions using `vim-plug` or `vundle` syntax.  
+  E.g. to enable commentary extension you can use one of the following commands:
+  ```vim
+  set commentary
+  Plug 'tpope/vim-commentary'
+  Plug 'https://github.com/tpope/vim-commentary'
+  Plugin 'tpope/vim-commentary'
+  ...
+  ```
+  This approach is especially handy if you have `.vimrc` with plugins registered via `vim-plug` or `vundle`.
+
+  
+### Changes:
+* Fix `<Esc>` for dialogs. Now `<Esc>` will exit insert / visual mode and close the dialog from normal mode.
+* Add option to disable IdeaVim in dialogs / single line editors. [VIM-765](https://youtrack.jetbrains.com/issue/VIM-765)  
+Use `set ideavimsupport=` to disable IdeaVim in dialog editors.  
+* Reposition cursor when `scrolloff` changes
+
+### Fixes:
+* [VIM-2150](https://youtrack.jetbrains.com/issue/VIM-2150) `Shift-D` should not delete an empty line
+* [VIM-2157](https://youtrack.jetbrains.com/issue/VIM-2157) Fix tab with an active template
+* [VIM-2156](https://youtrack.jetbrains.com/issue/VIM-2156) Correct up/down motions with inlays
+* [VIM-2144](https://youtrack.jetbrains.com/issue/VIM-2144) Correct text position after block insert with inlays
+* [VIM-2158](https://youtrack.jetbrains.com/issue/VIM-2158) Fix scrolling when `scrolloff` is over half screen height, but less than full height
+
+### Merged PRs:
+* [255](https://github.com/JetBrains/ideavim/pull/255) by [Matt Ellis](https://github.com/citizenmatt): Fix various scrolling issues
+
+## 0.60, 2020-10-09
+
+### Features:
 * Support of `virtualedit=onemore` ([VIM-844](https://youtrack.jetbrains.com/issue/VIM-844))
 
-**Fixes:**
+### Fixes:
 * [VIM-2097](https://youtrack.jetbrains.com/issue/VIM-2097) Do not apply mappings for register selecting
 * [VIM-2080](https://youtrack.jetbrains.com/issue/VIM-2080) Fix S command with count
 * [VIM-2099](https://youtrack.jetbrains.com/issue/VIM-2099) Fix operations with backward inclusive motions
@@ -38,61 +399,59 @@ usual beta standards.
 * [VIM-1770](https://youtrack.jetbrains.com/issue/VIM-1770) Fix goto end with large inline hints
 * [VIM-2110](https://youtrack.jetbrains.com/issue/VIM-2110) Fix scrolling for non-monospaced fonts
 
-**Changes:**
+### Changes:
 * `:w` works as `:wa` by default. This can be disabled with `ideawrite` option.
  
     Now features like `Prettier on save` or `Run on save for files` would work with `:w` command as well.
   
     See [VIM-1968](https://youtrack.jetbrains.com/issue/VIM-1968).
   
-**Merged PRs:**
+### Merged PRs:
 * [248](https://github.com/JetBrains/ideavim/pull/248) by [Yaohui Wang](https://github.com/yaohui-wyh): Check if project is disposed when editorDeinit
 * [242](https://github.com/JetBrains/ideavim/pull/242) by [Iain Ballard](https://github.com/i-e-b): Partial implementation of virtualedit config
 * [252](https://github.com/JetBrains/ideavim/pull/252) by [Matt Ellis](https://github.com/citizenmatt): Fixes for scrolling
 
-0.59, 2020-08-25
-------------
+## 0.59, 2020-08-25
 
-**Features:**
+### Features:
 * `vim-highlightedyank` plugin emulation ([VIM-1970](https://youtrack.jetbrains.com/issue/VIM-1970) | [vim-highlightedyank](https://github.com/machakann/vim-highlightedyank)).
 
     * <details>
             <summary><strong>Click to see details</strong></summary>
-            <img src="resources/changes/0.59/highlight_yank.gif" alt="highlight yank"/>
+            <img src="assets/changes/0.59/highlight_yank.gif" alt="highlight yank"/>
       </details>
 
 * [VIM-2068](https://youtrack.jetbrains.com/issue/VIM-2068) `:tabclose` command
 
-**Fixes:**
+### Fixes:
 * [VIM-1421](https://youtrack.jetbrains.com/issue/VIM-1421) Escape key finishes `t` and `f` motions
 * [VIM-2075](https://youtrack.jetbrains.com/issue/VIM-2075) Fix zR command
 * [VIM-2059](https://youtrack.jetbrains.com/issue/VIM-2059) Fixed macro editing
 
-**Merged PRs:**
+### Merged PRs:
 * [237](https://github.com/JetBrains/ideavim/pull/237) by [Adrià Farrés](https://github.com/adriafarres): Reset operator-pending commands on escape
 * [241](https://github.com/JetBrains/ideavim/pull/241) by [Patrick Elmquist](https://github.com/patrick-elmquist): Properly reset when pressing Esc in the middle of command
 * [244](https://github.com/JetBrains/ideavim/pull/244) by [Rieon Ke](https://github.com/rieonke): Implement tabc[lose] ex command
 * [240](https://github.com/JetBrains/ideavim/pull/240) by [Rieon Ke](https://github.com/rieonke): add support for putting & editing macros
 * [245](https://github.com/JetBrains/ideavim/pull/245) by [KostkaBrukowa](https://github.com/KostkaBrukowa): VIM-1970 | Working solution of plugin vim-highlightedyank
 
-0.58, 2020-07-07
--------------
+## 0.58, 2020-07-07
 
-**Features:**
+### Features:
 * `exchange` plugin emulation ([VIM-921](https://youtrack.jetbrains.com/issue/VIM-921) | [vim-exchange](https://github.com/tommcdo/vim-exchange)).
 * `~/.ideavimrc` file can be reloaded using the new floating action.
 
     * <details>
             <summary><strong>Click to see details</strong></summary>
-            <img src="resources/changes/0.58/reload_ideavimrc.png" alt="IdeaVimRc reload"/>
+            <img src="assets/changes/0.58/reload_ideavimrc.png" alt="IdeaVimRc reload"/>
       </details>
 
 * Add `:buffer` command.
 
-**Changes:**
+### Changes:
 * Support IntelliJ's smooth scrolling. Use "Enable smooth scrolling" checkbox in _Preferences | Editor | General_ to disable.
 
-**Fixes:**
+### Fixes:
 * [VIM-1994](https://youtrack.jetbrains.com/issue/VIM-1994) Correct paste after `y}P` command.
 * [VIM-1924](https://youtrack.jetbrains.com/issue/VIM-1924) Select next occurrence doesn't become block selection.
 * [VIM-2038](https://youtrack.jetbrains.com/issue/VIM-2038) Last line is now accessible in normal mode
@@ -102,7 +461,7 @@ usual beta standards.
 * Fix mappings to `"\<SPACE>"` including `let mapleader="\<SPACE>"`
 
 
-**Merged PRs:**
+### Merged PRs:
 * [233](https://github.com/JetBrains/ideavim/pull/233) by [valis](https://github.com/valis): [VIM-1994] Correct paste after `y}P` command.
 * [224](https://github.com/JetBrains/ideavim/pull/224) by [pmnoxx](https://github.com/pmnoxx): Populate intelij navigation history together with ideavim jumplist.
 * [227](https://github.com/JetBrains/ideavim/pull/227) by [angelbot](https://github.com/angelbot): Add support for buffer command.
@@ -110,33 +469,31 @@ usual beta standards.
 * [231](https://github.com/JetBrains/ideavim/pull/231) by [citizenmatt](https://github.com/citizenmatt): Support smooth scrolling.
 * [239](https://github.com/JetBrains/ideavim/pull/239) by [citizenmatt](https://github.com/citizenmatt): Use new API for relative line numbers
 
-0.57, 2020-04-28
--------------
+## 0.57, 2020-04-28
 
-**Fixes:**
+### Fixes:
 * [VIM-1992](https://youtrack.jetbrains.com/issue/VIM-1992) Fix mappings to `<S-Letter>`
 * [VIM-1991](https://youtrack.jetbrains.com/issue/VIM-1991) Fix working with number registers
 
-**Merged PRs:**
+### Merged PRs:
 * [234](https://github.com/JetBrains/ideavim/pull/234) by [runforprogram](https://github.com/runforprogram): [VIM-1991] fix >0 number register not work
 
-0.56, 2020-04-09
---------------
+## 0.56, 2020-04-09
 
-**Features:**
+### Features:
 * `ReplaceWithRegister` plugin emulation ([ReplaceWithRegister](https://www.vim.org/scripts/script.php?script_id=2703)).
 * `argtextobj.vim` plugin emulation ([argtextobj.vim](https://vim.sourceforge.io/scripts/script.php?script_id=2699)).
 * `vim-textobj-entire` plugin emulation ([vim-textobj-entire](https://github.com/kana/vim-textobj-entire)).
 * [VIM-434](https://youtrack.jetbrains.com/issue/VIM-434) Add `'showcmd'` support, on by default.
 * Support `ls/buffers/files` commands.
 
-**Changes:**
+### Changes:
 * Replace `ideastatusbar` option with `ideastatusicon`. Now you can make the icon gray.
 
-**Deprecations:**
+### Deprecations:
 * `ideastatusbar` option is deprecated now. See `ideastatusicon`.
 
-**Fixes:**
+### Fixes:
 * [VIM-1284](https://youtrack.jetbrains.com/issue/VIM-1284) Fix mapping of digits.
 * Fix handling of counts on both operator and motion, e.g. `3d2w` deletes 6 words, instead of 32.
 * Allow mapping of `<C-K>` and `<C-V>`/`<C-Q>`.
@@ -149,15 +506,14 @@ usual beta standards.
 * [VIM-1911](https://youtrack.jetbrains.com/issue/VIM-1911) Lookup keys respect `IDE` handler.
 * [VIM-1008](https://youtrack.jetbrains.com/issue/VIM-1008) Correct `ci{` behavior.
 
-0.55, 2020-01-20
---------------
+## 0.55, 2020-01-20
 
-**Features:**
+### Features:
 * Surround and Commentary extensions support repeating with a dot command ([VIM-1118](https://youtrack.jetbrains.com/issue/VIM-1118))
 * Support XDG settings standard ([VIM-664](https://youtrack.jetbrains.com/issue/VIM-664))
 * Add option to remove the status bar icon ([VIM-1847](https://youtrack.jetbrains.com/issue/VIM-1847))
 
-**Fixes:**
+### Fixes:
 * [VIM-1823](https://youtrack.jetbrains.com/issue/VIM-1823) Fix multiple carets with ignorecase
 * [VIM-1053](https://youtrack.jetbrains.com/issue/VIM-1053)
   [VIM-1038](https://youtrack.jetbrains.com/issue/VIM-1038)
@@ -180,21 +536,20 @@ usual beta standards.
 * [VIM-1884](https://youtrack.jetbrains.com/issue/VIM-1884) Show quickDoc during popup with `CTRL-J`
 * [VIM-987](https://youtrack.jetbrains.com/issue/VIM-987) Fix arrow keys for the NEO keyboard
 
-0.54, 2019-11-20
---------------
+## 0.54, 2019-11-20
 
-**Features:**
+### Features:
 * EasyMotion plugin emulation ([VIM-820](https://youtrack.jetbrains.com/issue/VIM-820) | [Instructions](https://github.com/JetBrains/ideavim#emulated-vim-plugins))
 * Support surrounding with a function name ([link](https://github.com/tpope/vim-surround/blob/master/doc/surround.txt#L138))
 * Add `:delmarks` command ([VIM-1720](https://youtrack.jetbrains.com/issue/VIM-1720))
 * Add IdeaVim icon to the status bar ([VIM-943](https://youtrack.jetbrains.com/issue/VIM-943))
 
-**Changes:**
+### Changes:
 * Remove the default IdeaVim toggle shortcut (<kbd>CTRL</kbd><kbd>ALT</kbd><kbd>V</kbd>)
 * Rename `refactoring` value of `selectmode` option to `ideaselection`
 * Remove `template` value of `selectmode` option and replace it with `idearefactormode` option.
 
-**Fixes:**
+### Fixes:
 * [VIM-1766](https://youtrack.jetbrains.com/issue/VIM-1766) Fix disappearing caret in ex entry on Linux
 * [VIM-1032](https://youtrack.jetbrains.com/issue/VIM-1032) Annotations work well with relative line numbers enabled
 * [VIM-1762](https://youtrack.jetbrains.com/issue/VIM-1762) Relative line numbers respect line number theme
@@ -221,8 +576,7 @@ usual beta standards.
 * [VIM-1604](https://youtrack.jetbrains.com/issue/VIM-1604) Add IdeaVim logo
 
 
-0.53, 2019-08-07
---------------
+## 0.53, 2019-08-07
 * [VIM-1711](https://youtrack.jetbrains.com/issue/VIM-1711) Search is not triggered during surround action
 * [VIM-1712](https://youtrack.jetbrains.com/issue/VIM-1712) Fix `Y` command for visual mode
 * [VIM-1713](https://youtrack.jetbrains.com/issue/VIM-1713) Surround in visual mode put caret in correct position
@@ -233,8 +587,7 @@ usual beta standards.
 * [VIM-1736](https://youtrack.jetbrains.com/issue/VIM-1736) Fix `` for ex panel
 * [VIM-1739](https://youtrack.jetbrains.com/issue/VIM-1739) Fix full-width characters for ex pane
 
-0.52, 2019-07-23
---------------
+## 0.52, 2019-07-23
 
 * Introduce [Select Mode](https://github.com/JetBrains/ideavim/wiki/Select-mode).
 
@@ -327,8 +680,7 @@ usual beta standards.
 * [VIM-1698](https://youtrack.jetbrains.com/issue/VIM-1698) Paste doesn't clear clipboard
 * [VIM-1359](https://youtrack.jetbrains.com/issue/VIM-1359) Fix behavior of i_CTRL-W action
 
-0.51, 2019-02-12
-----------------
+## 0.51, 2019-02-12
 
 * [VIM-1558](https://youtrack.jetbrains.com/issue/VIM-1558) Fixed scrolling for code with block inlays in Rider 2018.3 
 * [VIM-1187](https://youtrack.jetbrains.com/issue/VIM-1187) Improved performance of `set relativelinenumber` on large files
@@ -336,8 +688,7 @@ usual beta standards.
 * [VIM-798](https://youtrack.jetbrains.com/issue/VIM-798) Allow arrow keys for window navigation commands
 
 
-0.50, 2018-10-18
-----------------
+## 0.50, 2018-10-18
 
 Moved "Vim Emulation" settings into "File | Settings | Vim Emulation". Support
 for vim-multiple-cursors commands `<A-n>`, `<A-x>`, `<A-p>`, `g<A-n>` (put `set
@@ -363,8 +714,7 @@ Vim commands for multiple cursors. Various bug fixes.
 * [VIM-1274](https://youtrack.jetbrains.com/issue/VIM-1274) Correctly process escaping when `smartcase` is on
 
 
-0.49, 2017-12-12
-----------------
+## 0.49, 2017-12-12
 
 Enabled zero-latency typing for Vim emulation. Added support for `iskeyword` option. Various bug fixes.
 
@@ -372,8 +722,7 @@ Enabled zero-latency typing for Vim emulation. Added support for `iskeyword` opt
 * [VIM-1367](https://youtrack.jetbrains.com/issue/VIM-1367) Support `iskeyword` option
 * [VIM-523](https://youtrack.jetbrains.com/issue/VIM-523) Fixed global mark remembering only the line number
 
-0.48, 2017-01-15
-----------------
+## 0.48, 2017-01-15
 
 A bugfix release.
 
@@ -387,8 +736,7 @@ Features:
 * Support for zero-latency rendering
 
 
-0.47, 2016-10-19
-----------------
+## 0.47, 2016-10-19
 
 A bugfix release.
 
@@ -398,8 +746,7 @@ Bug fixes:
 * VIM-1190 Fixed exception "Write access is allowed from write-safe contexts only"
 
 
-0.46, 2016-07-07
-----------------
+## 0.46, 2016-07-07
 
 Added `incsearch` option for incremental search. Added support for `it` and
 `at` tag block selection. Added `vim-surround` commands `ys`, `cs`, `ds`,
@@ -427,8 +774,7 @@ Bug fixes:
 * VIM-1126 Fixed warning about modifying shortcuts of global actions for 2016.2
 
 
-0.44, 2015-11-02
-----------------
+## 0.44, 2015-11-02
 
 A bugfix release.
 
@@ -437,16 +783,14 @@ A bugfix release.
   plugin disabled
 
 
-0.43, 2015-11-02
-----------------
+## 0.43, 2015-11-02
 
 A bugfix release.
 
 * VIM-1039 Fixed running the plugin with Java 6
 
 
-0.42, 2015-11-01
-----------------
+## 0.42, 2015-11-01
 
 This release is compatible with IntelliJ 15+ and other IDEs based on the
 IntelliJ platform branch 143+.
@@ -454,8 +798,7 @@ IntelliJ platform branch 143+.
 * VIM-970 Fixed move commands in read-only files
 
 
-0.41, 2015-06-10
-----------------
+## 0.41, 2015-06-10
 
 A bugfix release.
 
@@ -463,8 +806,7 @@ A bugfix release.
   IntelliJ
 
 
-0.40, 2015-06-09
-----------------
+## 0.40, 2015-06-09
 
 Added support for `mapleader`. Support comments in `%` brace matching. Various
 bug fixes.
@@ -491,8 +833,7 @@ Bug fixes:
 * VIM-930 Fixed editor focus issues after closing Ex entry box on Oracle Java 6
 
 
-0.39, 2014-12-03
-----------------
+## 0.39, 2014-12-03
 
 A bugfix release.
 
@@ -504,8 +845,7 @@ Bug fixes:
 * EA-63022 Don't update line numbers in the caret movement event listener
 
 
-0.38, 2014-12-01
-----------------
+## 0.38, 2014-12-01
 
 Added support for `number` and `relativenumber` options, `clipboard=unnamed`
 option. Added `:action` and `:actionlist` commands for executing arbitrary
@@ -537,8 +877,7 @@ Bug fixes:
 * VIM-723 Fix pasting to an empty line
 
 
-0.37, 2014-10-15
-----------------
+## 0.37, 2014-10-15
 
 A bugfix release.
 
@@ -549,8 +888,7 @@ Bug fixes:
 * VIM-407 Fixed `>>` to work if a line contains only one character
 
 
-0.36, 2014-10-14
-----------------
+## 0.36, 2014-10-14
 
 Added support for common window splitting and navigation commands. Various bug
 fixes.
@@ -569,8 +907,7 @@ Bug fixes:
 * VIM-569 Fixed `<C-W>` when the caret is at the end of a line
 
 
-0.35, 2014-05-15
-----------------
+## 0.35, 2014-05-15
 
 The `~/.vimrc` initialization file is no longer read by default, use
 `~/.ideavimrc` instead.
@@ -591,8 +928,7 @@ Bug fixes:
   selection
 
 
-0.34, 2014-04-29
-----------------
+## 0.34, 2014-04-29
 
 A bugfix release.
 
@@ -606,8 +942,7 @@ Bug fixes:
 * VIM-667 Ignore potentially nested lines of .vimrc based on leading whitespace
 
 
-0.33, 2014-04-28
-----------------
+## 0.33, 2014-04-28
 
 Added support for `:map` key mapping commands. New keyboard shortcuts handler
 that doesn't require a separate keymap for Vim emulation. Added support for
@@ -626,14 +961,12 @@ Bug fixes:
 * VIM-281 Don't disable global reformat code action for Vim emulation
 
 
-0.32, 2013-11-15
-----------------
+## 0.32, 2013-11-15
 
 Fixed API compatibility with IntelliJ platform builds 132.1052+.
 
 
-0.31, 2013-11-12
-----------------
+## 0.31, 2013-11-12
 
 A bugfix release.
 
@@ -642,8 +975,7 @@ Bug fixes:
 * VIM-582 Fixed line comment and reformat commands with no visual selection
 
 
-0.30, 2013-11-11
-----------------
+## 0.30, 2013-11-11
 
 Added support for a separate `.ideavimrc` config file. Fixed long-standing
 issues with merged undo/redo commands and `<Esc>` during code completion.
@@ -663,8 +995,7 @@ Bug fixes:
 * Fixed several reported exceptions
 
 
-0.29, 2013-05-15
-----------------
+## 0.29, 2013-05-15
 
 A bugfix release.
 
@@ -675,8 +1006,7 @@ Bug fixes:
 * VIM-121 Don't move cursor while scrolling
 
 
-0.28, 2013-04-06
-----------------
+## 0.28, 2013-04-06
 
 A bugfix release.
 
@@ -686,8 +1016,7 @@ Bug fixes:
 * VIM-479 Don't try to activate insert mode for diff view
 
 
-0.27, 2013-04-03
-----------------
+## 0.27, 2013-04-03
 
 New Vim keymap generator creates better keymaps, especially for Mac OS X.
 Restart after reconfiguring the keymap is no longer required.
@@ -708,8 +1037,7 @@ Bug fixes:
 * Fixed command window font size to match editor font size
 
 
-0.26, 2012-12-26
-----------------
+## 0.26, 2012-12-26
 
 Added support for paste in the command mode: from a register using `<C-R>`,
 from the clipboard using `<S-Insert>` or `<M-V>`. Added support for the last
@@ -728,8 +1056,7 @@ Bug fixes:
 * VIM-302 Fixed tab switching order for `gt` and `gT`
 
 
-0.25, 2012-12-19
-----------------
+## 0.25, 2012-12-19
 
 A bugfix release.
 
@@ -738,8 +1065,7 @@ A bugfix release.
   character
 
 
-0.24, 2012-12-03
-----------------
+## 0.24, 2012-12-03
 
 Added Vim string object selection motions (see help topics `v_i"`, `v_a"`).
 Various bug fixes.
@@ -778,8 +1104,7 @@ Bug fixes:
 * VIM-157 Fixed regression in moving the cursor after `~`
 
 
-0.23.115, 2012-11-14
---------------------
+## 0.23.115, 2012-11-14
 
 A bugfix release.
 
@@ -788,8 +1113,7 @@ A bugfix release.
 * VIM-112 Delete a single previous word with <C-W> in insert mode, not all inserted words
 
 
-0.23.111, 2012-11-12
---------------------
+## 0.23.111, 2012-11-12
 
 A bugfix release.
 
@@ -808,8 +1132,7 @@ A bugfix release.
   found
 
 
-0.23.93, 2012-03-21
--------------------
+## 0.23.93, 2012-03-21
 
 A bugfix release. Vim.xml was fixed to use Command+C, Command+V on Mac OS.
 Unfortunately you need to update Vim.xml manually this time.

CONTRIBUTING.md

@@ -1,9 +1,12 @@
 [![TeamCity Build][teamcity-build-status-svg]][teamcity-build-status]
 
-IdeaVim is an open source project created by 60+ contributors. Would you like to make it even better? That’s wonderful!
+IdeaVim is an open source project created by 80+ contributors. Would you like to make it even better? That’s wonderful!
 
 This page is created to help you start contributing. And who knows, maybe in a few days this project will be brighter than ever!
 
+:warning: The plugin is currently under a huge refactoring aiming to split into vim-engine and IdeaVim in order to
+support the new [Fleet IDE](https://www.jetbrains.com/fleet/). Please see [Fleet refactoring](#Fleet-refactoring).
+
 ## Before you begin
 
 - The project is written in Kotlin and Java. Choose whichever language you feel more comfortable with,
@@ -26,7 +29,12 @@ OK, ready to do some coding?
 * Fork the repository and clone it to the local machine.
 * Open the project with IntelliJ IDEA.
 
-Yoo hoo! You’re all set to begin contributing. Here are some useful gradle commands:
+Yoo hoo! You’re all set to begin contributing.
+We've prepared some useful configurations for you:
+
+![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:
 
 * `./gradlew runIde` — start the dev version of IntelliJ IDEA with IdeaVim installed.
 * `./gradlew test` — run tests.
@@ -56,7 +64,9 @@ If you are looking for:
 
 - Ex commands (`:set`, `:s`, `:nohlsearch`):
     - Any particular ex command: package `com.maddyhome.idea.vim.ex.handler`.
-    - Ex command executor: `CommandHandler`.
+    - Vim script grammar: `Vimscript.g4`.
+    - Vim script parsing: package `com.maddyhome.idea.vim.vimscript.parser`.
+    - Vim script executor: `Executor`.
 
 - Extensions:
     - Extensions handler: `VimExtensionHandler`.
@@ -64,7 +74,7 @@ If you are looking for:
 
 - Common features:
     - State machine. How every particular keystroke is parsed in IdeaVim: `KeyHandler.handleKey()`.
-    - Options (`incsearch`, `iskeyword`, `relativenumber`): `OptionsManager`.
+    - Options (`incsearch`, `iskeyword`, `relativenumber`): `OptionServiceImpl`.
     - Plugin startup: `PluginStartup`.
     - Notifications: `NotificationService`.
     - Status bar icon: `StatusBar.kt`.
@@ -110,6 +120,17 @@ so you can reuse your `.vimrc` settings.
 We also support proper command mappings (functions are mapped to `<Plug>...`), the operator function (`OperatorFunction`), and so on.
 - Magic is supported as well. See `Magic`.
 
+
+## Fleet refactoring
+At the moment, IdeaVim is under an active refactoring aiming to split IdeaVim into two modules: vim-engine and IdeaVim.
+
+If you develop a plugin that depends on IdeaVim: We have an instrument to check that our changes don't affect
+the plugins in the marketplace. Also, we commit to support currently used API at least till the end of 2022.
+If you still encounter any issues with the newer versions of IdeaVim, please [contact maintainers](https://github.com/JetBrains/ideavim#contact-maintainers).
+We kindly ask you not to use anything from the new API (like `VimEditor`, `injector`) because at the moment we don't
+guarantee the compatibility of this API in the future versions.
+
+
 -----
 
 ### I read the whole page but something is still unclear.
@@ -131,10 +152,10 @@ This is just terrible. [You know what to do](https://github.com/JetBrains/ideavi
 * [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)
-* [Unofficial discord server](https://jb.gg/bi6zp7)
+* [IdeaVim Channel](https://jb.gg/bi6zp7) on [JetBrains Server](https://discord.gg/jetbrains)
 * [Plugin homepage](https://plugins.jetbrains.com/plugin/164-ideavim)
 * [Changelog](CHANGES.md)
 * [Contributors listing](AUTHORS.md)
 
-[teamcity-build-status]: https://teamcity.jetbrains.com/viewType.html?buildTypeId=IdeaVim_TestsForIntelliJ20201&guest=1
-[teamcity-build-status-svg]: https://teamcity.jetbrains.com/app/rest/builds/buildType:(id:IdeaVim_TestsForIntelliJ20201)/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

README.md

@@ -1,4 +1,4 @@
-<img src="resources/META-INF/pluginIcon.svg" width="80" height="80" alt="icon" align="left"/>
+<img src="src/main/resources/META-INF/pluginIcon.svg" width="80" height="80" alt="icon" align="left"/>
 
 IdeaVim
 ===
@@ -11,13 +11,13 @@ IdeaVim
 [![Gitter][gitter-svg]][gitter]
 [![Twitter][twitter-svg]][twitter]
 
-IdeaVim is a Vim emulation plugin for IDEs based on the IntelliJ Platform.
+IdeaVim is a Vim engine for JetBrains IDEs.
 
 ##### Contact maintainers:
 * [Bug tracker](https://youtrack.jetbrains.com/issues/VIM)
 * [@IdeaVim](https://twitter.com/ideavim) on Twitter
 * [Chat on gitter](https://gitter.im/JetBrains/ideavim)
-* [Unofficial discord server](https://jb.gg/bi6zp7)
+* [IdeaVim Channel](https://jb.gg/bi6zp7) on [JetBrains Server](https://discord.gg/jetbrains)
 
 ##### Resources:
 
@@ -36,13 +36,13 @@ Setup
 - IdeaVim can be installed via `Settings | Plugins`.
 See the [detailed instructions](https://www.jetbrains.com/help/idea/managing-plugins.html#).
 
-- Use `Tools | Vim Emulator` to enable or disable emulation.
+- Use `Tools | Vim` in the menu to enable or disable vim.
 
 - Use the `~/.ideavimrc` file as an analog of `~/.vimrc` ([learn more](#Files)). The XDG standard is supported, as well.
 
 - Shortcut conflicts can be resolved by using:
-     - On Linux & Windows: `File | Settings | Editor | Vim Emulation` & `File | Settings | Keymap`,
-     - On macOS: `Preferences | Editor | Vim Emulation` & `Preferences | Keymap`,
+     - On Linux & Windows: `File | Settings | Editor | Vim` & `File | Settings | Keymap`,
+     - On macOS: `Preferences | Editor | Vim` & `Preferences | Keymap`,
      - Regular Vim mappings in the  `~/.ideavimrc` file.
 
 Get Early Access
@@ -51,15 +51,17 @@ Get Early Access
 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="resources/META-INF/pluginIcon_noBorders.svg" width="16" height="16" alt="icon"/>
-in the status bar  | `EAP` | `Get Early Access...`
+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` | `Subscibe to EAP`
 
 
 Or subscribe to EAP updates manually:
 
 1. Open `Settings | Plugins`
 2. Click the gear icon :gear:, select `Manage Plugin Repositories`, and add the following url:
- `https://plugins.jetbrains.com/plugins/eap/ideavim`
+```
+https://plugins.jetbrains.com/plugins/eap/ideavim
+```
 
 See [the changelog](CHANGES.md) for the list of unreleased features.
 
@@ -81,14 +83,15 @@ Here are some examples of supported vim features and commands:
 * Motion / deletion / change / window / etc. commands
 * Key mappings
 * Marks / Macros / Digraphs / Registers
-* Some [set commands](doc/set-commands.md)
+* Some [set commands](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands)
 * Full Vim regexps for search and search/replace
 * Vim web help
 * `~/.ideavimrc` configuration file
 
-[Emulated Vim plugins](doc/emulated-plugins.md):
+[IdeaVim plugins](https://github.com/JetBrains/ideavim/wiki/Emulated-plugins):
 
 * vim-easymotion
+* NERDTree
 * vim-surround
 * vim-multiple-cursors
 * vim-commentary
@@ -97,12 +100,16 @@ Here are some examples of supported vim features and commands:
 * ReplaceWithRegister
 * vim-exchange
 * vim-highlightedyank
+* vim-paragraph-motion
+* vim-indent-object
+* match.it
 
 See also:
 
-* [The list of all supported commands](src/com/maddyhome/idea/vim/package-info.java)
+* [The list of all supported commands](src/main/java/com/maddyhome/idea/vim/package-info.java)
 * [Top feature requests and bugs](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+sort+by%3A+votes)
-
+* [Vimscript support roadmap](vimscript-info/VIMSCRIPT_ROADMAP.md)
+* [List of supported in-build functions](vimscript-info/FUNCTIONS_INFO.MD)
 
 Files
 -----
@@ -144,31 +151,44 @@ set idearefactormode=keep
 map <leader>f <Plug>(easymotion-s)
 map <leader>e <Plug>(easymotion-f)
 
-map <leader>d :action Debug<CR>
-map <leader>r :action RenameElement<CR>
-map <leader>c :action Stop<CR>
-map <leader>z :action ToggleDistractionFreeMode<CR>
+map <leader>d <Action>(Debug)
+map <leader>r <Action>(RenameElement)
+map <leader>c <Action>(Stop)
+map <leader>z <Action>(ToggleDistractionFreeMode)
 
-map <leader>s :action SelectInProjectView<CR>
-map <leader>a :action Annotate<CR>
-map <leader>h :action Vcs.ShowTabbedFileHistory<CR>
-map <S-Space> :action GotoNextError<CR>
+map <leader>s <Action>(SelectInProjectView)
+map <leader>a <Action>(Annotate)
+map <leader>h <Action>(Vcs.ShowTabbedFileHistory)
+map <S-Space> <Action>(GotoNextError)
 
-map <leader>b :action ToggleLineBreakpoint<CR>
-map <leader>o :action FileStructurePopup<CR>
+map <leader>b <Action>(ToggleLineBreakpoint)
+map <leader>o <Action>(FileStructurePopup)
 ```
 </details>
 
+<details>
+<summary><strong>Suggested options</strong> (click to see)</summary>
+
+Here is also a list of the suggested options from [defaults.vim](https://github.com/vim/vim/blob/master/runtime/defaults.vim)
+
+```vim
+" Show a few lines of context around the cursor. Note that this makes the
+" text scroll if you mouse-click near the start or end of the window.
+set scrolloff=5
+
+" Do incremental searching.
+set incsearch
+
+" Don't use Ex mode, use Q for formatting.
+map Q gq
+```
+</details>
 
 
 You can read your `~/.vimrc` file from `~/.ideavimrc` with this command:
 
     source ~/.vimrc
 
-Please note that IdeaVim currently parses `~/.ideavimrc` & `~/.vimrc` files via simple pattern-matching.
-See [VIM-669](https://youtrack.jetbrains.com/issue/VIM-669) for proper parsing
-of VimL files.
-
 Also note that if you have overridden the `user.home` JVM option, this
 will affect where IdeaVim looks for your `.ideavimrc` file. For example, if you
 have `-Duser.home=/my/alternate/home` then IdeaVim will source
@@ -178,54 +198,110 @@ Alternatively, you can set up initialization commands using [XDG](https://specif
 Put your settings to `$XDG_CONFIG_HOME/ideavim/ideavimrc` file.
 
 
-Emulated Vim Plugins
+IdeaVim Plugins
 --------------------
 
-See [doc/emulated-plugins.md](doc/emulated-plugins.md)
+See [doc/emulated-plugins.md](https://github.com/JetBrains/ideavim/wiki/Emulated-plugins)
 
-Changes to the IDE
-------------------
+Executing IDE Actions
+---------------------
 
-### Executing IDE Actions
-
-IdeaVim adds two commands for listing and executing arbitrary IDE actions as
+IdeaVim adds various commands for listing and executing arbitrary IDE actions as
 Ex commands or via `:map` command mappings:
 
-* `:actionlist [pattern]`
-    * Find IDE actions by name or keymap pattern (E.g. `:actionlist extract`, `:actionlist <C-D`)
-* `:action {name}`
-    * Execute an action named `NAME`
+### 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).
 
-Examples:
+### Finding action ids:
+
+* IJ provides `IdeaVim: track action Ids` command to show the id of the executed actions.
+  This command can be found in "Search everywhere" (double `shift`).
+
+    <details>
+        <summary><strong>"Track action Ids" Details</strong> (click to see)</summary>
+        <picture>
+            <source media="(prefers-color-scheme: dark)" srcset="assets/readme/track_action_dark.gif">
+            <img src="assets/readme/track_action_light.gif" alt="track action ids"/>
+        </picture>
+    </details>
+
+
+* `:actionlist [pattern]`
+    * Find IDE actions by id or keymap pattern (E.g. `:actionlist extract`, `:actionlist <C-D`)
+
+##### Examples:
 
 ```vim
 " Map \r to the Reformat Code action
-:map \r :action ReformatCode<CR>
+:map \r <Action>(ReformatCode)
 
 " Map <leader>d to start debug
-:map <leader>d :action Debug<CR>
+:map <leader>d <Action>(Debug)
 
 " Map \b to toggle the breakpoint on the current line
-:map \b :action ToggleLineBreakpoint<CR>
+:map \b <Action>(ToggleLineBreakpoint)
 ```
 
-### Undo/Redo
+##### Some popular actions:
 
-The IdeaVim plugin uses the undo/redo functionality of the IntelliJ Platform,
-so the behavior of the `u` and `<C-R>` commands may differ from the original
-Vim. Vim compatibility of undo/redo may be improved in future releases.
+```
+QuickJavaDoc - Quick Documentation (not only for java, all languages)
+ShowErrorDescription - Show description of the error under the caret (cursor hovering)
+QuickImplementations - Quick Definition
+```
 
-See also [unresolved undo issues](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+u).
+Vim Script
+------------
 
-### Escape
+IdeaVim can execute custom scripts that are written with Vim Script.
+At the moment we support all language features, but not all of the built-in functions and options are supported.
 
-Using `<Esc>` in dialog windows remains problematic. For most dialog windows,
-the Vim emulator is put into insert mode with `<Esc>` not working. You
-should use `<C-c>` or `<C-[>` instead. In some dialog windows, the normal mode is
-switched by default. The usage of the Vim emulator in dialog windows is an area for
-improvement.
+Additionally, you may be interested in the
+[Vim Script Discussion](https://github.com/JetBrains/ideavim/discussions/357) or
+[Vim Script Roadmap](https://github.com/JetBrains/ideavim/blob/master/vimscript-info/VIMSCRIPT_ROADMAP.md).
 
-See also [unresolved escape issues](https://youtrack.jetbrains.com/issues/VIM?q=%23Unresolved+Help+topic%3A+i_Esc).
+
+### IDE specific options
+
+You can evaluate the `has('ide')` function call and get `1` if it was called with IdeaVim or `0` if the function was called from Vim/NeoVim.  
+The option `&ide` contains the name and edition of your IDE, for example, "IntelliJ IDEA Ultimate Edition".  
+To see its value for the current IDE you are using, execute the `:echo &ide` command.  
+To write an IDE-specific configuration, use Vim's regexp match operators `=~?` (case-insensitive) / `=~#`  (case-sensitive)
+
+**Example config:**
+
+```vim
+" options and mappings that are supported by both Vim and IdeaVim
+set nu
+set relativenumber
+
+if has('ide')
+  " mappings and options that exist only in IdeaVim
+  map <leader>f <Action>(GotoFile)
+  map <leader>g <Action>(FindInPath)
+  map <leader>b <Action>(Switcher)
+
+  if &ide =~? 'intellij idea'
+    if &ide =~? 'community'
+      " some mappings and options for IntelliJ IDEA Community Edition
+    elseif &ide =~? 'ultimate'
+      " some mappings and options for IntelliJ IDEA Ultimate Edition
+    endif
+  elseif &ide =~? 'pycharm'
+    " PyCharm specific mappings and options
+  endif
+else
+  " some mappings for Vim/Neovim
+  nnoremap <leader>f <cmd>Telescope find_files<cr>
+endif
+```
 
 :gem: Contributing
 ------------
@@ -247,15 +323,11 @@ IdeaVim tips and tricks
     - `set ideajoin` to enable join via the IDE. See the [examples](https://jb.gg/f9zji9).
     - Make sure `ideaput` is enabled for `clipboard` to enable native IJ insertion in Vim.
     - Sync IJ bookmarks and Vim marks: `set ideamarks`
-    - Check out more [ex commands](doc/set-commands.md).
+    - Check out more [ex commands](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands).
 
 - Use your vim settings with IdeaVim. Put `source ~/.vimrc` in `~/.ideavimrc`.
-    > :warning: Please note that IdeaVim currently parses `~/.ideavimrc` & `~/.vimrc` files via simple pattern-matching.
-    See [VIM-669](https://youtrack.jetbrains.com/issue/VIM-669) for proper parsing
-    of VimL files.
-
-- Control the status bar icon via the [`ideastatusicon` option](doc/set-commands.md).
-- Not familiar with the default behaviour during a refactoring? See the [`idearefactormode` option](doc/set-commands.md).
+- Control the status bar icon via the [`ideastatusicon` option](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands).
+- Not familiar with the default behaviour during a refactoring? See the [`idearefactormode` option](https://github.com/JetBrains/ideavim/wiki/%22set%22-commands).
 
 Some facts about Vim
 -------

build.gradle

@@ -1,133 +0,0 @@
-buildscript {
-  repositories {
-    mavenCentral()
-  }
-
-  dependencies {
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-  }
-}
-
-plugins {
-  id 'org.jetbrains.intellij' version '0.4.18'
-}
-
-apply plugin: 'java'
-apply plugin: 'kotlin'
-
-sourceCompatibility = javaVersion
-targetCompatibility = javaVersion
-
-tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
-
-sourceSets {
-  main {
-    java.srcDir 'src'
-    resources.srcDir 'resources'
-  }
-  test {
-    java.srcDir 'test'
-  }
-}
-
-intellij {
-  version ideaVersion
-  pluginName 'IdeaVim'
-  updateSinceUntilBuild false
-  downloadSources Boolean.valueOf(downloadIdeaSources)
-  instrumentCode Boolean.valueOf(instrumentPluginCode)
-  intellijRepo = "https://www.jetbrains.com/intellij-repository"
-  plugins = ['java']
-
-  publishPlugin {
-    channels publishChannels.split(',')
-    username publishUsername
-    token publishToken
-  }
-}
-
-repositories {
-  mavenCentral()
-}
-
-dependencies {
-  compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
-  compileOnly "org.jetbrains:annotations:19.0.0"
-
-  // https://mvnrepository.com/artifact/com.ensarsarajcic.neovim.java/neovim-api
-  compile group: 'com.ensarsarajcic.neovim.java', name: 'neovim-api', version: '0.1.16'
-}
-
-compileKotlin {
-  kotlinOptions {
-    jvmTarget = javaVersion
-  }
-}
-compileTestKotlin {
-  kotlinOptions {
-    jvmTarget = javaVersion
-  }
-}
-
-task testWithNeovim(type : Test) {
-  group = "verification"
-  systemProperty "ideavim.neovim.test", 'true'
-}
-
-tasks.register("slackEapNotification") {
-  doLast {
-    if (!slackUrl) return
-    def post = new URL(slackUrl).openConnection()
-    def changeLog = extractChangelog()
-    changeLog = changeLog.replace("* ", "• ") // Replace stars with bullets
-    changeLog = changeLog.replace("**", "*") // Enable bold text
-    changeLog = changeLog.replaceAll("\\[([^]]+)]\\(([^)]+)\\)", '<$2|$1>') // Enable links
-    def message ="""
-      {
-          "text": "New version of IdeaVim",
-          "blocks": [
-                  {
-                    "type": "section",
-                    "text": {
-                      "type": "mrkdwn",
-                      "text": "IdeaVim EAP $version has been released\\n$changeLog"
-                    }
-                  }
-          ]
-      }
-   """
-    post.setRequestMethod("POST")
-    post.setDoOutput(true)
-    post.setRequestProperty("Content-Type", "application/json")
-    post.getOutputStream().write(message.getBytes("UTF-8"))
-    def postRC = post.getResponseCode()
-    println(postRC)
-    if(postRC == 200) {
-      println(post.getInputStream().getText())
-    }
-  }
-}
-
-// Very primitive changelog extraction code
-def extractChangelog() {
-  def startLine = "_Available since $version EAP:_"
-  def endLine = "_To Be Released..._"
-  def startSaving = false
-  def res = new StringBuilder()
-  new File("./CHANGES.md").eachLine { line ->
-    if (startSaving) {
-      if (line == endLine) {
-        startSaving = false
-      }
-      else {
-        res.append(line).append('\n')
-      }
-    }
-    else {
-      if (line == startLine) {
-        startSaving = true
-      }
-    }
-  }
-  return res.toString()
-}

build.gradle.kts

@@ -0,0 +1,634 @@
+
+import dev.feedforward.markdownto.DownParser
+import org.intellij.markdown.ast.getTextInNode
+import java.net.HttpURLConnection
+import java.net.URL
+
+buildscript {
+    repositories {
+        mavenCentral()
+        maven { url = uri("https://jitpack.io") }
+    }
+
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21")
+        classpath("com.github.AlexPl292:mark-down-to-slack:1.1.2")
+        classpath("org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r")
+        classpath("org.kohsuke:github-api:1.305")
+
+        // This comes from the changelog plugin
+//        classpath("org.jetbrains:markdown:0.3.1")
+    }
+}
+
+plugins {
+    antlr
+    java
+    kotlin("jvm") version "1.6.21"
+
+    id("org.jetbrains.intellij") version "1.10.0-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 "10.3.0"
+}
+
+// Import variables from gradle.properties file
+val javaVersion: String by project
+val kotlinVersion: String by project
+val ideaVersion: String by project
+val downloadIdeaSources: String by project
+val instrumentPluginCode: String by project
+val remoteRobotVersion: String by project
+val antlrVersion: String by project
+
+val publishChannels: String by project
+val publishToken: String by project
+
+val slackUrl: String by project
+
+repositories {
+    mavenCentral()
+    maven { url = uri("https://cache-redirector.jetbrains.com/intellij-dependencies") }
+}
+
+dependencies {
+    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")
+    testImplementation("com.ensarsarajcic.neovim.java:core-rpc:0.2.3")
+
+    // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-test
+    testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
+
+    // https://mvnrepository.com/artifact/org.mockito.kotlin/mockito-kotlin
+    testImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
+
+    testImplementation("com.intellij.remoterobot:remote-robot:$remoteRobotVersion")
+    testImplementation("com.intellij.remoterobot:remote-fixtures:$remoteRobotVersion")
+    testImplementation("com.automation-remarks:video-recorder-junit:2.0")
+    runtimeOnly("org.antlr:antlr4-runtime:$antlrVersion")
+    antlr("org.antlr:antlr4:$antlrVersion")
+
+    api(project(":vim-engine"))
+
+    testApi("com.squareup.okhttp3:okhttp:4.10.0")
+}
+
+configurations {
+    runtimeClasspath {
+        exclude(group = "org.antlr", module = "antlr4")
+    }
+}
+
+// --- Compilation
+// This can be moved to other test registration when issue with tests in gradle will be fixed
+tasks.register<Test>("testWithNeovim") {
+    group = "verification"
+    systemProperty("ideavim.nvim.test", "true")
+    exclude("/ui/**")
+    exclude("**/longrunning/**")
+    exclude("**/propertybased/**")
+}
+
+tasks.register<Test>("testPropertyBased") {
+    group = "verification"
+//    include("**/propertybased/**")
+}
+
+tasks.register<Test>("testLongRunning") {
+    group = "verification"
+//    include("**/longrunning/**")
+}
+
+tasks {
+    // Issue in gradle 7.3
+    val test by getting(Test::class) {
+        isScanForTestClasses = false
+        // Only run tests from classes that end with "Test"
+        include("**/*Test.class")
+        include("**/*test.class")
+        include("**/*Tests.class")
+        exclude("**/ParserTest.class")
+    }
+
+    val testWithNeovim by getting(Test::class) {
+        isScanForTestClasses = false
+        // Only run tests from classes that end with "Test"
+        include("**/*Test.class")
+        include("**/*test.class")
+        include("**/*Tests.class")
+        exclude("**/ParserTest.class")
+        exclude("**/longrunning/**")
+        exclude("**/propertybased/**")
+    }
+
+    val testPropertyBased by getting(Test::class) {
+        isScanForTestClasses = false
+        // Only run tests from classes that end with "Test"
+        include("**/propertybased/*Test.class")
+        include("**/propertybased/*test.class")
+        include("**/propertybased/*Tests.class")
+    }
+
+    val testLongRunning by getting(Test::class) {
+        isScanForTestClasses = false
+        // Only run tests from classes that end with "Test"
+        include("**/longrunning/**/*Test.class")
+        include("**/longrunning/**/*test.class")
+        include("**/longrunning/**/*Tests.class")
+        exclude("**/longrunning/**/ParserTest.class")
+    }
+
+    compileJava {
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
+
+        options.encoding = "UTF-8"
+    }
+
+    compileKotlin {
+        kotlinOptions {
+            jvmTarget = javaVersion
+            apiVersion = "1.6"
+            freeCompilerArgs = listOf("-Xjvm-default=all-compatibility")
+//            allWarningsAsErrors = true
+        }
+    }
+    compileTestKotlin {
+        kotlinOptions {
+            jvmTarget = javaVersion
+            apiVersion = "1.6"
+//            allWarningsAsErrors = true
+        }
+    }
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(javaVersion))
+    }
+}
+
+kotlin {
+    jvmToolchain {
+        (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(javaVersion))
+    }
+}
+
+gradle.projectsEvaluated {
+    tasks.compileJava {
+//        options.compilerArgs.add("-Werror")
+        options.compilerArgs.add("-Xlint:deprecation")
+    }
+}
+
+// --- Intellij plugin
+
+intellij {
+    version.set(ideaVersion)
+    pluginName.set("IdeaVim")
+
+    updateSinceUntilBuild.set(false)
+
+    downloadSources.set(downloadIdeaSources.toBoolean())
+    instrumentCode.set(instrumentPluginCode.toBoolean())
+    intellijRepository.set("https://www.jetbrains.com/intellij-repository")
+    // Yaml is only used for testing. It's part of the IdeaIC distribution, but needs to be included as a reference
+    plugins.set(listOf("java", "AceJump:3.8.4", "yaml"))
+}
+
+tasks {
+    downloadRobotServerPlugin {
+        version.set(remoteRobotVersion)
+    }
+
+    publishPlugin {
+        channels.set(publishChannels.split(","))
+        token.set(publishToken)
+    }
+
+    runIdeForUiTests {
+        systemProperty("robot-server.port", "8082")
+        systemProperty("ide.mac.message.dialogs.as.sheets", "false")
+        systemProperty("jb.privacy.policy.text", "<!--999.999-->")
+        systemProperty("jb.consents.confirmation.enabled", "false")
+    }
+
+    runPluginVerifier {
+        downloadDir.set("${project.buildDir}/pluginVerifier/ides")
+        teamCityOutputFormat.set(true)
+//        ideVersions.set(listOf("IC-2021.3.4"))
+    }
+
+    generateGrammarSource {
+        maxHeapSize = "128m"
+        arguments.addAll(listOf("-package", "com.maddyhome.idea.vim.vimscript.parser.generated", "-visitor"))
+        outputDirectory = file("src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated")
+    }
+
+    named("compileKotlin") {
+        dependsOn("generateGrammarSource")
+    }
+
+    // Add plugin open API sources to the plugin ZIP
+    val createOpenApiSourceJar by registering(Jar::class) {
+        // Java sources
+        from(sourceSets.main.get().java) {
+            include("**/com/maddyhome/idea/vim/**/*.java")
+        }
+        // Kotlin sources
+        from(kotlin.sourceSets.main.get().kotlin) {
+            include("**/com/maddyhome/idea/vim/**/*.kt")
+        }
+        destinationDirectory.set(layout.buildDirectory.dir("libs"))
+        archiveClassifier.set("src")
+    }
+
+    buildPlugin {
+        dependsOn(createOpenApiSourceJar)
+        from(createOpenApiSourceJar) { into("lib/src") }
+    }
+
+    // Don't forget to update plugin.xml
+    patchPluginXml {
+        sinceBuild.set("222")
+    }
+}
+
+// --- Linting
+
+ktlint {
+    disabledRules.add("no-wildcard-imports")
+    version.set("0.43.0")
+}
+
+// --- Tests
+
+tasks {
+    test {
+        exclude("**/propertybased/**")
+        exclude("**/longrunning/**")
+        exclude("/ui/**")
+    }
+}
+
+tasks.register<Test>("testUi") {
+    group = "verification"
+    include("/ui/**")
+}
+
+// --- Changelog
+
+changelog {
+    groups.set(listOf("Features:", "Changes:", "Deprecations:", "Fixes:", "Merged PRs:"))
+    itemPrefix.set("*")
+    path.set("${project.projectDir}/CHANGES.md")
+    unreleasedTerm.set("To Be Released")
+    headerParserRegex.set("(\\d\\.\\d+(.\\d+)?)".toRegex())
+//    header = { "${project.version}" }
+//    version = "0.60"
+}
+
+tasks.register("getUnreleasedChangelog") {
+    group = "changelog"
+    doLast {
+        val log = changelog.getUnreleased().toHTML()
+        println(log)
+    }
+}
+
+// --- Slack notification
+
+tasks.register("slackNotification") {
+    doLast {
+        if (slackUrl.isBlank()) {
+            println("Slack Url is not defined")
+            return@doLast
+        }
+        val changeLog = changelog.getLatest().toText()
+        val slackDown = DownParser(changeLog, true).toSlack().toString()
+
+        //language=JSON
+        val message = """
+            {
+                "text": "New version of IdeaVim",
+                "blocks": [
+                    {
+                        "type": "section",
+                        "text": {
+                            "type": "mrkdwn",
+                            "text": "IdeaVim $version has been released\n$slackDown"
+                        }
+                    }
+                ]
+            }
+        """.trimIndent()
+
+        println("Parsed data: $slackDown")
+        val post = URL(slackUrl)
+        with(post.openConnection() as HttpURLConnection) {
+            requestMethod = "POST"
+            doOutput = true
+            setRequestProperty("Content-Type", "application/json")
+
+            outputStream.write(message.toByteArray())
+
+            val postRc = responseCode
+            println("Response code: $postRc")
+            if (postRc == 200) {
+                println(inputStream.bufferedReader().use { it.readText() })
+            } else {
+                println(errorStream.bufferedReader().use { it.readText() })
+            }
+        }
+    }
+}
+
+// Uncomment to enable FUS testing mode
+// tasks {
+//    withType<org.jetbrains.intellij.tasks.RunIdeTask> {
+//        jvmArgs("-Didea.is.internal=true")
+//        jvmArgs("-Dfus.internal.test.mode=true")
+//    }
+// }
+
+// --- Update authors
+tasks.register("updateAuthors") {
+    doLast {
+        val uncheckedEmails = setOf(
+            "aleksei.plate@jetbrains.com",
+            "aleksei.plate@teamcity",
+            "aleksei.plate@TeamCity",
+            "alex.plate@192.168.0.109",
+            "nikita.koshcheev@TeamCity",
+        )
+        updateAuthors(uncheckedEmails)
+    }
+}
+
+val prId: String by project
+
+tasks.register("updateMergedPr") {
+    doLast {
+        if (project.hasProperty("prId")) {
+            println("Got pr id: $prId")
+            updateMergedPr(prId.toInt())
+        } else {
+            error("Cannot get prId")
+        }
+    }
+}
+
+tasks.register("updateChangelog") {
+    doLast {
+        updateChangelog()
+    }
+}
+
+tasks.register("testUpdateChangelog") {
+    group = "verification"
+    description = "This is a task to manually assert the correctness of the update tasks"
+    doLast {
+        val changesFile = File("$projectDir/CHANGES.md")
+        val changes = changesFile.readText()
+
+        val changesBuilder = StringBuilder(changes)
+        val insertOffset = setupSection(changes, changesBuilder, "### Changes:")
+
+        changesBuilder.insert(insertOffset, "--Hello--\n")
+
+        changesFile.writeText(changesBuilder.toString())
+    }
+}
+
+fun updateChangelog() {
+    println("Start update authors")
+    println(projectDir)
+    val repository = org.eclipse.jgit.lib.RepositoryBuilder().setGitDir(File("$projectDir/.git")).build()
+    val git = org.eclipse.jgit.api.Git(repository)
+    val lastSuccessfulCommit = System.getenv("SUCCESS_COMMIT")!!
+    val messages = git.log().call()
+        .takeWhile {
+            !it.id.name.equals(lastSuccessfulCommit, ignoreCase = true)
+        }
+        .map { it.shortMessage }
+
+    // Collect fixes
+    val newFixes = mutableListOf<Change>()
+    println("Last successful commit: $lastSuccessfulCommit")
+    println("Amount of commits: ${messages.size}")
+    println("Start emails processing")
+    for (message in messages) {
+        println("Processing '$message'...")
+        val lowercaseMessage = message.toLowerCase()
+        val regex = "^fix\\((vim-\\d+)\\):".toRegex()
+        val findResult = regex.find(lowercaseMessage)
+        if (findResult != null) {
+            println("Message matches")
+            val value = findResult.groups[1]!!.value.toUpperCase()
+            val shortMessage = message.drop(findResult.range.last + 1).trim()
+            newFixes += Change(value, shortMessage)
+        } else {
+            println("Message doesn't match")
+        }
+    }
+
+    // Update changes file
+    val changesFile = File("$projectDir/CHANGES.md")
+    val changes = changesFile.readText()
+
+    val changesBuilder = StringBuilder(changes)
+    val insertOffset = setupSection(changes, changesBuilder, "### Fixes:")
+
+    if (insertOffset < 50) error("Incorrect offset: $insertOffset")
+
+    val firstPartOfChanges = changes.take(insertOffset)
+    val actualFixes = newFixes
+        .filterNot { it.id in firstPartOfChanges }
+    val newUpdates = actualFixes
+        .joinToString("") { "* [${it.id}](https://youtrack.jetbrains.com/issue/${it.id}) ${it.text}\n" }
+
+    changesBuilder.insert(insertOffset, newUpdates)
+    if (actualFixes.isNotEmpty()) {
+        changesFile.writeText(changesBuilder.toString())
+    }
+}
+
+fun updateAuthors(uncheckedEmails: Set<String>) {
+    println("Start update authors")
+    println(projectDir)
+    val repository = org.eclipse.jgit.lib.RepositoryBuilder().setGitDir(File("$projectDir/.git")).build()
+    val git = org.eclipse.jgit.api.Git(repository)
+    val lastSuccessfulCommit = System.getenv("SUCCESS_COMMIT")!!
+    val hashesAndEmailes = git.log().call()
+        .takeWhile {
+            !it.id.name.equals(lastSuccessfulCommit, ignoreCase = true)
+        }
+        .associate { it.authorIdent.emailAddress to it.name }
+
+    println("Last successful commit: $lastSuccessfulCommit")
+    println("Amount of commits: ${hashesAndEmailes.size}")
+    println("Emails: ${hashesAndEmailes.keys}")
+    val gitHub = org.kohsuke.github.GitHub.connect()
+    val ghRepository = gitHub.getRepository("JetBrains/ideavim")
+    val users = mutableSetOf<Author>()
+    println("Start emails processing")
+    for ((email, hash) in hashesAndEmailes) {
+        println("Processing '$email'...")
+        if (email in uncheckedEmails) {
+            println("Email '$email' is in unchecked emails. Skip it")
+            continue
+        }
+        if ("dependabot[bot]@users.noreply.github.com" in email) {
+            println("Email '$email' is from dependabot. Skip it")
+            continue
+        }
+        val user = ghRepository.getCommit(hash).author
+        val htmlUrl = user.htmlUrl.toString()
+        val name = user.name ?: user.login
+        users.add(Author(name, htmlUrl, email))
+    }
+
+    println("Emails processed")
+    val authorsFile = File("$projectDir/AUTHORS.md")
+    val authors = authorsFile.readText()
+    val parser =
+        org.intellij.markdown.parser.MarkdownParser(org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor())
+    val tree = parser.buildMarkdownTreeFromString(authors)
+
+    val contributorsSection = tree.children[24]
+    val existingEmails = mutableSetOf<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()
+            )
+        }
+    }
+
+    val newAuthors = users.filterNot { it.mail in existingEmails }
+    if (newAuthors.isEmpty()) return
+
+    val authorNames = newAuthors.joinToString(", ") { it.name }
+    println("::set-output name=authors::$authorNames")
+
+    val insertionString = newAuthors.toMdString()
+    val resultingString = StringBuffer(authors).insert(contributorsSection.endOffset, insertionString).toString()
+
+    authorsFile.writeText(resultingString)
+}
+
+fun List<Author>.toMdString(): String {
+    return this.joinToString {
+        """
+          |
+          |* [![icon][mail]](mailto:${it.mail})
+          |  [![icon][github]](${it.url})
+          |  &nbsp;
+          |  ${it.name}
+        """.trimMargin()
+    }
+}
+
+data class Author(val name: String, val url: String, val mail: String)
+data class Change(val id: String, val text: String)
+
+fun updateMergedPr(number: Int) {
+    val gitHub = org.kohsuke.github.GitHub.connect()
+    println("Connecting to the repo...")
+    val repository = gitHub.getRepository("JetBrains/ideavim")
+    println("Getting pull requests...")
+    val pullRequest = repository.getPullRequest(number)
+    if (pullRequest.user.login == "dependabot[bot]") return
+
+    val changesFile = File("$projectDir/CHANGES.md")
+    val changes = changesFile.readText()
+
+    val changesBuilder = StringBuilder(changes)
+    val insertOffset = setupSection(changes, changesBuilder, "### Merged PRs:")
+
+    if (insertOffset < 50) error("Incorrect offset: $insertOffset")
+    if (pullRequest.user.login == "dependabot[bot]") return
+
+    val prNumber = pullRequest.number
+    val userName = pullRequest.user.name
+    val login = pullRequest.user.login
+    val title = pullRequest.title
+    val section =
+        "* [$prNumber](https://github.com/JetBrains/ideavim/pull/$prNumber) by [$userName](https://github.com/$login): $title\n"
+    changesBuilder.insert(insertOffset, section)
+
+    changesFile.writeText(changesBuilder.toString())
+}
+
+fun setupSection(
+    changes: String,
+    authorsBuilder: StringBuilder,
+    sectionName: String,
+): Int {
+    val parser =
+        org.intellij.markdown.parser.MarkdownParser(org.intellij.markdown.flavours.gfm.GFMFlavourDescriptor())
+    val tree = parser.buildMarkdownTreeFromString(changes)
+
+    var idx = -1
+    for (index in tree.children.indices) {
+        if (tree.children[index].getTextInNode(changes).startsWith("## ")) {
+            idx = index
+            break
+        }
+    }
+
+    val hasToBeReleased = tree.children[idx].getTextInNode(changes).contains("To Be Released")
+    return if (hasToBeReleased) {
+        var mrgIdx = -1
+        for (index in (idx + 1) until tree.children.lastIndex) {
+            val textInNode = tree.children[index].getTextInNode(changes)
+            val foundIndex = textInNode.startsWith(sectionName)
+            if (foundIndex) {
+                var filledPr = index + 2
+                while (tree.children[filledPr].getTextInNode(changes).startsWith("*")) {
+                    filledPr++
+                }
+                mrgIdx = tree.children[filledPr].startOffset + 1
+                break
+            } else {
+                val currentSectionIndex = sections.indexOf(sectionName)
+                val insertHere = textInNode.startsWith("## ") ||
+                    textInNode.startsWith("### ") &&
+                    sections.indexOfFirst { textInNode.startsWith(it) }
+                        .let { if (it < 0) false else it > currentSectionIndex }
+                if (insertHere) {
+                    val section = """
+                        $sectionName
+                        
+                        
+                    """.trimIndent()
+                    authorsBuilder.insert(tree.children[index].startOffset, section)
+                    mrgIdx = tree.children[index].startOffset + (section.length - 1)
+                    break
+                }
+            }
+        }
+        mrgIdx
+    } else {
+        val section = """
+            ## To Be Released
+            
+            $sectionName
+            
+            
+        """.trimIndent()
+        authorsBuilder.insert(tree.children[idx].startOffset, section)
+        tree.children[idx].startOffset + (section.length - 1)
+    }
+}
+
+val sections = listOf(
+    "### Features:",
+    "### Changes:",
+    "### Fixes:",
+    "### Merged PRs:",
+)

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>

doc/Emulated-plugins.md

@@ -0,0 +1,248 @@
+Emulated Vim Plugins
+--------------------
+
+IdeaVim extensions emulate plugins of the original Vim. In order to use
+IdeaVim extensions, you have to enable them via this command in your `~/.ideavimrc`:
+
+```
+Plug '<extension-github-reference>'
+```
+
+If you reuse your existing `.vimrc` file using `source ~/.vimrc`, IdeaVim can parse and enable plugins that are defined
+using [vim-plug](https://github.com/junegunn/vim-plug) or [vundle](https://github.com/VundleVim/Vundle.vim).
+No additional set commands in `~/.ideavimrc` are required.  
+If you'd like to disable some plugin that's enabled in `.vimrc`, you can use `set no<extension-name>`
+in `~/.ideavimrc`. E.g. `set nosurround`.
+
+Available extensions:
+
+## easymotion
+
+* Setup:
+    * Install [IdeaVim-EasyMotion](https://plugins.jetbrains.com/plugin/13360-ideavim-easymotion/)
+      and [AceJump](https://plugins.jetbrains.com/plugin/7086-acejump/) plugins.
+    * `Plug 'easymotion/vim-easymotion'`
+    * <details>
+      <summary>Alternative syntax</summary>
+      <code>Plug 'https://github.com/easymotion/vim-easymotion'</code>
+      <br/>
+      <code>Plug 'vim-easymotion'</code>
+      <br/>
+      <code>set easymotion</code>
+      </details>
+* Emulates [vim-easymotion](https://github.com/easymotion/vim-easymotion)
+* Commands: All commands with the mappings are supported. See the [full list of supported commands](https://github.com/AlexPl292/IdeaVim-EasyMotion#supported-commands).
+
+## NERDTree
+* Setup: `Plug 'preservim/nerdtree'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/preservim/nerdtree'</code>
+      <br/>
+      <code>Plug 'nerdtree'</code>
+      <br/>
+      <code>set NERDTree</code>
+      </details>
+* Emulates [NERDTree](https://github.com/preservim/nerdtree)
+* Commands: [[see here|NERDTree-support]]
+
+## surround
+
+* Setup: `Plug 'tpope/vim-surround'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/tpope/vim-surround'</code>
+      <br/>
+      <code>Plug 'vim-surround'</code>
+      <br/>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=1697'</code>
+      <br/>
+      <code>set surround</code>
+      </details>
+* Emulates [vim-surround](https://github.com/tpope/vim-surround)
+* Commands: `ys`, `cs`, `ds`, `S`
+
+## multiple-cursors
+
+* Setup: `Plug 'terryma/vim-multiple-cursors'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/terryma/vim-multiple-cursors'</code>
+      <br/>
+      <code>Plug 'vim-multiple-cursors'</code>
+      <br/>
+      <code>set multiple-cursors</code>
+      </details>
+* Emulates [vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors)
+* Commands: `<A-n>`, `<A-x>`, `<A-p>`, `g<A-n>`
+
+## commentary
+
+* Setup: `Plug 'tpope/vim-commentary'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/tpope/vim-commentary'</code>
+      <br/>
+      <code>Plug 'vim-commentary'</code>
+      <br/>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=3695'</code>
+      <br/>
+      <code>Plug 'tomtom/tcomment_vim'</code>
+      <br/>
+      <code>Plug 'tcomment_vim'</code>
+      <br/>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=1173'</code>
+      <br/>
+      <code>set commentary</code>
+      </details>
+* Emulates [commentary.vim](https://github.com/tpope/vim-commentary)
+* Commands: `gcc`, `gc + motion`, `v_gc`
+* By [Daniel Leong](https://github.com/dhleong)
+
+## ReplaceWithRegister
+
+* Setup: `Plug 'vim-scripts/ReplaceWithRegister'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/vim-scripts/ReplaceWithRegister'</code>
+      <br/>
+      <code>Plug 'ReplaceWithRegister'</code>
+      <br/>
+      <code>Plug 'https://github.com/inkarkat/vim-ReplaceWithRegister'</code>
+      <br/>
+      <code>Plug 'inkarkat/vim-ReplaceWithRegister'</code>
+      <br/>
+      <code>Plug 'vim-ReplaceWithRegister'</code>
+      <br/>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=2703'</code>
+      <br/>
+      <code>set ReplaceWithRegister</code>
+      </details>
+* Emulates [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister)
+* Commands: `gr`, `grr`
+* By [igrekster](https://github.com/igrekster)
+
+## argtextobj
+
+* Setup:
+    * `Plug 'vim-scripts/argtextobj.vim'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/vim-scripts/argtextobj.vim'</code>
+      <br/>
+      <code>Plug 'argtextobj.vim'</code>
+      <br/>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=2699'</code>
+      <br/>
+      <code>set argtextobj</code>
+      </details>
+    * By default, only the arguments inside parenthesis are considered. To extend the functionality
+      to other types of brackets, set `g:argtextobj_pairs` variable to a comma-separated
+      list of colon-separated pairs (same as VIM's `matchpairs` option), like
+      `let g:argtextobj_pairs="(:),{:},<:>"`. The order of pairs matters when
+      handling symbols that can also be operators: `func(x << 5, 20) >> 17`. To handle
+      this syntax parenthesis, must come before angle brackets in the list.
+* Emulates [argtextobj.vim](https://www.vim.org/scripts/script.php?script_id=2699)
+* Additional text objects: `aa`, `ia`
+
+## exchange
+
+* Setup: `Plug 'tommcdo/vim-exchange'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/tommcdo/vim-exchange'</code>
+      <br/>
+      <code>Plug 'vim-exchange'</code>
+      <br/>
+      <code>set exchange</code>
+      </details>
+* Emulates [vim-exchange](https://github.com/tommcdo/vim-exchange)
+* Commands: `cx`, `cxx`, `X`, `cxc`
+* By [fan-tom](https://github.com/fan-tom)
+
+## textobj-entire
+
+* Setup: `Plug 'kana/vim-textobj-entire'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/kana/vim-textobj-entire'</code>
+      <br/>
+      <code>Plug 'vim-textobj-entire'</code>
+      <br/>
+      <code>Plug 'https://www.vim.org/scripts/script.php?script_id=2610'</code>
+      <br/>
+      <code>set textobj-entire</code>
+      </details>
+* Emulates [vim-textobj-entire](https://github.com/kana/vim-textobj-entire)
+* Additional text objects: `ae`, `ie`
+* By [Alexandre Grison](https://github.com/agrison)
+
+## highlightedyank
+
+* Setup:
+    * `Plug 'machakann/vim-highlightedyank'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/machakann/vim-highlightedyank'</code>
+      <br/>
+      <code>Plug 'vim-highlightedyank'</code>
+      <br/>
+      <code>set highlightedyank</code>
+      </details>
+    * if you want to optimize highlight duration, assign a time in milliseconds:  
+      `let g:highlightedyank_highlight_duration = "1000"`  
+      A negative number makes the highlight persistent.  
+      `let g:highlightedyank_highlight_duration = "-1"`
+    * if you want to change background color of highlight you can provide the rgba of the color you want e.g.  
+      `let g:highlightedyank_highlight_color = "rgba(160, 160, 160, 155)"`
+* Emulates [vim-highlightedyank](https://github.com/machakann/vim-highlightedyank)
+* By [KostkaBrukowa](https://github.com/KostkaBrukowa)
+
+## vim-paragraph-motion
+
+* Setup: `Plug 'dbakker/vim-paragraph-motion'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/dbakker/vim-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'vim-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'https://github.com/vim-scripts/Improved-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'vim-scripts/Improved-paragraph-motion'</code>
+      <br/>
+      <code>Plug 'Improved-paragraph-motion'</code>
+      <br/>
+      <code>set vim-paragraph-motion</code>
+      </details>
+* Emulates [vim-paragraph-motion](https://github.com/dbakker/vim-paragraph-motion)
+
+## vim-indent-object
+
+* Setup: `Plug 'michaeljsmith/vim-indent-object'`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'https://github.com/michaeljsmith/vim-indent-object'</code>
+      <br/>
+      <code>Plug 'vim-indent-object'</code>
+      <br/>
+      <code>set textobj-indent</code>
+      </details>
+* Emulates [vim-indent-object](https://github.com/michaeljsmith/vim-indent-object)
+* Additional text objects: `ai`, `ii`, `aI`
+* By [Shrikant Sharat Kandula](https://github.com/sharat87)
+
+## matchit.vim
+
+* Setup: `packadd matchit`
+    * <details>
+      <summary>Alternative vim-plug / vundle syntax</summary>
+      <code>Plug 'vim-matchit'</code>
+      <br/>
+      <code>Plug 'chrisbra/matchit'</code>
+      <br/>
+      <code>set matchit</code>
+      </details>
+* Emulates [matchit.vim](https://github.com/chrisbra/matchit)
+* Currently works for HTML/XML and ruby
+* By [Martin Yzeiri](https://github.com/myzeiri)

doc/Home.md

@@ -0,0 +1,6 @@
+Welcome to the IdeaVim wiki!
+
+- List of emulated plugins: [[plugins|Emulated-plugins]]
+- Examples of `ideajoin` option (also known as "smart join"): [["ideajoin" examples|"ideajoin"-examples]]
+- List of "set" commands: [["set" commands|"set"-commands]]
+- Docs about "select" mode in vim: [[select mode|Select-mode]]

doc/NERDTree-support.md

@@ -0,0 +1,73 @@
+# NERDTree
+
+IdeaVim supports emulation of the NERDTree plugin. Update your `~/.ideavimrc` to turn it on:
+```vim
+Plug 'preservim/nerdtree`
+```
+or
+```vim
+set NERDTree
+```
+Use `set noNERDTree` to disable this extension.
+
+<details>
+<summary>Full list of aliases</summary>
+
+```vim
+set NERDTree
+Plug 'preservim/nerdtree`
+Plug 'https://github.com/preservim/nerdtree'
+Plug 'https://github.com/scrooloose/nerdtree'
+Plug 'scrooloose/nerdtree'
+Plug 'nerdtree'
+```
+</details>
+
+
+### Preview
+
+<details>
+<summary>Click to the the preview</summary>
+<img src="images/nerdtree.gif" alt="NERDTree example"/>
+</details>
+
+### Supported commands
+
+- `:NERDTree`
+- `:NERDTreeFocus`
+- `:NERDTreeToggle`
+- `:NERDTreeClose`
+- `:NERDTreeFind`
+- `:NERDTreeRefreshRoot`
+
+| Key     |  Description                                            |  Map Setting                   |
+|---------|---------------------------------------------------------|--------------------------------|
+| `o`     |  Open files, directories and bookmarks                  | `g:NERDTreeMapActivateNode`    |
+| `go`    |  Open selected file, but leave cursor in the NERDTree   | `g:NERDTreeMapPreview`         |
+| `t`     |  Open selected node/bookmark in a new tab               | `g:NERDTreeMapOpenInTab`       |
+| `T`     |  Same as 't' but keep the focus on the current tab      | `g:NERDTreeMapOpenInTabSilent` |
+| `i`     |  Open selected file in a split window                   | `g:NERDTreeMapOpenSplit`       |
+| `gi`    |  Same as i, but leave the cursor on the NERDTree        | `g:NERDTreeMapPreviewSplit`    |
+| `s`     |  Open selected file in a new vsplit                     | `g:NERDTreeMapOpenVSplit`      |
+| `gs`    |  Same as s, but leave the cursor on the NERDTree        | `g:NERDTreeMapPreviewVSplit`   |
+| `O`     |  Recursively open the selected directory                | `g:NERDTreeMapOpenRecursively` |
+| `x`     |  Close the current nodes parent                         | `g:NERDTreeMapCloseDir`        |
+| `X`     |  Recursively close all children of the current node     | `g:NERDTreeMapCloseChildren`   |
+| `P`     |  Jump to the root node                                  | `g:NERDTreeMapJumpRoot`        |
+| `p`     |  Jump to current nodes parent                           | `g:NERDTreeMapJumpParent`      | 
+| `K`     |  Jump up inside directories at the current tree depth   | `g:NERDTreeMapJumpFirstChild`  |
+| `J`     |  Jump down inside directories at the current tree depth | `g:NERDTreeMapJumpLastChild`   |
+| `<C-J>` |  Jump down to next sibling of the current directory     | `g:NERDTreeMapJumpNextSibling` |
+| `<C-K>` |  Jump up to previous sibling of the current directory   | `g:NERDTreeMapJumpPrevSibling` |
+| `r`     |  Recursively refresh the current directory              | `g:NERDTreeMapRefresh`         |
+| `R`     |  Recursively refresh the current root                   | `g:NERDTreeMapRefreshRoot`     |
+| `m`     |  Display the NERDTree menu                              | `g:NERDTreeMapMenu`            |
+| `q`     |  Close the NERDTree window                              | `g:NERDTreeMapQuit`            |
+| `A`     |  Zoom (maximize/minimize) the NERDTree window           | `g:NERDTreeMapToggleZoom`      |
+
+### Troubleshooting
+
+If you see the the file is opened automatically on every movement in the Project View (`j`, `k`, etc.)
+please make sure that you have "Open Files with Single click" disabled.
+
+<img src="images/disable-one-click.png" alt="Disable one click"/>

doc/Select-mode.md

@@ -0,0 +1,24 @@
+# FAQ
+
+## What is select mode?
+
+This mode is where the selection works the same as system selection. When you start typing, the text in the selected area is removed and replaced by the new characters that are being typed in.
+
+## Why is select mode enabled during refactoring?
+
+With the help of the select mode, you can immediately enter the variable name during refactoring. You can go to the beginning or the end of a variable using the arrow keys. If you need to make more complex changes, you can always go back to normal mode with `<ESC>`.
+
+## What if I want to use visual mode during refactoring?
+
+Select mode is controlled by the `keymodel`, `selectmode` and `idearefactormode` options. Set `idearefactormode` to `visual` to adjust this behavior.  
+`set idearefactormode=visual`
+
+## What if I don't want to change the mode during refactoring?
+
+`set idearefactormode=keep`
+
+# See Also
+
+* IdeaVim options: https://github.com/JetBrains/ideavim/blob/master/doc/set-commands.md  
+* Vim documentation about select mode: https://vimhelp.org/visual.txt.html#Select-mode  
+* Stackoverflow explanation: https://vi.stackexchange.com/questions/4891/what-is-the-select-mode-and-when-is-it-relevant-to-use-it

doc/emulated-plugins.md

@@ -1,84 +0,0 @@
-Emulated Vim Plugins
---------------------
-
-IdeaVim extensions emulate plugins of the original Vim. In order to use
-IdeaVim extensions, you have to enable them via this command in your `~/.ideavimrc`:
-
-    set <extension-name>
-
-Available extensions:
-
-##  easymotion
-
-* Setup:  
-    * Install [IdeaVim-EasyMotion](https://plugins.jetbrains.com/plugin/13360-ideavim-easymotion/)
-    and [AceJump](https://plugins.jetbrains.com/plugin/7086-acejump/) plugins.
-    * `set easymotion`
-* Emulates [vim-easymotion](https://github.com/easymotion/vim-easymotion)
-* Commands: All commands with the mappings are supported. See the [full list of supported commands](https://github.com/AlexPl292/IdeaVim-EasyMotion#supported-commands).
-
-##  surround
-
-* Setup: `set surround`
-* Emulates [vim-surround](https://github.com/tpope/vim-surround)
-* Commands: `ys`, `cs`, `ds`, `S`
-
-## multiple-cursors
-
-* Setup: `set multiple-cursors`
-* Emulates [vim-multiple-cursors](https://github.com/terryma/vim-multiple-cursors)
-* Commands: `<A-n>`, `<A-x>`, `<A-p>`, `g<A-n>`
-
-## commentary
-
-* Setup: `set commentary`
-* Emulates [commentary.vim](https://github.com/tpope/vim-commentary)
-* Commands: `gcc`, `gc + motion`, `v_gc`
-* By [Daniel Leong](https://github.com/dhleong)
-
-## ReplaceWithRegister
-
-* Setup: `set ReplaceWithRegister`
-* Emulates [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister)
-* Commands: `gr`, `grr`
-* By [igrekster](https://github.com/igrekster)
-
-## argtextobj
-
-* Setup:
-    * `set argtextobj`
-    * By default, only the arguments inside parenthesis are considered. To extend the functionality
-      to other types of brackets, set `g:argtextobj_pairs` variable to a comma-separated
-      list of colon-separated pairs (same as VIM's `matchpairs` option), like
-      `let g:argtextobj_pairs="(:),{:},<:>"`. The order of pairs matters when
-      handling symbols that can also be operators: `func(x << 5, 20) >> 17`. To handle
-      this syntax parenthesis, must come before angle brackets in the list.
-* Emulates [argtextobj.vim](https://www.vim.org/scripts/script.php?script_id=2699)
-* Additional text objects: `aa`, `ia`
-
-## exchange
-
-* Setup: `set exchange`
-* Emulates [vim-exchange](https://github.com/tommcdo/vim-exchange)
-* Commands: `cx`, `cxx`, `X`, `cxc`
-* By [fan-tom](https://github.com/fan-tom)
-
-## textobj-entire
-
-* Setup: `set textobj-entire`
-* Emulates [vim-textobj-entire](https://github.com/kana/vim-textobj-entire)
-* Additional text objects: `ae`, `ie`
-* By [Alexandre Grison](https://github.com/agrison)
-
-## highlightedyank
-
-* Setup: 
-    * `set highlightedyank`
-    * if you want to optimize highlight duration, assign a time in milliseconds:  
-       `let g:highlightedyank_highlight_duration = "1000"`  
-       A negative number makes the highlight persistent.  
-       `let g:highlightedyank_highlight_duration = "-1"`
-     * if you want to change background color of highlight you can provide the rgba of the color you want e.g.  
-       `let g:highlightedyank_highlight_color = "rgba(160, 160, 160, 155)"`
-* Emulates [vim-highlightedyank](https://github.com/machakann/vim-highlightedyank)
-* By [KostkaBrukowa](https://github.com/KostkaBrukowa)

doc/ideajoin-examples.md

@@ -1,14 +1,16 @@
 Some examples of join command with `ideajoin` option enabled.  
 Put `set ideajoin` to your `~/.ideavimrc` to enable this functionality.
 
-1) Automatic join concatenated lines:
+Now, you can press `J` (`shift+j`) on a line or a selected block of text to join the lines together.
+
+* Automatic join concatenated lines:
 
 ```
 "Hello" +                 ->       "Hello world"
 " world!"
 ```
 
-2) Nested if's:
+* Nested if's:
 
 ```
 if (a) {                  ->       if (a && b) {
@@ -18,7 +20,14 @@ if (a) {                  ->       if (a && b) {
 }
 ```
 
-3) Remove braces from one line for / if / while:
+* Comments:
+
+```
+// Hello                  ->       // Hello world
+// world
+```
+
+* Remove braces from one line for / if / while:
 
 ```
 if (fail) {               ->       if (fail) return;
@@ -26,7 +35,7 @@ if (fail) {               ->       if (fail) return;
 }
 ```
 
-4) Kotlin one line method:
+* Kotlin one line method:
 
 ```
 fun myNumber(): Int {     ->       fun myNumber(): Int = 42
@@ -34,18 +43,18 @@ fun myNumber(): Int {     ->       fun myNumber(): Int = 42
 }
 ```
 
-5) Join declaration and initialization:
+* Join declaration and initialization:
 
 ```
 int a;                    ->       int a = 5;
 a = 5;
 ```
 
-6) Chain call:
+* Chain call:
 
 ```
 sb.append("a");           ->       sb.append("a").append("b");
 sb.append("b");
 ```
 
-And other functions provided by the plugins.
+And other features provided by the plugins.

doc/set-commands.md

@@ -38,6 +38,7 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
                                       acts like startsel is enabled
     
     'matchpairs'     'mps'   pairs of characters that "%" can match
+    'maxmapdepth'    'mmd'   Maximum depth of mappings
     'more'           'more'  When on, listings pause when the whole screen is filled.
     'nrformats'      'nf'    number formats recognized for CTRL-A command
     'number'         'nu'    print the line number in front of each line
@@ -59,11 +60,8 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
                    ideaselection   when IDE sets a selection      - IdeaVim ONLY
                                    (examples: extend selection, wrap with while, etc.)
 
-                   Deprecated values:
-                   template        ~~please use `idearefactormode` option~~
-                                   when starting a template       - IdeaVim ONLY
-                   refactoring     ~~please use ideaselection~~
-                                   same as ideaselection          - IdeaVim ONLY
+    `startofline`    `sol`       When "on" some commands move the cursor to the first non-blank of the line.
+                                    When off the cursor is kept in the same column (if possible).
 
     'showmode'       'smd'       message on the status line to show current mode
     'showcmd'        'sc'        show (partial) command in the status bar
@@ -104,12 +102,6 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
     
                   If true, join command will be performed via IDE
                   See wiki/`ideajoin` examples
-
-    `ideastatusbar`  `ideastatusbar` Boolean (default true)
-                  DEPRECATED. Please use `ideastatusicon`
-    
-                  If false, IdeaVim icon won't be shown in the status bar.
-                  Works only from `~/.ideavimrc` after the IDE restart.
                   
     `ideastatusicon`  `ideastatusicon` String(default "enabled")
     
@@ -136,6 +128,13 @@ The following `:set` commands can appear in `~/.ideavimrc` or be set manually in
                         "<Tab>", "<Down>", "<Up>", "<Enter>", "<Left>", "<Right>",
                         "<C-Down>", "<C-Up>", "<PageUp>", "<PageDown>",
                         "<C-J>", "<C-Q>"
+                     
+    `ideavimsupport`  `ideavimsupport`  List of strings (default "dialog")
+                  
+                  Define the list of additional buffers where IdeaVim is enabled.
+                  
+                  - dialog - enable IdeaVim in dialogs
+                  - singleline - enable IdeaVim in single line editors (not suggested)
 
     ----------
     [1] - cursor keys, <End>, <Home>, <PageUp> and <PageDown>

doc/sethandler.md

@@ -0,0 +1,34 @@
+# Configuring conflicting keys via .ideavimrc
+
+IdeaVim allows defining handlers for the shortcuts that exist for both IDE and Vim (e.g. `<C-C>`).
+
+```vim
+" Use ctrl-c as an ide shortcut in normal and visual modes
+sethandler <C-C> n-v:ide i:vim
+```
+
+This option consist of an optional shortcut and a list of space separated list of handlers:
+`mode-list:handler mode-list:handler ...`  
+The `mode-list` is a dash separated list of modes that is similar to `guicursor` notation
+and defines the following modes:
+ - n - normal mode
+ - i - insert mode
+ - x - visual mode
+ - v - visual and select modes
+ - a - all modes
+
+The `handler` is an argument that may accept the following values:
+ - ide - use IDE handler
+ - vim - use Vim handler
+
+Examples:
+ - `n:ide` - use IDE handler in normal mode
+ - `i-v:vim` - use Vim handler in normal, visual, and select modes
+ - `a:ide` - use IDE handler in all modes
+
+By using `sethandler` you can define handlers:
+ - For a single shortcut: `sethandler <C-A> n:vim i-x:ide` - use Vim handler in normal mode and IDE handler in insert and visual modes,
+ - For all shortcuts: `sethandler n:vim i:ide` - use Vim handlers in normal mode and IDE handlers in insert mode.
+
+If the definition of the handler is missing for some mode, it defaults to `vim`:
+`sethandler <C-X> i:ide` - use IDE handler in insert mode and Vim handler in all other modes.

gradle.properties

@@ -1,13 +1,19 @@
 # suppress inspection "UnusedProperty" for whole file
 
-ideaVersion=LATEST-EAP-SNAPSHOT
+ideaVersion=2022.2.2
 downloadIdeaSources=true
 instrumentPluginCode=true
-version=SNAPSHOT
-javaVersion=1.8
-kotlinVersion=1.3.71
-publishUsername=username
+version=chylex-13
+javaVersion=17
+remoteRobotVersion=0.11.15
+antlrVersion=4.10.1
+
+# Please don't forget to update kotlin version in buildscript section
+kotlinVersion=1.6.21
 publishToken=token
 publishChannels=eap
 
 slackUrl=
+
+# Gradle settings
+org.gradle.jvmargs='-Dfile.encoding=UTF-8'

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       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/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+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"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# 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
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,7 +71,7 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

qodana.yaml

@@ -0,0 +1,25 @@
+version: 1.0
+profile:
+  name: Qodana
+include:
+  - name: CheckDependencyLicenses
+exclude:
+  - name: MoveVariableDeclarationIntoWhen
+  - name: PluginXmlValidity
+  - name: RedundantThrows
+  - name: SuperTearDownInFinally
+  - name: UnusedReturnValue
+  - name: All
+    paths:
+      - build.gradle.kts
+      - gradle/wrapper/gradle-wrapper.properties
+      - src/main/resources/icons/youtrack.svg
+      - src/main/java/com/maddyhome/idea/vim/helper/SearchHelper.java
+      - src/main/java/com/maddyhome/idea/vim/regexp/RegExp.kt
+      - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/JavaText.kt
+      - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/LoremText.kt
+      - src/test/java/org/jetbrains/plugins/ideavim/propertybased/samples/SimpleText.kt
+      - src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated/VimscriptListener.java
+      - src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated/VimscriptLexer.java
+      - src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated/VimscriptParser.java
+      - src/main/java/com/maddyhome/idea/vim/vimscript/parser/generated/VimscriptVisitor.java

resources/META-INF/includes/ApplicationServices.xml

@@ -1,23 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.MotionGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.ChangeGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.CommandGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.MarkGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.RegisterGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.FileGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.SearchGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.ProcessGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.MacroGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.DigraphGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.HistoryGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.KeyGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.WindowGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.EditorGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.visual.VisualMotionGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.copy.YankGroup"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.copy.PutGroup"/>
-
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.group.NotificationService"/>
-  </extensions>
-</idea-plugin>

resources/META-INF/includes/VimExCommands.xml

@@ -1,68 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="IdeaVIM">
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ActionListHandler" names="actionlist"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.AsciiHandler" names="as[cii]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CmdFilterHandler" names="!"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CmdHandler" names="com[mand]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CmdClearHandler" names="comc[lear]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.CopyTextHandler" names="co[py],t"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DelCmdHandler" names="delc[ommand]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DeleteLinesHandler" names="d[elete]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DeleteMarksHandler" names="delm[arks]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DigraphHandler" names="dig[raphs]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.DumpLineHandler" names="dump[line]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.EditFileHandler" names="bro[wse],e[dit]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ActionHandler" names="action"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.EchoHandler" names="ec[ho]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ExitHandler" names="qa[ll],quita[ll],wqa[ll],xa[ll]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.FileHandler" names="f[ile]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.FindClassHandler" names="cla[ss]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.FindFileHandler" names="fin[d]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.FindSymbolHandler" names="sym[bol]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.GotoCharacterHandler" names="go[to]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.HelpHandler" names="h[elp]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.HistoryHandler" names="his[tory]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.JoinLinesHandler" names="j[oin]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.JumpsHandler" names="ju[mps]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.LetHandler" names="let"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MapHandler"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MarkHandler" names="ma[rk],k"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MarksHandler" names="marks"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.MoveTextHandler" names="m[ove]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.NextFileHandler" names="n[ext]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.NoHLSearchHandler" names="noh[lsearch]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.OnlyHandler" names="on[ly]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PreviousFileHandler" names="N[ext],prev[ious]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PromptFindHandler" names="pro[mptfind]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PromptReplaceHandler" names="promptr[epl]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PutLinesHandler" names="pu[t]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.QuitHandler" names="q[uit],clo[se],hid[e]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.RedoHandler" names="red[o]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.RegistersHandler" names="di[splay],reg[isters]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.RepeatHandler" names="@"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SelectFileHandler" names="argu[ment]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SelectFirstFileHandler" names="fir[st],rew[ind]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SelectLastFileHandler" names="la[st]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SetHandler" names="se[t]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ShiftLeftHandler"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ShiftRightHandler"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SourceHandler" names="so[urce]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SortHandler" names="sor[t]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SplitHandler" names="vs[plit],sp[lit]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.SubstituteHandler" names="s[ubstitute],&amp;,~"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.UndoHandler" names="u[ndo]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteAllHandler" names="wa[ll]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteHandler" names="w[rite]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteNextFileHandler" names="wn[ext]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WritePreviousFileHandler" names="wN[ext],wp[revious]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.WriteQuitHandler" names="wq,exi[t],x[it]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.YankLinesHandler" names="y[ank]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.ShellHandler" names="sh[ell]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.NextTabHandler" names="tabn[ext]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.PreviousTabHandler" names="tabp[revious],tabN[ext]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.TabOnlyHandler" names="tabo[nly]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.TabCloseHandler" names="tabc[lose]"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.BufferListHandler" names="buffers,ls,files"/>
-    <vimExCommand implementation="com.maddyhome.idea.vim.ex.handler.BufferHandler" names="b[uffer]"/>
-  </extensions>
-</idea-plugin>

resources/META-INF/includes/VimExtensions.xml

@@ -1,12 +0,0 @@
-<idea-plugin>
-  <extensions defaultExtensionNs="IdeaVIM">
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.surround.VimSurroundExtension"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.multiplecursors.VimMultipleCursorsExtension"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.commentary.CommentaryExtension"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.textobjentire.VimTextObjEntireExtension"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.argtextobj.VimArgTextObjExtension"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.replacewithregister.ReplaceWithRegister"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.exchange.VimExchangeExtension"/>
-    <vimExtension implementation="com.maddyhome.idea.vim.extension.highlightedyank.VimHighlightedYank"/>
-  </extensions>
-</idea-plugin>

resources/META-INF/plugin.xml

@@ -1,103 +0,0 @@
-<idea-plugin url="https://plugins.jetbrains.com/plugin/164" xmlns:xi="http://www.w3.org/2001/XInclude">
-  <name>IdeaVim</name>
-  <id>IdeaVIM</id>
-  <change-notes><![CDATA[
-      <ul>
-        <li>Support of `virtualedit=onemore`</li>
-        <li>A lot of fixes for scrolling</li>
-      </ul>
-      <p>See also the complete <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">changelog</a>.</p>
-    ]]></change-notes>
-  <description><![CDATA[
-      <p>Vim emulation plug-in for IDEs based on the IntelliJ platform.</p>
-      <p>IdeaVim supports many Vim features including normal/insert/visual modes, motion keys, deletion/changing, marks, registers, some Ex commands, Vim regexps, configuration via ~/.ideavimrc, macros, window commands, etc.</p>
-      <p>See also:</p>
-      <ul>
-        <li><a href="https://github.com/JetBrains/ideavim">GitHub repository</a>: documentation and contributing</li>
-        <li><a href="https://youtrack.jetbrains.com/issues/VIM">Issue tracker</a>: feature requests and bug reports</li>
-      </ul>
-    ]]></description>
-  <version>SNAPSHOT</version>
-  <vendor>JetBrains</vendor>
-
-  <!-- Please search for "[VERSION UPDATE]" in project in case you update the since-build version -->
-  <!-- Check for [Version Update] tag in YouTrack as well -->
-  <idea-version since-build="201.5985.32"/>
-
-  <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform -->
-  <depends>com.intellij.modules.lang</depends>
-  <resource-bundle xmlns="">messages</resource-bundle>
-
-  <application-components>
-    <component>
-      <implementation-class>com.maddyhome.idea.vim.DynamicLoaderStopper</implementation-class>
-    </component>
-  </application-components>
-
-  <extensionPoints>
-    <extensionPoint name="vimExtension" interface="com.maddyhome.idea.vim.extension.VimExtension" dynamic="true"/>
-
-    <!--    For internal use only -->
-    <extensionPoint name="vimExCommand" beanClass="com.maddyhome.idea.vim.ex.ExBeanClass" dynamic="true">
-      <with attribute="implementation" implements="com.maddyhome.idea.vim.ex.CommandHandler"/>
-    </extensionPoint>
-    <!--    For internal use only -->
-    <extensionPoint name="vimAction" beanClass="com.maddyhome.idea.vim.handler.ActionBeanClass" dynamic="true">
-      <with attribute="implementation" implements="com.maddyhome.idea.vim.handler.EditorActionHandlerBase"/>
-    </extensionPoint>
-  </extensionPoints>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationConfigurable groupId="editor" instance="com.maddyhome.idea.vim.ui.VimEmulationConfigurable"/>
-    <projectService serviceImplementation="com.maddyhome.idea.vim.group.NotificationService"/>
-    <statusBarWidgetFactory implementation="com.maddyhome.idea.vim.ui.StatusBarIconFactory"/>
-    <statusBarWidgetFactory implementation="com.maddyhome.idea.vim.ui.ShowCmdStatusBarWidgetFactory" order="first"/>
-
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.config.VimLocalConfig"/>
-    <applicationService serviceImplementation="com.maddyhome.idea.vim.VimPlugin"/>
-
-    <!-- Initialise as early as possible so that we're ready to edit quickly. This is especially important for Rider,
-         which (at least for 2020.1) has some long running activities that block other startup extensions. None of the
-         core platform activities have IDs, so we can't use "before ID". We have to use "first" -->
-    <postStartupActivity implementation="com.maddyhome.idea.vim.PluginStartup" order="first"/>
-
-    <editorFloatingToolbarProvider implementation="com.maddyhome.idea.vim.ui.ReloadFloatingToolbar"/>
-  </extensions>
-
-  <xi:include href="/META-INF/includes/ApplicationServices.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/includes/VimActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/includes/VimExCommands.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/includes/VimExtensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/includes/VimListeners.xml" xpointer="xpointer(/idea-plugin/*)"/>
-
-  <actions>
-    <action id="VimPluginToggle" class="com.maddyhome.idea.vim.action.VimPluginToggleAction">
-      <add-to-group group-id="ToolsMenu" anchor="last"/>
-    </action>
-
-    <!-- Internal -->
-    <action id="VimInternalAddBlockInlays" class="com.maddyhome.idea.vim.action.internal.AddBlockInlaysAction" text="Add Test Block Inlays | IdeaVim Internal" internal="true"/>
-    <action id="VimInternalAddInlineInlays" class="com.maddyhome.idea.vim.action.internal.AddInlineInlaysAction" text="Add Test Inline Inlays | IdeaVim Internal" internal="true"/>
-
-    <action id="VimShortcutKeyAction" class="com.maddyhome.idea.vim.action.VimShortcutKeyAction"/>
-    <action id="VimActions" class="com.maddyhome.idea.vim.ui.VimActions"/>
-
-    <!--    [Version Update] 202+ use-shortcut-of="ExternalSystem.ProjectRefreshAction" -->
-    <group id="IdeaVim.ReloadVimRc.group" class="com.maddyhome.idea.vim.ui.ReloadFloatingToolbarActionGroup">
-      <action id="IdeaVim.ReloadVimRc.reload" class="com.maddyhome.idea.vim.ui.ReloadVimRc">
-        <keyboard-shortcut first-keystroke="control shift O" keymap="$default"/>
-        <keyboard-shortcut first-keystroke="control shift O" keymap="Eclipse" remove="true"/>
-        <keyboard-shortcut first-keystroke="control shift O" keymap="NetBeans 6.5" remove="true"/>
-        <keyboard-shortcut first-keystroke="control shift O" keymap="Visual Studio" remove="true"/>
-        <keyboard-shortcut first-keystroke="meta shift O" keymap="Mac OS X" replace-all="true"/>
-        <keyboard-shortcut first-keystroke="meta shift O" keymap="Eclipse (Mac OS X)" replace-all="true" remove="true"/>
-        <keyboard-shortcut first-keystroke="meta shift O" keymap="Xcode" replace-all="true" remove="true"/>
-        <keyboard-shortcut first-keystroke="meta shift I" keymap="Mac OS X 10.5+" replace-all="true"/>
-      </action>
-    </group>
-
-    <action id="VimFindActionIdAction"
-            class="com.maddyhome.idea.vim.listener.FindActionIdAction" text="IdeaVim: Track Action Ids"
-            description="Starts tracking ids of executed actions"/>
-  </actions>
-</idea-plugin>

resources/icons/github.svg

@@ -1,4 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="16" height="16">
-  <path
-      d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/>
-</svg>

resources/messages.properties

@@ -1,79 +0,0 @@
-#
-# IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
-# Copyright (C) 2003-2020 The IdeaVim authors
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-
-notexcmd=Not an editor command: {0}
-intbadcmd=Internal error - invalid command: {0}
-e_backslash=E10: \\ should be followed by /, ? or &
-e_badrange=Unexpected character ''{0}'' in range
-e_norange=No range allowed
-e_rangereq=Range required
-e_argreq=Argument required
-e_argforb=Argument forbidden
-e_noprev=E34: No previous command
-e_nopresub=E33: No previous substitute regular expression
-E191=E191: Argument must be a letter or forward/backward quote
-e_backrange=Backwards range given
-E146=E146: Regular expressions can''t be delimited by letters
-e_zerocount=Zero count
-e_trailing=Trailing characters
-e_invcmd=Invalid command
-e_null=Null argument
-E50=E50: Too many \\z(
-E51=E51: Too many {0}(
-E52=E52: Unmatched \\z(
-E53=E53: Unmatched {0}%(
-E54=E54: Unmatched {0}(
-E55=E55: Unmatched {0})
-E56=E56: {0}* operand could be empty
-E57=E57: {0}+ operand could be empty
-E58=E58: {0}{ operand could be empty
-E59=E59: invalid character after {0}@
-E60=E60: Too many complex {0}{...}s
-E61=E61: Nested {0}*
-E62=E62: Nested {0}{1}
-E63=E63: invalid use of \\_
-E64=E64: {0}{1} follows nothing
-E65=E65: Illegal back reference
-E66=E66: \\z( not allowed here
-E67=E67: \\z1 et al. not allowed here
-E68=E68: Invalid character after \\z
-E69=E69: Missing ] after {0}%[
-E70=E70: Empty {0}%[]
-E71=E71: Invalid character after {0}%
-e_invrange=E16: Invalid range
-e_toomsbra=E76: Too many [
-e_internal=Internal error
-synerror=Syntax error in {0}{...}
-E363=E363: pattern caused out-of-stack error
-e_re_corr=E44: Currupted regexp program
-e_re_damg=E43: Damaged match string
-E369=E369: invalid item in {0}%[]
-E384=E384: search hit TOP without match for: {0}
-E385=E385: search hit BOTTOM without match for: {0}
-e_patnotf2=Pattern not found: {0}
-unkopt=Unknown option: {0}
-e_invarg=Invalid argument: {0}
-E475=E475: Invalid argument: {0}
-E774=E774: 'operatorfunc' is empty
-
-action.VimPluginToggle.text=Vim Emulator
-description.VimPluginToggle.description=Toggle the vim plugin On/off
-
-action.VimShortcutKeyAction.text=Shortcuts
-
-action.VimActions.text=Vim Actions

settings.gradle

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

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

@@ -1,216 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2020 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action
-
-import com.google.common.collect.ImmutableSet
-import com.intellij.codeInsight.lookup.LookupManager
-import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.actionSystem.AnAction
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.EmptyAction
-import com.intellij.openapi.actionSystem.PlatformDataKeys
-import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.progress.ProcessCanceledException
-import com.intellij.openapi.project.DumbAware
-import com.intellij.openapi.util.Key
-import com.intellij.ui.KeyStrokeAdapter
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.helper.EditorDataContext
-import com.maddyhome.idea.vim.helper.EditorHelper
-import com.maddyhome.idea.vim.helper.StringHelper
-import com.maddyhome.idea.vim.helper.inInsertMode
-import com.maddyhome.idea.vim.helper.inNormalMode
-import com.maddyhome.idea.vim.helper.isIdeaVimDisabledHere
-import com.maddyhome.idea.vim.helper.isPrimaryEditor
-import com.maddyhome.idea.vim.key.ShortcutOwner
-import com.maddyhome.idea.vim.listener.IdeaSpecifics.aceJumpActive
-import com.maddyhome.idea.vim.option.OptionsManager
-import java.awt.event.InputEvent
-import java.awt.event.KeyEvent
-import javax.swing.KeyStroke
-
-/**
- * Handles Vim keys that are treated as action shortcuts by the IDE.
- *
- *
- * These keys are not passed to [com.maddyhome.idea.vim.VimTypedActionHandler] and should be handled by actions.
- */
-class VimShortcutKeyAction : AnAction(), DumbAware {
-  override fun actionPerformed(e: AnActionEvent) {
-    val editor = getEditor(e)
-    val keyStroke = getKeyStroke(e)
-    if (editor != null && keyStroke != null) {
-      val owner = VimPlugin.getKey().savedShortcutConflicts[keyStroke]
-      if (owner == ShortcutOwner.UNDEFINED) {
-        VimPlugin.getNotifications(editor.project).notifyAboutShortcutConflict(keyStroke)
-      }
-      // Should we use HelperKt.getTopLevelEditor(editor) here, as we did in former EditorKeyHandler?
-      try {
-        KeyHandler.getInstance().handleKey(editor, keyStroke, EditorDataContext(editor))
-      } catch (ignored: ProcessCanceledException) {
-        // Control-flow exceptions (like ProcessCanceledException) should never be logged
-        // See {@link com.intellij.openapi.diagnostic.Logger.checkException}
-      } catch (throwable: Throwable) {
-        ourLogger.error(throwable)
-      }
-    }
-  }
-
-  override fun update(e: AnActionEvent) {
-    e.presentation.isEnabled = isEnabled(e)
-  }
-
-  private fun isEnabled(e: AnActionEvent): Boolean {
-    if (!VimPlugin.isEnabled()) return false
-    val editor = getEditor(e)
-    val keyStroke = getKeyStroke(e)
-    if (editor != null && keyStroke != null) {
-      if (editor.isIdeaVimDisabledHere) return false
-      // Workaround for smart step into
-      @Suppress("DEPRECATION")
-      val SMART_STEP_INPLACE_DATA = Key.findKeyByName("SMART_STEP_INPLACE_DATA")
-      if (SMART_STEP_INPLACE_DATA != null && editor.getUserData(SMART_STEP_INPLACE_DATA) != null) return false
-
-      if (aceJumpActive()) return false
-
-      val keyCode = keyStroke.keyCode
-
-      if (LookupManager.getActiveLookup(editor) != null && !LookupKeys.isEnabledForLookup(keyStroke)) return false
-
-      if (keyCode == KeyEvent.VK_ESCAPE) return isEnabledForEscape(editor)
-
-      if (editor.inInsertMode) { // XXX: <Tab> won't be recorded in macros
-        if (keyCode == KeyEvent.VK_TAB) {
-          VimPlugin.getChange().tabAction = true
-          return false
-        }
-        // Debug watch, Python console, etc.
-        if (keyStroke in NON_FILE_EDITOR_KEYS && !EditorHelper.isFileEditor(editor)) return false
-      }
-
-      if (keyStroke in VIM_ONLY_EDITOR_KEYS) return true
-
-      val savedShortcutConflicts = VimPlugin.getKey().savedShortcutConflicts
-      return when (savedShortcutConflicts[keyStroke]) {
-        ShortcutOwner.VIM -> true
-        ShortcutOwner.IDE -> !isShortcutConflict(keyStroke)
-        else -> {
-          if (isShortcutConflict(keyStroke)) {
-            savedShortcutConflicts[keyStroke] = ShortcutOwner.UNDEFINED
-          }
-          true
-        }
-      }
-    }
-    return false
-  }
-
-  private fun isEnabledForEscape(editor: Editor): Boolean {
-    return editor.isPrimaryEditor()
-      || EditorHelper.isFileEditor(editor) && !editor.inNormalMode
-      || OptionsManager.dialogescape.value == "on" && !editor.inNormalMode
-  }
-
-  private fun isShortcutConflict(keyStroke: KeyStroke): Boolean {
-    return VimPlugin.getKey().getKeymapConflicts(keyStroke).isNotEmpty()
-  }
-
-  /**
-   * getDefaultKeyStroke is needed for NEO layout keyboard VIM-987
-   * but we should cache the value because on the second call (isEnabled -> actionPerformed)
-   * the event is already consumed
-   */
-  private var keyStrokeCache: Pair<KeyEvent?, KeyStroke?> = null to null
-
-  private fun getKeyStroke(e: AnActionEvent): KeyStroke? {
-    val inputEvent = e.inputEvent
-    if (inputEvent is KeyEvent) {
-      val defaultKeyStroke = KeyStrokeAdapter.getDefaultKeyStroke(inputEvent)
-      val strokeCache = keyStrokeCache
-      if (defaultKeyStroke != null) {
-        keyStrokeCache = inputEvent to defaultKeyStroke
-        return defaultKeyStroke
-      } else if (strokeCache.first === inputEvent) {
-        keyStrokeCache = null to null
-        return strokeCache.second
-      }
-      return KeyStroke.getKeyStrokeForEvent(inputEvent)
-    }
-    return null
-  }
-
-  private fun getEditor(e: AnActionEvent): Editor? = e.getData(PlatformDataKeys.EDITOR)
-
-  /**
-   * Every time the key pressed with an active lookup, there is a decision:
-   *   should this key be processed by IdeaVim, or by IDE. For example, dot and enter should be processed by IDE, but
-   *   <C-W> by IdeaVim.
-   *
-   * The list of keys that should be processed by IDE is stored in [OptionsManager.lookupKeys]. So, we should search
-   *   if the pressed key is presented in this list. The caches are used to speedup the process.
-   */
-  private object LookupKeys {
-    private var parsedLookupKeys: Set<KeyStroke> = parseLookupKeys()
-
-    init {
-      OptionsManager.lookupKeys.addOptionChangeListener { _, _ ->
-        parsedLookupKeys = parseLookupKeys()
-      }
-    }
-
-    fun isEnabledForLookup(keyStroke: KeyStroke): Boolean = keyStroke !in parsedLookupKeys
-
-    private fun parseLookupKeys() = OptionsManager.lookupKeys.values()
-      .map { StringHelper.parseKeys(it) }.filter { it.isNotEmpty() }.map { it.first() }.toSet()
-  }
-
-  companion object {
-    @JvmField
-    val VIM_ONLY_EDITOR_KEYS: Set<KeyStroke> = ImmutableSet.builder<KeyStroke>().addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0)).addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0)).addAll(getKeyStrokes(KeyEvent.VK_BACK_SPACE, 0, InputEvent.CTRL_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_INSERT, 0)).addAll(getKeyStrokes(KeyEvent.VK_DELETE, 0, InputEvent.CTRL_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_UP, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK)).addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_LEFT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_RIGHT, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_HOME, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_END, 0, InputEvent.CTRL_DOWN_MASK, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_PAGE_UP, 0, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK))
-      .addAll(getKeyStrokes(KeyEvent.VK_PAGE_DOWN, 0, InputEvent.SHIFT_DOWN_MASK, InputEvent.CTRL_DOWN_MASK or InputEvent.SHIFT_DOWN_MASK)).build()
-
-    private const val ACTION_ID = "VimShortcutKeyAction"
-
-    private val NON_FILE_EDITOR_KEYS: Set<KeyStroke> = ImmutableSet.builder<KeyStroke>()
-      .addAll(getKeyStrokes(KeyEvent.VK_ENTER, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_ESCAPE, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_TAB, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_UP, 0))
-      .addAll(getKeyStrokes(KeyEvent.VK_DOWN, 0))
-      .build()
-
-    private val ourLogger = Logger.getInstance(VimShortcutKeyAction::class.java.name)
-
-    @JvmStatic
-    val instance: AnAction by lazy {
-      EmptyAction.wrap(ActionManager.getInstance().getAction(ACTION_ID))
-    }
-
-    private fun getKeyStrokes(keyCode: Int, vararg modifiers: Int) = modifiers.map { KeyStroke.getKeyStroke(keyCode, it) }
-  }
-}

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

@@ -1,66 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2020 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.Command
-import com.maddyhome.idea.vim.command.SelectionType
-import com.maddyhome.idea.vim.group.MotionGroup
-import com.maddyhome.idea.vim.handler.VimActionHandler
-import com.maddyhome.idea.vim.helper.MessageHelper
-import com.maddyhome.idea.vim.helper.commandState
-
-/**
- * @author vlan
- */
-class OperatorAction : VimActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.OTHER_SELF_SYNCHRONIZED
-
-  override val argumentType: Argument.Type = Argument.Type.MOTION
-
-  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    val operatorFunction = VimPlugin.getKey().operatorFunction
-    if (operatorFunction != null) {
-      val argument = cmd.argument
-      if (argument != null) {
-        if (!editor.commandState.isDotRepeatInProgress) {
-          VimRepeater.Extension.argumentCaptured = argument
-        }
-        val saveRepeatHandler = VimRepeater.repeatHandler
-        val motion = argument.motion
-        val range = MotionGroup
-          .getMotionRange(editor, editor.caretModel.primaryCaret, context, cmd.count, cmd.rawCount, argument)
-        if (range != null) {
-          VimPlugin.getMark().setChangeMarks(editor, range)
-          val selectionType = if (motion.isLinewiseMotion()) SelectionType.LINE_WISE else SelectionType.CHARACTER_WISE
-          KeyHandler.getInstance().reset(editor)
-          val result = operatorFunction.apply(editor, context, selectionType)
-          VimRepeater.repeatHandler = saveRepeatHandler
-          return result
-        }
-      }
-      return false
-    }
-    VimPlugin.showMessage(MessageHelper.message("E774"))
-    return false
-  }
-}

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

@@ -1,141 +0,0 @@
-/*
- * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
- * Copyright (C) 2003-2020 The IdeaVim authors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-package com.maddyhome.idea.vim.action.change
-
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.command.CommandProcessor
-import com.intellij.openapi.editor.Editor
-import com.maddyhome.idea.vim.KeyHandler
-import com.maddyhome.idea.vim.VimPlugin
-import com.maddyhome.idea.vim.command.Argument
-import com.maddyhome.idea.vim.command.Command
-import com.maddyhome.idea.vim.extension.VimExtensionHandler
-import com.maddyhome.idea.vim.handler.VimActionHandler
-import com.maddyhome.idea.vim.helper.commandState
-import javax.swing.KeyStroke
-
-class RepeatChangeAction : VimActionHandler.SingleExecution() {
-  override val type: Command.Type = Command.Type.OTHER_WRITABLE
-
-  override fun execute(editor: Editor, context: DataContext, cmd: Command): Boolean {
-    val state = editor.commandState
-    val lastCommand = VimRepeater.lastChangeCommand
-
-    if (lastCommand == null && VimRepeater.Extension.lastExtensionHandler == null) return false
-
-    // Save state
-    val save = state.executingCommand
-    val lastFTCmd = VimPlugin.getMotion().lastFTCmd
-    val lastFTChar = VimPlugin.getMotion().lastFTChar
-    val reg = VimPlugin.getRegister().currentRegister
-    val lastHandler = VimRepeater.Extension.lastExtensionHandler
-    val repeatHandler = VimRepeater.repeatHandler
-
-    state.isDotRepeatInProgress = true
-    VimPlugin.getRegister().selectRegister(VimRepeater.lastChangeRegister)
-
-    try {
-      if (repeatHandler && lastHandler != null) {
-        val processor = CommandProcessor.getInstance()
-        processor.executeCommand(editor.project, { lastHandler.execute(editor, context) }, "Vim " + lastHandler.javaClass.simpleName, null)
-      } else if (!repeatHandler && lastCommand != null) {
-        if (cmd.rawCount > 0) {
-          lastCommand.count = cmd.count
-          val arg = lastCommand.argument
-          if (arg != null) {
-            val mot = arg.motion
-            mot.count = 0
-          }
-        }
-        state.setExecutingCommand(lastCommand)
-
-        KeyHandler.executeVimAction(editor, lastCommand.action, context)
-
-        VimRepeater.saveLastChange(lastCommand)
-      }
-    } catch (ignored: Exception) {
-    }
-
-    state.isDotRepeatInProgress = false
-
-    // Restore state
-    if (save != null) state.setExecutingCommand(save)
-    VimPlugin.getMotion().setLastFTCmd(lastFTCmd, lastFTChar)
-    if (lastHandler != null) VimRepeater.Extension.lastExtensionHandler = lastHandler
-    VimRepeater.repeatHandler = repeatHandler
-    VimRepeater.Extension.reset()
-    VimPlugin.getRegister().selectRegister(reg)
-    return true
-  }
-}
-
-object VimRepeater {
-  var repeatHandler = false
-
-  var lastChangeCommand: Command? = null
-    private set
-  var lastChangeRegister = VimPlugin.getRegister().defaultRegister
-    private set
-
-  fun saveLastChange(command: Command) {
-    lastChangeCommand = command
-    lastChangeRegister = VimPlugin.getRegister().currentRegister
-  }
-
-  object Extension {
-    var lastExtensionHandler: VimExtensionHandler? = null
-    var argumentCaptured: Argument? = null
-
-    private val keyStrokes = mutableListOf<KeyStroke>()
-    private val strings = mutableListOf<String>()
-
-    private var keystrokePointer = 0
-    private var stringPointer = 0
-
-    fun addKeystroke(key: KeyStroke) = keyStrokes.add(key)
-    fun addString(key: String) = strings.add(key)
-
-    fun consumeKeystroke(): KeyStroke? {
-      if (keystrokePointer in keyStrokes.indices) {
-        keystrokePointer += 1
-        return keyStrokes[keystrokePointer - 1]
-      }
-      return null
-    }
-
-    fun consumeString(): String? {
-      if (stringPointer in strings.indices) {
-        stringPointer += 1
-        return strings[stringPointer - 1]
-      }
-      return null
-    }
-
-    fun reset() {
-      keystrokePointer = 0
-      stringPointer = 0
-    }
-
-    fun clean() {
-      keyStrokes.clear()
-      strings.clear()
-      keystrokePointer = 0
-      stringPointer = 0
-    }
-  }
-}