Update plugin verifier versions

to provide compatibility with Code With Me plugin

.teamcity/_Self/Project.kt

@@ -18,6 +18,7 @@ import _Self.buildTypes.TestsForIntelliJEAP
 import _Self.vcsRoots.Branch_181
 import _Self.vcsRoots.Branch_183
 import _Self.vcsRoots.Branch_191_193
+import _Self.vcsRoots.Branch_201
 import _Self.vcsRoots.GitHubPullRequest
 import jetbrains.buildServer.configs.kotlin.v2019_2.Project
 
@@ -26,15 +27,15 @@ object Project : Project({
 
   vcsRoot(Branch_183)
   vcsRoot(Branch_181)
-  vcsRoot(GitHubPullRequest)
   vcsRoot(Branch_191_193)
+  vcsRoot(Branch_201)
+  vcsRoot(GitHubPullRequest)
 
   buildType(GitHubPullRequests)
 
   buildType(Release)
   buildType(ReleaseEap)
 
-  buildType(TestsForIntelliJ20201)
   buildType(TestsForIntelliJ20202)
   buildType(TestsForIntelliJ20203)
   buildType(TestsForIntelliJEAP)
@@ -42,6 +43,7 @@ object Project : Project({
   buildType(Nvim)
   buildType(PluginVerifier)
 
+  buildType(TestsForIntelliJ20201)
   buildType(TestsForIntelliJ20191)
   buildType(TestsForIntelliJ20181)
   buildType(TestsForIntelliJ20192)

.teamcity/_Self/buildTypes/ActiveTests.kt

@@ -43,4 +43,3 @@ sealed class ActiveTests(buildName: String, ijVersion: String) : BuildType({
 object TestsForIntelliJEAP : ActiveTests("Tests for IntelliJ Latest EAP", "LATEST-EAP-SNAPSHOT")
 object TestsForIntelliJ20203 : ActiveTests("Tests for IntelliJ 2020.3", "2020.3")
 object TestsForIntelliJ20202 : ActiveTests("Tests for IntelliJ 2020.2", "2020.2")
-object TestsForIntelliJ20201 : ActiveTests("Tests for IntelliJ 2020.1", "2020.1")

.teamcity/_Self/buildTypes/Release.kt

@@ -10,7 +10,7 @@ object Release : BuildType({
   description = "Build and publish IdeaVim plugin"
 
   artifactRules = "build/distributions/*"
-  buildNumberPattern = "0.61"
+  buildNumberPattern = "0.63"
 
   params {
     param("env.ORG_GRADLE_PROJECT_ideaVersion", "2020.2")

.teamcity/_Self/buildTypes/ReleaseEap.kt

@@ -13,7 +13,7 @@ object ReleaseEap : BuildType({
   description = "Build and publish EAP of IdeaVim plugin"
 
   artifactRules = "build/distributions/*"
-  buildNumberPattern = "0.61.%build.counter%"
+  buildNumberPattern = "0.63.%build.counter%"
 
   params {
     param("env.ORG_GRADLE_PROJECT_ideaVersion", "2020.2")

.teamcity/_Self/buildTypes/TestsForIntelliJ_201.kt

@@ -0,0 +1,46 @@
+@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.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.ON_SERVER
+  }
+
+  steps {
+    gradle {
+      tasks = "clean test"
+      buildFile = ""
+      enableStacktrace = true
+      param("org.jfrog.artifactory.selectedDeployableServer.defaultModuleVersionConfiguration", "GLOBAL")
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = ""
+    }
+  }
+
+  requirements {
+    noLessThanVer("teamcity.agent.jvm.version", "1.8")
+  }
+})
+
+object TestsForIntelliJ20201 : TestsForIntelliJ_201_branch("2020.1")

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

AUTHORS.md

@@ -335,6 +335,10 @@ Contributors:
   [![icon][github]](https://github.com/shaunpatterson)
    
   Shaun Patterson
+* [![icon][mail]](mailto:vladimir.petrenko@jetbrains.com)
+  [![icon][github]](https://github.com/vladimir-petrenko)
+   
+  Vladimir Petrenko
                         
 If you are a contributor and your name is not listed here, feel free to
 contact the maintainers.

CHANGES.md

@@ -22,7 +22,18 @@ It is important to distinguish EAP from traditional pre-release software.
 Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
-## To Be Released
+## 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)

build.gradle

@@ -59,7 +59,7 @@ runIdeForUiTests {
 }
 
 runPluginVerifier {
-  ideVersions = ["IC-2020.1.4", "IC-2020.2.3"]
+  ideVersions = ["IC-2020.2.3", "IC-2020.3"]
   downloadDirectory = "${project.buildDir}/pluginVerifier/ides"
   teamCityOutputFormat = true
 }

resources/META-INF/plugin.xml

@@ -4,60 +4,62 @@
   <change-notes><![CDATA[
     <h3>Features:</h3>
     <ul>
-    <li>Support <code>unmap</code> and <code>mapclear</code> commands
+      <li>Support <code>unmap</code> and <code>mapclear</code> commands <a
-      <a href="https://youtrack.jetbrains.com/issue/VIM-1491">VIM-1491</a>
+          href="https://youtrack.jetbrains.com/issue/VIM-1491">VIM-1491</a></li>
-    </li>
+      <li>Support mappings in ex panel (<code>cmap</code>) <a
-    <li>Support mappings in ex panel (<code>cmap</code>)
+          href="https://youtrack.jetbrains.com/issue/VIM-1227">VIM-1227</a></li>
-      <a href="https://youtrack.jetbrains.com/issue/VIM-1227">VIM-1227</a>
+    </ul>
-    </li>
+
+    <h3>Changes:</h3>
+    <ul>
+      <li><code>octal</code> is now disabled by default for <code>nrformats</code>. <a
+          href="https://youtrack.jetbrains.com/issue/VIM-2181">VIM-2181</a></li>
     </ul>
 
     <h3>Fixes:</h3>
     <ul>
-    <li>
+      <li><a href="https://youtrack.jetbrains.com/issue/VIM-2113">VIM-2113</a> Fix <code>cit</code> for empty tags</li>
-      <a href="https://youtrack.jetbrains.com/issue/VIM-2113">VIM-2113</a>
+      <li><a href="https://youtrack.jetbrains.com/issue/VIM-2114">VIM-2114</a> Unnamed register isn't changed after deleting
-      Fix <code>cit</code> for empty tags
+        empty tag
-    </li>
+      </li>
-    <li>
+      <li><a href="https://youtrack.jetbrains.com/issue/VIM-1475">VIM-1475</a> Enable block caret to be used in insert mode.
-      <a href="https://youtrack.jetbrains.com/issue/VIM-2114">VIM-2114</a>
+      </li>
-      Unnamed register isn't changed after deleting empty tag
+      <li><a href="https://youtrack.jetbrains.com/issue/VIM-2170">VIM-2170</a> Fix an alternative range format for
-    </li>
+        <code>s</code> command
-    <li>
+      </li>
-      <a href="https://youtrack.jetbrains.com/issue/VIM-1475">VIM-1475</a>
+      <li><a href="https://youtrack.jetbrains.com/issue/VIM-1913">VIM-1913</a>
-      Enable block caret to be used in insert mode.
+        <a href="https://youtrack.jetbrains.com/issue/VIM-2154">VIM-2154</a> Several fixes for AppCode templates
-    </li>
+      </li>
-    <li>
+      <li><a href="https://youtrack.jetbrains.com/issue/VIM-1756">VIM-1756</a> Fix startsel from insert mode</li>
-      <a href="https://youtrack.jetbrains.com/issue/VIM-2170">VIM-2170</a>
-      Fix an alternative range format for <code>s</code> command
-    </li>
     </ul>
 
     <h3>Merged PRs:</h3>
     <ul>
-    <li>
+      <li><a href="https://github.com/JetBrains/ideavim/pull/249">249</a> by <a href="https://github.com/jpalus">Jan
-      <a href="https://github.com/JetBrains/ideavim/pull/249">249</a>
+        Palus</a>: VIM-2113 Increase tag range only in visual mode
-      by <a href="https://github.com/jpalus">Jan Palus</a>: VIM-2113 Increase tag range only in visual mode
+      </li>
-    </li>
+      <li><a href="https://github.com/JetBrains/ideavim/pull/250">250</a> by <a href="https://github.com/jpalus">Jan
-    <li>
+        Palus</a>: VIM-2114 Do not override registers when deleting empty range
-      <a href="https://github.com/JetBrains/ideavim/pull/250">250</a>
+      </li>
-      by <a href="https://github.com/jpalus">Jan Palus</a>: VIM-2114 Do not override registers when deleting empty range
+      <li><a href="https://github.com/JetBrains/ideavim/pull/256">256</a> by <a href="https://github.com/brandoncc">Brandon
-    </li>
+        Conway</a>: Fix typo
-    <li>
+      </li>
-      <a href="https://github.com/JetBrains/ideavim/pull/256">256</a>
+      <li><a href="https://github.com/JetBrains/ideavim/pull/254">254</a> by <a href="https://github.com/antekone">Grzegorz
-      by <a href="https://github.com/brandoncc">Brandon Conway</a>: Fix typo
+        Antoniak</a>: VIM-1475: Add an option to use block caret in insert mode
-    </li>
+      </li>
-    <li>
+      <li><a href="https://github.com/JetBrains/ideavim/pull/225">225</a> by <a href="https://github.com/sumoooru2">sumoooru2</a>:
-      <a href="https://github.com/JetBrains/ideavim/pull/254">254</a>
+        Implement cmap
-      by <a href="https://github.com/antekone">Grzegorz Antoniak</a>: VIM-1475: Add an option to use block caret in insert
+      </li>
-      mode
+      <li><a href="https://github.com/JetBrains/ideavim/pull/258">258</a> by <a href="https://github.com/citizenmatt">Matt
-    </li>
+        Ellis</a>: Show the correct handler class in :map
-    <li>
+      </li>
-      <a href="https://github.com/JetBrains/ideavim/pull/225">225</a>
+      <li><a href="https://github.com/JetBrains/ideavim/pull/257">257</a> by <a href="https://github.com/citizenmatt">Matt
-      by <a href="https://github.com/sumoooru2">sumoooru2</a>: Implement cmap
+        Ellis</a>: Extract SearchHighlightsHelper from SearchGroup
-    </li>
+      </li>
+      <li><a href="https://github.com/JetBrains/ideavim/pull/251">251</a> by <a href="https://github.com/shaunpatterson">Shaun
+        Patterson</a>: VIM-1756: startSel works in insert mode
+      </li>
     </ul>
-    <br/>
-    <p>See also the complete <a href="https://github.com/JetBrains/ideavim/blob/master/CHANGES.md">changelog</a>.</p>
   ]]>
   </change-notes>
   <description><![CDATA[
@@ -77,7 +79,7 @@
 
   <!-- 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.41"/>
+  <idea-version since-build="202"/>
 
   <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform -->
   <depends>com.intellij.modules.lang</depends>

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

@@ -1300,7 +1300,7 @@ public class SearchGroup implements PersistentStateComponent<Element> {
   private @Nullable String lastReplace;
   private @Nullable String lastOffset;
   private boolean lastIgnoreSmartCase;
-  private Direction lastDir;
+  private @NotNull Direction lastDir = Direction.FORWARDS;
   private boolean showSearchHighlight = OptionsManager.INSTANCE.getHlsearch().isSet();
 
   private boolean do_all = false; /* do multiple substitutions per line */

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

@@ -20,6 +20,7 @@
 
 package com.maddyhome.idea.vim.helper
 
+import com.intellij.codeWithMe.ClientId
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.ex.util.EditorUtil
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx
@@ -39,6 +40,7 @@ val Editor.fileSize: Int
 val Editor.isIdeaVimDisabledHere: Boolean
   get() {
     return disabledInDialog
+      || (!ClientId.isCurrentlyUnderLocalId)  // CWM-927
       || (!OptionsManager.ideavimsupport.contains("singleline") && isDatabaseCell())
       || (!OptionsManager.ideavimsupport.contains("singleline") && isOneLineMode)
   }