Set plugin version to chylex-43

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

build.gradle.kts

@@ -127,7 +127,7 @@ dependencies {
 
     // AceJump is an optional dependency. We use their SessionManager class to check if it's active
     plugin("AceJump", "3.8.19")
-    plugin("com.intellij.classic.ui", "243.21565.122")
+    plugin("com.intellij.classic.ui", "242.20224.159")
 
     bundledPlugins("org.jetbrains.plugins.terminal", "com.intellij.modules.json")
   }

gradle.properties

@@ -16,11 +16,11 @@
 # https://data.services.jetbrains.com/products?code=IC
 # Maven releases are here: https://www.jetbrains.com/intellij-repository/releases
 # And snapshots: https://www.jetbrains.com/intellij-repository/snapshots
-ideaVersion=2024.3
+ideaVersion=2024.3.3
 # Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 ideaType=IC
 instrumentPluginCode=true
-version=chylex-44
+version=chylex-43
 javaVersion=21
 remoteRobotVersion=0.11.23
 antlrVersion=4.10.1

src/main/java/com/maddyhome/idea/vim/helper/SearchHighlightsHelper.kt

@@ -17,7 +17,6 @@ import com.intellij.openapi.editor.markup.HighlighterLayer
 import com.intellij.openapi.editor.markup.HighlighterTargetArea
 import com.intellij.openapi.editor.markup.RangeHighlighter
 import com.intellij.openapi.editor.markup.TextAttributes
-import com.intellij.util.application
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
@@ -31,7 +30,6 @@ import com.maddyhome.idea.vim.state.mode.inVisualMode
 import org.jetbrains.annotations.Contract
 import java.awt.Font
 import java.util.*
-import javax.swing.Timer
 
 internal fun updateSearchHighlights(
   pattern: String?,
@@ -86,12 +84,6 @@ internal fun addSubstitutionConfirmationHighlight(editor: Editor, start: Int, en
   )
 }
 
-val removeHighlightsEditors = mutableListOf<Editor>()
-val removeHighlightsTimer = Timer(400) {
-  removeHighlightsEditors.forEach(::removeSearchHighlights)
-  removeHighlightsEditors.clear()
-}
-
 /**
  * Refreshes current search highlights for all visible editors
  */
@@ -133,28 +125,17 @@ private fun updateSearchHighlights(
       // hlsearch (+ incsearch/noincsearch)
       // Make sure the range fits this editor. Note that Vim will use the same range for all windows. E.g., given
       // `:1,5s/foo`, Vim will highlight all occurrences of `foo` in the first five lines of all visible windows
-      val isSearching = injector.commandLine.getActiveCommandLine() != null
-      application.invokeLater {
       val vimEditor = editor.vim
       val editorLastLine = vimEditor.lineCount() - 1
       val searchStartLine = searchRange?.startLine ?: 0
       val searchEndLine = (searchRange?.endLine ?: -1).coerceAtMost(editorLastLine)
       if (searchStartLine <= editorLastLine) {
-          val visibleArea = editor.scrollingModel.visibleAreaOnScrollingFinished
-          val visibleTopLeft = visibleArea.location
-          val visibleBottomRight = visibleArea.location.apply { translate(visibleArea.width, visibleArea.height) }
-          val visibleStartOffset = editor.logicalPositionToOffset(editor.xyToLogicalPosition(visibleTopLeft))
-          val visibleEndOffset = editor.logicalPositionToOffset(editor.xyToLogicalPosition(visibleBottomRight))
-          val visibleStartLine = editor.document.getLineNumber(visibleStartOffset)
-          val visibleEndLine = editor.document.getLineNumber(visibleEndOffset)
-          removeSearchHighlights(editor)
-
         val results =
           injector.searchHelper.findAll(
             vimEditor,
             pattern,
-              searchStartLine.coerceAtLeast(visibleStartLine),
+            searchStartLine,
-              searchEndLine.coerceAtMost(visibleEndLine),
+            searchEndLine,
             shouldIgnoreCase(pattern, shouldIgnoreSmartCase)
           )
         if (results.isNotEmpty()) {
@@ -162,14 +143,9 @@ private fun updateSearchHighlights(
             currentMatchOffset = findClosestMatch(results, initialOffset, count1, forwards)
           }
           highlightSearchResults(editor, pattern, results, currentMatchOffset)
-            if (!isSearching) {
-              removeHighlightsEditors.add(editor)
-              removeHighlightsTimer.restart()
-            }
         }
       }
       editor.vimLastSearch = pattern
-      }
     } else if (shouldAddCurrentMatchSearchHighlight(pattern, showHighlights, initialOffset)) {
       // nohlsearch + incsearch. Even though search highlights are disabled, we still show a highlight (current editor
       // only), because 'incsearch' is active. But we don't show a search if Visual is active (behind Command-line of
@@ -203,7 +179,6 @@ private fun updateSearchHighlights(
     }
   }
 
-  removeHighlightsTimer.restart()
   return currentEditorCurrentMatchOffset
 }
 
@@ -229,7 +204,7 @@ private fun removeSearchHighlights(editor: Editor) {
  */
 @Contract("_, _, false -> false; _, null, true -> false")
 private fun shouldAddAllSearchHighlights(editor: Editor, newPattern: String?, hlSearch: Boolean): Boolean {
-  return hlSearch && newPattern != null && newPattern != ""
+  return hlSearch && newPattern != null && newPattern != editor.vimLastSearch && newPattern != ""
 }
 
 private fun findClosestMatch(

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

@@ -425,7 +425,7 @@ internal object VimListenerManager {
       
       MotionGroup.fileEditorManagerSelectionChangedCallback(event)
       FileGroup.fileEditorManagerSelectionChangedCallback(event)
-//      VimPlugin.getSearch().fileEditorManagerSelectionChangedCallback(event)
+      VimPlugin.getSearch().fileEditorManagerSelectionChangedCallback(event)
       IjVimRedrawService.fileEditorManagerSelectionChangedCallback(event)
       VimLastSelectedEditorTracker.setLastSelectedEditor(event.newEditor)
     }