Set plugin version to chylex-16

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

gradle.properties

@@ -8,16 +8,14 @@
 
 # suppress inspection "UnusedProperty" for whole file
 
-ideaVersion=2023.2
+ideaVersion=2023.2.1
 downloadIdeaSources=true
 instrumentPluginCode=true
-version=chylex-18
+version=chylex-16
 javaVersion=17
 remoteRobotVersion=0.11.17
 antlrVersion=4.10.1
 
-kotlin.incremental.useClasspathSnapshot=false
-
 # Please don't forget to update kotlin version in buildscript section
 kotlinVersion=1.8.21
 publishToken=token

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

@@ -14,14 +14,10 @@ import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.AnActionWrapper
-import com.intellij.openapi.actionSystem.IdeActions
-import com.intellij.openapi.actionSystem.KeyboardShortcut
 import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.application.invokeLater
 import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.actionSystem.EditorActionManager
-import com.intellij.openapi.keymap.KeymapManager
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.util.Key
@@ -168,14 +164,6 @@ internal class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatib
         return ActionEnableStatus.no("Special keys", LogLevel.INFO)
       }
 
-      val nextTemplateVariableShortcuts = KeymapManager.getInstance().activeKeymap.getShortcuts(IdeActions.ACTION_EDITOR_NEXT_TEMPLATE_VARIABLE)
-      if (nextTemplateVariableShortcuts.any { it is KeyboardShortcut && it.firstKeyStroke == keyStroke }) {
-        val handler = EditorActionManager.getInstance().getActionHandler(IdeActions.ACTION_EDITOR_NEXT_TEMPLATE_VARIABLE)
-        if (handler.isEnabled(editor, null, e.dataContext)) {
-          return ActionEnableStatus.no("Next template variable or finish in-place refactoring", LogLevel.INFO)
-        }
-      }
-      
       if (editor.inInsertMode) {
         if (keyCode == KeyEvent.VK_TAB) {
           // TODO: This stops VimEditorTab seeing <Tab> in insert mode and correctly scrolling the view

src/main/java/com/maddyhome/idea/vim/listener/VimListenerManager.kt

@@ -88,8 +88,6 @@ import com.maddyhome.idea.vim.listener.MouseEventsDataHolder.skipNDragEvents
 import com.maddyhome.idea.vim.listener.VimListenerManager.EditorListeners.add
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.newapi.vim
-import com.maddyhome.idea.vim.state.VimStateMachine
-import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.inSelectMode
 import com.maddyhome.idea.vim.state.mode.mode
 import com.maddyhome.idea.vim.state.mode.selectionType
@@ -267,16 +265,6 @@ internal object VimListenerManager {
   class VimFileEditorManagerListener : FileEditorManagerListener {
     override fun selectionChanged(event: FileEditorManagerEvent) {
       if (!VimPlugin.isEnabled()) return
-      
-      val newEditor = event.newEditor
-      if (newEditor is TextEditor) {
-        val editor = newEditor.editor
-        if (editor.isInsertMode) {
-          VimStateMachine.getInstance(editor).mode = Mode.NORMAL()
-          KeyHandler.getInstance().reset(editor.vim)
-        }
-      }
-      
       MotionGroup.fileEditorManagerSelectionChangedCallback(event)
       FileGroup.fileEditorManagerSelectionChangedCallback(event)
       SearchGroup.fileEditorManagerSelectionChangedCallback(event)

src/main/java/com/maddyhome/idea/vim/vimscript/model/functions/handlers/HasFunctionHandler.kt

@@ -8,8 +8,6 @@
 
 package com.maddyhome.idea.vim.vimscript.model.functions.handlers
 
-import com.intellij.openapi.util.SystemInfoRt
-import com.intellij.util.system.CpuArch
 import com.intellij.vim.annotations.VimscriptFunction
 import com.maddyhome.idea.vim.api.ExecutionContext
 import com.maddyhome.idea.vim.api.VimEditor
@@ -25,7 +23,7 @@ internal class HasFunctionHandler : FunctionHandler() {
   override val minimumNumberOfArguments = 1
   override val maximumNumberOfArguments = 2
 
-  private val supportedFeatures = Features.discover()
+  private val supportedFeatures = setOf("ide")
 
   override fun doFunction(
     argumentValues: List<Expression>,
@@ -43,40 +41,4 @@ internal class HasFunctionHandler : FunctionHandler() {
       VimInt.ZERO
     }
   }
-  
-  private object Features {
-    fun discover(): Set<String> {
-      val features = mutableSetOf("ide")
-      collectOperatingSystemType(features)
-      return features
-    }
-    
-    private fun collectOperatingSystemType(target: MutableSet<String>) {
-      if (SystemInfoRt.isWindows) {
-        target.add("win32")
-        if (CpuArch.CURRENT.width == 64) {
-          target.add("win64")
-        }
-      }
-      else if (SystemInfoRt.isLinux) {
-        target.add("linux")
-      }
-      else if (SystemInfoRt.isMac) {
-        target.add("mac")
-        target.add("macunix")
-        target.add("osx")
-        target.add("osxdarwin")
-      }
-      else if (SystemInfoRt.isFreeBSD) {
-        target.add("bsd")
-      }
-      else if (SystemInfoRt.isSolaris) {
-        target.add("sun")
-      }
-      
-      if (SystemInfoRt.isUnix) {
-        target.add("unix")
-      }
-    }
-  }
 }

src/main/java/com/maddyhome/idea/vim/vimscript/model/functions/handlers/RenamingFunctionHandler.kt

@@ -0,0 +1,49 @@
+/*
+ * IdeaVim - Vim emulator for IDEs based on the IntelliJ platform
+ * Copyright (C) 2003-2021 The IdeaVim authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.maddyhome.idea.vim.vimscript.model.functions.handlers
+
+import com.intellij.refactoring.rename.inplace.InplaceRefactoring
+import com.intellij.vim.annotations.VimscriptFunction
+import com.maddyhome.idea.vim.api.ExecutionContext
+import com.maddyhome.idea.vim.api.VimEditor
+import com.maddyhome.idea.vim.newapi.ij
+import com.maddyhome.idea.vim.vimscript.model.VimLContext
+import com.maddyhome.idea.vim.vimscript.model.datatypes.VimDataType
+import com.maddyhome.idea.vim.vimscript.model.datatypes.VimInt
+import com.maddyhome.idea.vim.vimscript.model.expressions.Expression
+import com.maddyhome.idea.vim.vimscript.model.functions.FunctionHandler
+
+@VimscriptFunction(name = "renaming")
+internal class RenamingFunctionHandler : FunctionHandler() {
+
+  override val minimumNumberOfArguments = 0
+  override val maximumNumberOfArguments = 0
+  
+  override fun doFunction(
+    argumentValues: List<Expression>,
+    editor: VimEditor,
+    context: ExecutionContext,
+    vimContext: VimLContext,
+  ): VimDataType {
+    return if (InplaceRefactoring.getActiveInplaceRenamer(editor.ij) == null)
+      VimInt.ZERO
+    else
+      VimInt.ONE
+  }
+}

src/main/resources/META-INF/includes/VimLibraryFunctions.xml

@@ -24,5 +24,6 @@
     <vimLibraryFunction implementation="com.maddyhome.idea.vim.vimscript.model.functions.handlers.JoinFunctionHandler" name="join"/>
     <vimLibraryFunction implementation="com.maddyhome.idea.vim.vimscript.model.functions.handlers.SplitFunctionHandler" name="split"/>
     <vimLibraryFunction implementation="com.maddyhome.idea.vim.vimscript.model.functions.handlers.GetFunctionHandler" name="get"/>
+    <vimLibraryFunction implementation="com.maddyhome.idea.vim.vimscript.model.functions.handlers.RenamingFunctionHandler" name="renaming"/>
   </extensions>
 </idea-plugin>

src/main/resources/META-INF/plugin.xml

@@ -19,7 +19,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 -->
   <!-- Also, please update the value in build.gradle.kts file-->
-  <idea-version since-build="232"/>
+  <idea-version since-build="231.7515.13"/>
 
   <!-- Mark the plugin as compatible with RubyMine and other products based on the IntelliJ platform (including CWM) -->
   <depends>com.intellij.modules.platform</depends>