Set plugin version to chylex-57

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

.github/workflows/runSplitModeTests.yml

@@ -1,50 +0,0 @@
-name: Run Split Mode Tests
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - master
-jobs:
-  test-linux:
-    if: github.repository == 'JetBrains/ideavim'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - name: Free up disk space
-        run: |
-          echo "Disk space before cleanup:"
-          df -h
-          sudo rm -rf /usr/share/dotnet
-          sudo rm -rf /usr/local/lib/android
-          sudo rm -rf /opt/ghc
-          sudo rm -rf /opt/hostedtoolcache/CodeQL
-          sudo docker image prune --all --force
-          echo "Disk space after cleanup:"
-          df -h
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 21
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-        with:
-          cache-read-only: false
-      - name: Start Xvfb
-        run: |
-          Xvfb :99 -screen 0 1920x1080x24 &
-          echo "DISPLAY=:99" >> $GITHUB_ENV
-      - name: Run split mode tests
-        run: gradle :tests:split-mode-tests:testSplitMode --console=plain
-      - name: Upload reports
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: split-mode-reports
-          path: |
-            tests/split-mode-tests/build/reports
-            out/ide-tests/tests/**/log
-            out/ide-tests/tests/**/frontend/log

.idea/gradle.xml

@@ -33,5 +33,6 @@
         </option>
       </GradleProjectSettings>
     </option>
+    <option name="parallelModelFetch" value="true" />
   </component>
 </project>

.teamcity/_Self/Project.kt

@@ -1,3 +1,11 @@
+/*
+ * Copyright 2003-2026 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
 package _Self
 
 import _Self.buildTypes.Compatibility
@@ -6,6 +14,7 @@ import _Self.buildTypes.Nvim
 import _Self.buildTypes.PluginVerifier
 import _Self.buildTypes.PropertyBased
 import _Self.buildTypes.RandomOrderTests
+import _Self.buildTypes.SplitModeTests
 
 import _Self.buildTypes.TestingBuildType
 import _Self.buildTypes.TypeScriptTest
@@ -30,6 +39,7 @@ object Project : Project({
   buildType(PropertyBased)
   buildType(LongRunning)
   buildType(RandomOrderTests)
+  buildType(SplitModeTests)
 
   buildType(Nvim)
   buildType(PluginVerifier)

.teamcity/_Self/buildTypes/Compatibility.kt

@@ -1,3 +1,11 @@
+/*
+ * Copyright 2003-2026 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
 package _Self.buildTypes
 
 import _Self.AgentSize
@@ -11,6 +19,10 @@ object Compatibility : IdeaVimBuildType({
   id("IdeaVimCompatibility")
   name = "IdeaVim compatibility with external plugins"
 
+  failureConditions {
+    executionTimeoutMin = 180
+  }
+
   vcs {
     root(DslContext.settingsRoot)
     branchFilter = "+:<default>"

.teamcity/_Self/buildTypes/RandomOrderTests.kt

@@ -1,3 +1,11 @@
+/*
+ * Copyright 2003-2026 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
 package _Self.buildTypes
 
 import _Self.AgentSize
@@ -26,7 +34,7 @@ object RandomOrderTests : IdeaVimBuildType({
     gradle {
       clearConditions()
       tasks = """
-        test
+        clean test
         -x :tests:property-tests:test
         -x :tests:long-running-tests:test
         -Djunit.jupiter.execution.order.random.seed=default
@@ -34,7 +42,7 @@ object RandomOrderTests : IdeaVimBuildType({
       """.trimIndent().replace("\n", " ")
       buildFile = ""
       enableStacktrace = true
-      gradleParams = "--build-cache --configuration-cache"
+      gradleParams = "--no-build-cache --configuration-cache"
       jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }

.teamcity/_Self/buildTypes/SplitModeTests.kt

@@ -0,0 +1,63 @@
+/*
+ * Copyright 2003-2026 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package _Self.buildTypes
+
+import _Self.AgentSize
+import _Self.IdeaVimBuildType
+import jetbrains.buildServer.configs.kotlin.v2019_2.CheckoutMode
+import jetbrains.buildServer.configs.kotlin.v2019_2.DslContext
+import jetbrains.buildServer.configs.kotlin.v2019_2.buildSteps.script
+import jetbrains.buildServer.configs.kotlin.v2019_2.triggers.vcs
+
+object SplitModeTests : IdeaVimBuildType({
+  name = "Split mode tests"
+  description = "Tests for IdeaVim in Remote Development split mode (backend + frontend)"
+
+  artifactRules = """
+        +:tests/split-mode-tests/build/reports => split-mode-tests/build/reports
+        +:out/ide-tests/tests/**/log => out/ide-tests/log
+        +:out/ide-tests/tests/**/frontend/log => out/ide-tests/frontend-log
+    """.trimIndent()
+
+  params {
+    param("env.ORG_GRADLE_PROJECT_downloadIdeaSources", "false")
+    param("env.ORG_GRADLE_PROJECT_instrumentPluginCode", "false")
+    param("env.DISPLAY", ":99")
+  }
+
+  vcs {
+    root(DslContext.settingsRoot)
+    branchFilter = "+:<default>"
+
+    checkoutMode = CheckoutMode.AUTO
+  }
+
+  steps {
+    script {
+      name = "Start Xvfb and run split mode tests"
+      scriptContent = """
+              Xvfb :99 -screen 0 1920x1080x24 &
+              sleep 2
+              ./gradlew :tests:split-mode-tests:testSplitMode --console=plain --build-cache --configuration-cache --stacktrace
+          """.trimIndent()
+    }
+  }
+
+  triggers {
+    vcs {
+      branchFilter = "+:<default>"
+    }
+  }
+
+  requirements {
+    // Use a larger agent for split-mode tests — they launch two full IDE instances
+    equals("teamcity.agent.hardware.cpuCount", AgentSize.XLARGE)
+    equals("teamcity.agent.os.family", "Linux")
+  }
+})

.teamcity/_Self/buildTypes/TestingBuildType.kt

@@ -1,3 +1,11 @@
+/*
+ * Copyright 2003-2026 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
 @file:Suppress("ClassName")
 
 package _Self.buildTypes
@@ -41,10 +49,10 @@ open class TestingBuildType(
   steps {
     gradle {
       clearConditions()
-      tasks = "test -x :tests:property-tests:test -x :tests:long-running-tests:test"
+      tasks = "clean test -x :tests:property-tests:test -x :tests:long-running-tests:test"
       buildFile = ""
       enableStacktrace = true
-      gradleParams = "--build-cache --configuration-cache"
+      gradleParams = "--no-build-cache --configuration-cache"
       jdkHome = "/usr/lib/jvm/java-21-amazon-corretto"
     }
   }

AUTHORS.md

@@ -542,6 +542,10 @@ Contributors:
   [![icon][github]](https://github.com/1grzyb1)
    
   1grzyb1
+* [![icon][mail]](mailto:yury@digitalby.me)
+  [![icon][github]](https://github.com/digitalby)
+   
+  digitalby
 
 Contributors with JetBrains IP:
 

CHANGES.md

@@ -36,14 +36,37 @@ usual beta standards.
 * [VIM-566](https://youtrack.jetbrains.com/issue/VIM-566) Added support for `:set foldlevel` option - control fold visibility level
 
 ### Fixes:
+* [VIM-4135](https://youtrack.jetbrains.com/issue/VIM-4135) Fixed IdeaVim not loading in Rider
+* [VIM-4134](https://youtrack.jetbrains.com/issue/VIM-4134) Fixed undo in commentary - `gcc`/`gc{motion}` changes are now properly grouped as a single undo step
+* [VIM-4134](https://youtrack.jetbrains.com/issue/VIM-4134) Fixed `=` (format/auto-indent) action in split mode
+* [VIM-4134](https://youtrack.jetbrains.com/issue/VIM-4134) Fixed global marks causing errors when used inside write actions (e.g., during document modifications)
 * [VIM-4105](https://youtrack.jetbrains.com/issue/VIM-4105) Fixed `a"` `a'` `a\`` text objects to include surrounding whitespace per Vim spec
 * [VIM-4097](https://youtrack.jetbrains.com/issue/VIM-4097) Fixed `<A-n>` (NextOccurrence) with text containing backslashes - e.g., selecting `\IntegerField` now works correctly
 * [VIM-4094](https://youtrack.jetbrains.com/issue/VIM-4094) Fixed UninitializedPropertyAccessException when loading history
+* [VIM-4016](https://youtrack.jetbrains.com/issue/VIM-4016) Fixed `:edit` command when project has no source roots
 * [VIM-3948](https://youtrack.jetbrains.com/issue/VIM-3948) Improved hint generation visibility checks for better UI component detection
+* [VIM-3473](https://youtrack.jetbrains.com/issue/VIM-3473) Fixed "Reload .ideavimrc" action in remote development (split) mode - no longer causes File Cache Conflict dialogs
+* [VIM-2821](https://youtrack.jetbrains.com/issue/VIM-2821) Fixed undo grouping when repeating text insertion with `.` in remote development (split mode)
+* [VIM-1705](https://youtrack.jetbrains.com/issue/VIM-1705) Fixed window-switching commands (e.g., `<C-w>h`) during macro playback
+* Fixed `pumvisible()` function returning incorrect result (was inverted)
+* Fixed `<Esc>` not properly exiting insert mode in Rider/CLion when canceling a completion lookup
+* Fixed `<Esc>` not exiting insert mode after `<C-Space>` completion in Rider
+* Fixed `<Esc>` in search bar no longer inserts `^[` literal text when search is not found - panel is now properly closed
+* Fixed IdeaVim entering broken state when a VimScript extension plugin fails to initialize
+* Fixed compatibility issues with external plugins (e.g., IdeaVim-EasyMotion, multicursor)
+* Fixed recursive key mappings (e.g., `map b wbb`) causing an apparent infinite loop - `maxmapdepth` limit now properly terminates the entire mapping chain
+* Fixed NERDTree `gs`/`gi` preview split commands to keep focus on the tree
+* Fixed visual marks (`<` and `>`) position tracking after text deletion - `gv` now re-selects correctly
+* Fixed `IndexOutOfBoundsException` when using text objects like `a)` at end of file
 * Fixed high CPU usage while showing command line
 * Fixed comparison of String and Number in VimScript expressions
 
 ### Merged PRs:
+* [1632](https://github.com/JetBrains/ideavim/pull/1632) by [chylex](https://github.com/chylex): Fix pumvisible returning opposite result
+* [1615](https://github.com/JetBrains/ideavim/pull/1615) by [1grzyb1](https://github.com/1grzyb1): Fix IndexOutOfBoundsException in findBlock when caret is at end of file
+* [1613](https://github.com/JetBrains/ideavim/pull/1613) by [1grzyb1](https://github.com/1grzyb1): VIM-3473 Sync ideavim in remdev
+* [1608](https://github.com/JetBrains/ideavim/pull/1608) by [1grzyb1](https://github.com/1grzyb1): VIM-4134 format using = action in split mode
+* [1585](https://github.com/JetBrains/ideavim/pull/1585) by [1grzyb1](https://github.com/1grzyb1): Break in case of maximum recursion depth
 * [1414](https://github.com/JetBrains/ideavim/pull/1414) by [Matt Ellis](https://github.com/citizenmatt): Refactor/functions
 * [1442](https://github.com/JetBrains/ideavim/pull/1442) by [Matt Ellis](https://github.com/citizenmatt): Fix high CPU usage while showing command line
 

api/src/main/kotlin/com/intellij/vim/api/scopes/TextObjectScope.kt

@@ -9,6 +9,7 @@
 package com.intellij.vim.api.scopes
 
 import com.intellij.vim.api.VimApi
+import com.intellij.vim.api.models.CaretId
 
 /**
  * Represents the range of a text object selection.
@@ -113,6 +114,15 @@ interface TextObjectScope {
     keys: String,
     registerDefaultMapping: Boolean = true,
     preserveSelectionAnchor: Boolean = true,
-    rangeProvider: suspend VimApi.(count: Int) -> TextObjectRange?,
+    rangeProvider: suspend VimApi.(caret: CaretId, count: Int) -> TextObjectRange?,
   )
+
+  fun register(
+    keys: String,
+    registerDefaultMapping: Boolean = true,
+    preserveSelectionAnchor: Boolean = true,
+    rangeProvider: suspend VimApi.(count: Int) -> TextObjectRange?,
+  ) {
+    register(keys, registerDefaultMapping, preserveSelectionAnchor) { _, count -> rangeProvider(count) }
+  }
 }

build.gradle.kts

@@ -444,14 +444,37 @@ intellijPlatform {
         * <a href="https://youtrack.jetbrains.com/issue/VIM-566">VIM-566</a> Added support for <code>:set foldlevel</code> option - control fold visibility level<br>
         <br>
         <b>Fixes:</b><br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-4135">VIM-4135</a> Fixed IdeaVim not loading in Rider<br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-4134">VIM-4134</a> Fixed undo in commentary - <code>gcc</code>/<code>gc{motion}</code> changes are now properly grouped as a single undo step<br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-4134">VIM-4134</a> Fixed <code>=</code> (format/auto-indent) action in split mode<br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-4134">VIM-4134</a> Fixed global marks causing errors when used inside write actions (e.g., during document modifications)<br>
         * <a href="https://youtrack.jetbrains.com/issue/VIM-4105">VIM-4105</a> Fixed <code>a"</code> <code>a'</code> <code>a`</code> text objects to include surrounding whitespace per Vim spec<br>
         * <a href="https://youtrack.jetbrains.com/issue/VIM-4097">VIM-4097</a> Fixed <code>&lt;A-n&gt;</code> (NextOccurrence) with text containing backslashes - e.g., selecting <code>\IntegerField</code> now works correctly<br>
         * <a href="https://youtrack.jetbrains.com/issue/VIM-4094">VIM-4094</a> Fixed UninitializedPropertyAccessException when loading history<br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-4016">VIM-4016</a> Fixed <code>:edit</code> command when project has no source roots<br>
         * <a href="https://youtrack.jetbrains.com/issue/VIM-3948">VIM-3948</a> Improved hint generation visibility checks for better UI component detection<br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-3473">VIM-3473</a> Fixed "Reload .ideavimrc" action in remote development (split) mode - no longer causes File Cache Conflict dialogs<br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-2821">VIM-2821</a> Fixed undo grouping when repeating text insertion with <code>.</code> in remote development (split mode)<br>
+        * <a href="https://youtrack.jetbrains.com/issue/VIM-1705">VIM-1705</a> Fixed window-switching commands (e.g., <code>&lt;C-w&gt;h</code>) during macro playback<br>
+        * Fixed <code>pumvisible()</code> function returning incorrect result (was inverted)<br>
+        * Fixed <code>&lt;Esc&gt;</code> not properly exiting insert mode in Rider/CLion when canceling a completion lookup<br>
+        * Fixed <code>&lt;Esc&gt;</code> not exiting insert mode after <code>&lt;C-Space&gt;</code> completion in Rider<br>
+        * Fixed <code>&lt;Esc&gt;</code> in search bar no longer inserts <code>^[</code> literal text when search is not found - panel is now properly closed<br>
+        * Fixed IdeaVim entering broken state when a VimScript extension plugin fails to initialize<br>
+        * Fixed compatibility issues with external plugins (e.g., IdeaVim-EasyMotion, multicursor)<br>
+        * Fixed recursive key mappings (e.g., <code>map b wbb</code>) causing an apparent infinite loop - <code>maxmapdepth</code> limit now properly terminates the entire mapping chain<br>
+        * Fixed NERDTree <code>gs</code>/<code>gi</code> preview split commands to keep focus on the tree<br>
+        * Fixed visual marks (<code>&lt;</code> and <code>&gt;</code>) position tracking after text deletion - <code>gv</code> now re-selects correctly<br>
+        * Fixed <code>IndexOutOfBoundsException</code> when using text objects like <code>a)</code> at end of file<br>
         * Fixed high CPU usage while showing command line<br>
         * Fixed comparison of String and Number in VimScript expressions<br>
         <br>
         <b>Merged PRs:</b><br>
+        * <a href="https://github.com/JetBrains/ideavim/pull/1632">1632</a> by <a href="https://github.com/chylex">chylex</a>: Fix pumvisible returning opposite result<br>
+        * <a href="https://github.com/JetBrains/ideavim/pull/1615">1615</a> by <a href="https://github.com/1grzyb1">1grzyb1</a>: Fix IndexOutOfBoundsException in findBlock when caret is at end of file<br>
+        * <a href="https://github.com/JetBrains/ideavim/pull/1613">1613</a> by <a href="https://github.com/1grzyb1">1grzyb1</a>: VIM-3473 Sync ideavim in remdev<br>
+        * <a href="https://github.com/JetBrains/ideavim/pull/1608">1608</a> by <a href="https://github.com/1grzyb1">1grzyb1</a>: VIM-4134 format using = action in split mode<br>
+        * <a href="https://github.com/JetBrains/ideavim/pull/1585">1585</a> by <a href="https://github.com/1grzyb1">1grzyb1</a>: Break in case of maximum recursion depth<br>
         * <a href="https://github.com/JetBrains/ideavim/pull/1414">1414</a> by <a href="https://github.com/citizenmatt">Matt Ellis</a>: Refactor/functions<br>
         * <a href="https://github.com/JetBrains/ideavim/pull/1442">1442</a> by <a href="https://github.com/citizenmatt">Matt Ellis</a>: Fix high CPU usage while showing command line<br>
         <br>

gradle.properties

@@ -20,7 +20,7 @@ ideaVersion=2026.1
 # Values for type: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension-type
 ideaType=IU
 instrumentPluginCode=true
-version=chylex-55
+version=chylex-57
 javaVersion=21
 remoteRobotVersion=0.11.23
 antlrVersion=4.10.1

src/main/java/com/maddyhome/idea/vim/VimPlugin.java

@@ -22,6 +22,7 @@ import com.intellij.openapi.util.Disposer;
 import com.maddyhome.idea.vim.api.*;
 import com.maddyhome.idea.vim.config.VimState;
 import com.maddyhome.idea.vim.config.migration.ApplicationConfigurationMigrator;
+import com.maddyhome.idea.vim.group.ChangeGroup;
 import com.maddyhome.idea.vim.group.KeyGroup;
 import com.maddyhome.idea.vim.group.VimNotifications;
 import com.maddyhome.idea.vim.group.VimWindowGroup;
@@ -90,8 +91,8 @@ public class VimPlugin implements PersistentStateComponent<Element>, Disposable
     return VimInjectorKt.getInjector().getMotion();
   }
 
-  public static @NotNull VimChangeGroup getChange() {
-    return VimInjectorKt.getInjector().getChangeGroup();
+  public static @NotNull ChangeGroup getChange() {
+    return ((ChangeGroup)VimInjectorKt.getInjector().getChangeGroup());
   }
 
   public static @NotNull VimCommandGroup getCommand() {

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

@@ -23,6 +23,7 @@ import com.intellij.openapi.editor.impl.EditorComponentImpl
 import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.util.Key
+import com.intellij.openapi.util.SystemInfoRt
 import com.intellij.openapi.util.registry.Registry
 import com.intellij.ui.KeyStrokeAdapter
 import com.maddyhome.idea.vim.KeyHandler
@@ -226,8 +227,9 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
       val defaultKeyStroke = KeyStrokeAdapter.getDefaultKeyStroke(inputEvent)
       val strokeCache = keyStrokeCache
       if (defaultKeyStroke != null) {
-        keyStrokeCache = inputEvent.`when` to defaultKeyStroke
-        return defaultKeyStroke
+        val fixedKeyStroke = fixKeyStroke(defaultKeyStroke)
+        keyStrokeCache = inputEvent.`when` to fixedKeyStroke
+        return fixedKeyStroke
       } else if (strokeCache.first == inputEvent.`when`) {
         keyStrokeCache = null to null
         return strokeCache.second
@@ -237,6 +239,19 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
     return null
   }
 
+  private fun fixKeyStroke(key: KeyStroke): KeyStroke {
+    return if (
+      key.modifiers and CTRL_ALT_MASK != 0 &&
+      key.isOnKeyRelease &&
+      SystemInfoRt.isWindows &&
+      Registry.`is`("actionSystem.fix.alt.gr", true)
+    ) {
+      KeyStroke.getKeyStroke(key.keyCode, key.modifiers)
+    } else {
+      key
+    }
+  }
+
   private fun getEditor(e: AnActionEvent): Editor? {
     return e.getData(PlatformDataKeys.EDITOR)
       ?: if (e.getData(PlatformDataKeys.CONTEXT_COMPONENT) is ExTextField) {
@@ -317,6 +332,7 @@ class VimShortcutKeyAction : AnAction(), DumbAware/*, LightEditCompatible*/ {
         ).build()
 
     private const val ACTION_ID = "VimShortcutKeyAction"
+    private const val CTRL_ALT_MASK = InputEvent.CTRL_DOWN_MASK or InputEvent.ALT_DOWN_MASK
 
     private val LOG = logger<VimShortcutKeyAction>()
 

src/main/java/com/maddyhome/idea/vim/extension/argtextobj/VimArgTextObjExtension.kt

@@ -9,6 +9,7 @@ package com.maddyhome.idea.vim.extension.argtextobj
 
 import com.intellij.vim.api.VimApi
 import com.intellij.vim.api.VimInitApi
+import com.intellij.vim.api.models.CaretId
 import com.intellij.vim.api.scopes.TextObjectRange
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.extension.VimExtension
@@ -121,11 +122,11 @@ class VimArgTextObjExtension : VimExtension {
 
   override fun init(initApi: VimInitApi) {
     initApi.textObjects {
-      register("ia", preserveSelectionAnchor = false) { count ->
-        findArgumentRange(isInner = true, count)
+      register("ia", preserveSelectionAnchor = false) { caret, count ->
+        findArgumentRange(isInner = true, caret, count)
       }
-      register("aa", preserveSelectionAnchor = false) { count ->
-        findArgumentRange(isInner = false, count)
+      register("aa", preserveSelectionAnchor = false) { caret, count ->
+        findArgumentRange(isInner = false, caret, count)
       }
     }
   }
@@ -610,7 +611,7 @@ private object ArgTextObjUtil {
 /**
  * Find argument range using the new VimApi.
  */
-private suspend fun VimApi.findArgumentRange(isInner: Boolean, count: Int): TextObjectRange? {
+private suspend fun VimApi.findArgumentRange(isInner: Boolean, caret: CaretId, count: Int): TextObjectRange? {
   var bracketPairs: BracketPairs = ArgTextObjUtil.DEFAULT_BRACKET_PAIRS
   val bracketPairsVar: String? = ArgTextObjUtil.bracketPairsVariable()
   if (bracketPairsVar != null) {
@@ -625,7 +626,7 @@ private suspend fun VimApi.findArgumentRange(isInner: Boolean, count: Int): Text
     }
   }
 
-  val (text, caretOffset) = editor { read { text to withPrimaryCaret { offset } } }
+  val (text, caretOffset) = editor { read { text to with(caret) { offset } } }
   val finder = ArgBoundsFinder(text, this, bracketPairs)
   var pos = caretOffset
 

src/main/java/com/maddyhome/idea/vim/group/JumpRemoteTopicListener.kt

@@ -42,6 +42,7 @@ internal class JumpRemoteTopicListener : ProjectRemoteTopicListener<JumpInfo> {
 
     if (event.added) {
       jumpService.addJump(projectId, jump, true)
+      injector.markService.setJumpMark(event.filepath, event.protocol, event.line, event.col)
     } else {
       jumpService.removeJump(projectId, jump)
     }

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

@@ -29,6 +29,7 @@ import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.inCommandLineModeWithVisual
 import com.maddyhome.idea.vim.state.mode.inVisualMode
 import org.jetbrains.annotations.Contract
+import java.awt.Color
 import java.awt.Font
 import java.util.*
 import javax.swing.Timer
@@ -87,7 +88,7 @@ fun addSubstitutionConfirmationHighlight(editor: Editor, start: Int, end: Int):
 }
 
 val removeHighlightsEditors = mutableListOf<Editor>()
-val removeHighlightsTimer = Timer(400) {
+val removeHighlightsTimer = Timer(450) {
   removeHighlightsEditors.forEach(::removeSearchHighlights)
   removeHighlightsEditors.clear()
 }
@@ -161,7 +162,7 @@ private fun updateSearchHighlights(
             if (editor === currentEditor?.ij) {
               currentMatchOffset = findClosestMatch(results, initialOffset, count1, forwards)
             }
-            highlightSearchResults(editor, pattern, results, currentMatchOffset)
+            highlightSearchResults(editor, results, currentMatchOffset)
             if (!isSearching) {
               removeHighlightsEditors.add(editor)
               removeHighlightsTimer.restart()
@@ -184,7 +185,7 @@ private fun updateSearchHighlights(
         if (result != null) {
           if (!it.inVisualMode && !it.inCommandLineModeWithVisual) {
             val results = listOf(result)
-            highlightSearchResults(editor, pattern, results, result.startOffset)
+            highlightSearchResults(editor, results, result.startOffset)
           }
           currentMatchOffset = result.startOffset
         }
@@ -265,9 +266,18 @@ private fun findClosestMatch(
   return sortedResults[nextIndex % results.size].startOffset
 }
 
+@Suppress("UseJBColor")
+private val DEFAULT_RESULT_ATTRIBUTES = TextAttributes().apply {
+  backgroundColor = Color(50, 81, 61)
+}
+
+@Suppress("UseJBColor")
+private val NEARBY_RESULT_ATTRIBUTES = TextAttributes().apply {
+  backgroundColor = Color(89, 80, 50)
+}
+
 fun highlightSearchResults(
   editor: Editor,
-  pattern: String,
   results: List<TextRange>,
   currentMatchOffset: Int,
 ) {
@@ -276,38 +286,28 @@ fun highlightSearchResults(
     highlighters = mutableListOf()
     editor.vimLastHighlighters = highlighters
   }
-  for (range in results) {
-    val current = range.startOffset == currentMatchOffset
-    val highlighter = highlightMatch(editor, range.startOffset, range.endOffset, current, pattern)
-    highlighters.add(highlighter)
+
+  val allCaretOffsets = editor.caretModel.allCarets.map { it.offset }
+
+  for ((index, range) in results.withIndex()) {
+    if (allCaretOffsets.any { range.startOffset == it }) {
+      continue
+    }
+
+    val attributes = if (allCaretOffsets.any { (index > 0 && results[index - 1].startOffset == it) || (index < results.lastIndex && results[index + 1].startOffset == it) })
+      NEARBY_RESULT_ATTRIBUTES
+    else
+      DEFAULT_RESULT_ATTRIBUTES
+
+    highlighters.add(highlightMatch(editor, range.startOffset, range.endOffset, attributes))
   }
   editor.vimIncsearchCurrentMatchOffset = currentMatchOffset
 }
 
-private fun highlightMatch(editor: Editor, start: Int, end: Int, current: Boolean, tooltip: String): RangeHighlighter {
+private fun highlightMatch(editor: Editor, start: Int, end: Int, attributes: TextAttributes): RangeHighlighter {
   val layer = HighlighterLayer.SELECTION - 1
   val targetArea = HighlighterTargetArea.EXACT_RANGE
-  if (!current) {
-    // If we use a text attribute key, it will update automatically when the editor's colour scheme changes
-    val highlighter =
-      editor.markupModel.addRangeHighlighter(EditorColors.TEXT_SEARCH_RESULT_ATTRIBUTES, start, end, layer, targetArea)
-    highlighter.errorStripeTooltip = tooltip
-    return highlighter
-  }
-
-  // There isn't a text attribute key for current selection. This means we won't update automatically when the editor's
-  // colour scheme changes. However, this is only used during incsearch, so it should be replaced pretty quickly. It's a
-  // small visual glitch that will fix itself quickly. Let's not bother implementing an editor colour scheme listener
-  // just for this.
-  // These are the same modifications that the Find live preview does. We could look at using LivePreviewPresentation,
-  // which might also be useful for text attributes in selection (if we supported that)
-  val attributes = editor.colorsScheme.getAttributes(EditorColors.TEXT_SEARCH_RESULT_ATTRIBUTES).clone().apply {
-    effectType = EffectType.ROUNDED_BOX
-    effectColor = editor.colorsScheme.getColor(EditorColors.CARET_COLOR)
-  }
-  return editor.markupModel.addRangeHighlighter(start, end, layer, attributes, targetArea).apply {
-    errorStripeTooltip = tooltip
-  }
+  return editor.markupModel.addRangeHighlighter(start, end, layer, attributes, targetArea)
 }
 
 /**

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

@@ -29,12 +29,14 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.AnActionResult
 import com.intellij.openapi.actionSystem.AnActionWrapper
 import com.intellij.openapi.actionSystem.CommonDataKeys
+import com.intellij.openapi.actionSystem.IdeActions
 import com.intellij.openapi.actionSystem.ex.AnActionListener
 import com.intellij.openapi.actionSystem.impl.ProxyShortcutSet
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.RangeMarker
 import com.intellij.openapi.editor.actions.EnterAction
 import com.intellij.openapi.editor.impl.ScrollingModelImpl
+import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.keymap.KeymapManager
 import com.intellij.openapi.project.DumbAwareToggleAction
 import com.intellij.openapi.util.TextRange
@@ -87,6 +89,11 @@ internal object IdeaSpecifics {
         caretOffset = hostEditor.caretModel.offset
       }
 
+      val actionId = ActionManager.getInstance().getId(action)
+      if (isGotoAction(actionId)) {
+        saveJumpBeforeGoto(event, editor)
+      }
+
       val isVimAction = (action as? AnActionWrapper)?.delegate is VimShortcutKeyAction
       if (!isVimAction && injector.vimState.mode == Mode.INSERT && action !is EnterAction) {
         val undoService = injector.undo as VimTimestampBasedUndoService
@@ -206,6 +213,20 @@ internal object IdeaSpecifics {
       this.completionData = null
     }
 
+    private fun isGotoAction(actionId: String?): Boolean =
+      actionId == IdeActions.ACTION_GOTO_BACK || actionId == IdeActions.ACTION_GOTO_FORWARD
+
+    private fun saveJumpBeforeGoto(event: AnActionEvent, editor: Editor?) {
+      val project = event.dataContext.getData(CommonDataKeys.PROJECT)
+      val currentEditor = editor
+        ?: event.dataContext.getData(CommonDataKeys.EDITOR)
+        ?: project?.let { VimListenerManager.VimLastSelectedEditorTracker.getLastSelectedEditor(it) }
+        ?: project?.let { FileEditorManager.getInstance(it).selectedTextEditor }
+      if (currentEditor != null && !currentEditor.isIdeaVimDisabledHere) {
+        injector.jumpService.saveJumpLocation(currentEditor.vim)
+      }
+    }
+
     private data class CompletionData(
       val completionStartMarker: RangeMarker,
       val originalStartOffset: Int,

src/main/java/com/maddyhome/idea/vim/newapi/IjVimMessages.kt

@@ -25,10 +25,17 @@ internal class IjVimMessages : VimMessagesBase() {
   private var lastBeepTimeMillis = 0L
 
   override fun showMessage(editor: VimEditor, message: String?) {
+    injector.outputPanel.clear(editor, injector.executionContextManager.getEditorExecutionContext(editor))
     showMessageInternal(editor, message, MessageType.STANDARD)
   }
 
   override fun showErrorMessage(editor: VimEditor, message: String?) {
+    injector.outputPanel.clear(editor, injector.executionContextManager.getEditorExecutionContext(editor))
+    showMessageInternal(editor, message, MessageType.ERROR)
+    indicateError()
+  }
+
+  override fun appendErrorMessage(editor: VimEditor, message: String?) {
     showMessageInternal(editor, message, MessageType.ERROR)
     indicateError()
   }

src/main/java/com/maddyhome/idea/vim/newapi/IjVimSearchGroup.kt

@@ -78,7 +78,7 @@ open class IjVimSearchGroup : VimSearchGroupBase(), PersistentStateComponent<Ele
         editor, pattern, startLine, endLine,
         shouldIgnoreCase(pattern, lastIgnoreSmartCase)
       )
-      highlightSearchResults(editor.ij, pattern, results, -1)
+      highlightSearchResults(editor.ij, results, -1)
     }
   }
 

src/main/java/com/maddyhome/idea/vim/ui/OutputPanel.kt

@@ -11,6 +11,7 @@ import com.intellij.ide.ui.LafManager
 import com.intellij.ide.ui.LafManagerListener
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.wm.ex.ToolWindowManagerListener
 import com.intellij.openapi.wm.impl.IdeBackgroundUtil
 import com.intellij.openapi.wm.impl.ToolWindowManagerImpl
 import com.intellij.ui.ClientProperty
@@ -18,6 +19,7 @@ import com.intellij.ui.JBColor
 import com.intellij.ui.components.JBPanel
 import com.intellij.ui.components.JBScrollPane
 import com.intellij.util.IJSwingUtilities
+import com.intellij.util.messages.MessageBusConnection
 import com.maddyhome.idea.vim.KeyHandler.Companion.getInstance
 import com.maddyhome.idea.vim.VimPlugin
 import com.maddyhome.idea.vim.api.ExecutionContext
@@ -64,6 +66,7 @@ class OutputPanel private constructor(
   private var glassPane: JComponent? = null
   private var originalLayout: LayoutManager? = null
   private var wasOpaque = false
+  private var toolWindowListenerConnection: MessageBusConnection? = null
 
   var active: Boolean = false
   private val segments = mutableListOf<TextLine>()
@@ -91,7 +94,6 @@ class OutputPanel private constructor(
 
     // Suppress the fancy frame background used in the Islands theme
     ClientProperty.putRecursive(this, IdeBackgroundUtil.NO_BACKGROUND, true)
-    putClientProperty(ToolWindowManagerImpl.PARENT_COMPONENT, editor.component)
 
     // Initialize panel
     setLayout(BorderLayout(0, 0))
@@ -101,6 +103,7 @@ class OutputPanel private constructor(
     val keyListener = OutputPanelKeyListener()
     addKeyListener(keyListener)
     textPane.addKeyListener(keyListener)
+    editor?.let { putClientProperty(ToolWindowManagerImpl.PARENT_COMPONENT, it.component) }
 
     updateUI()
   }
@@ -264,6 +267,8 @@ class OutputPanel private constructor(
     }
     if (glassPane != null) {
       glassPane!!.removeComponentListener(resizeAdapter)
+      toolWindowListenerConnection?.disconnect()
+      toolWindowListenerConnection = null
       glassPane!!.isVisible = false
       glassPane!!.remove(this)
       glassPane!!.setOpaque(wasOpaque)
@@ -285,6 +290,8 @@ class OutputPanel private constructor(
     }
 
     active = true
+    if (isSingleLine) return
+
     requestFocus(textPane)
   }
 
@@ -300,6 +307,11 @@ class OutputPanel private constructor(
     glassPane!!.setOpaque(false)
     glassPane!!.add(this)
     glassPane!!.addComponentListener(resizeAdapter)
+    val project = editor.project
+    if (project != null) {
+      toolWindowListenerConnection = project.messageBus.connect()
+      toolWindowListenerConnection!!.subscribe(ToolWindowManagerListener.TOPIC, ToolWindowPositioningListener { positionPanel() })
+    }
   }
 
   override fun close() {

src/main/java/com/maddyhome/idea/vim/ui/ToolWindowPositioningListener.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2003-2026 The IdeaVim authors
+ *
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE.txt file or at
+ * https://opensource.org/licenses/MIT.
+ */
+
+package com.maddyhome.idea.vim.ui
+
+import com.intellij.openapi.wm.ToolWindowManager
+import com.intellij.openapi.wm.ex.ToolWindowManagerListener
+import javax.swing.SwingUtilities
+
+/**
+ * Repositions a panel whenever a tool window visibility state changes.
+ * Shared between [com.maddyhome.idea.vim.ui.ex.ExEntryPanel] and [OutputPanel].
+ */
+internal class ToolWindowPositioningListener(private val reposition: () -> Unit) : ToolWindowManagerListener {
+  override fun stateChanged(toolWindowManager: ToolWindowManager) {
+    SwingUtilities.invokeLater(reposition)
+  }
+}

src/main/java/com/maddyhome/idea/vim/ui/ex/ExEntryPanel.kt

@@ -15,9 +15,11 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.colors.EditorColors
 import com.intellij.openapi.wm.IdeFocusManager
+import com.intellij.openapi.wm.ex.ToolWindowManagerListener
 import com.intellij.openapi.wm.impl.ToolWindowManagerImpl
 import com.intellij.ui.DocumentAdapter
 import com.intellij.util.IJSwingUtilities
+import com.intellij.util.messages.MessageBusConnection
 import com.maddyhome.idea.vim.EventFacade
 import com.maddyhome.idea.vim.KeyHandler.Companion.getInstance
 import com.maddyhome.idea.vim.VimPlugin
@@ -39,6 +41,7 @@ import com.maddyhome.idea.vim.key.interceptors.VimInputInterceptor
 import com.maddyhome.idea.vim.newapi.IjVimCaret
 import com.maddyhome.idea.vim.newapi.IjVimEditor
 import com.maddyhome.idea.vim.ui.ExPanelBorder
+import com.maddyhome.idea.vim.ui.ToolWindowPositioningListener
 import com.maddyhome.idea.vim.vimscript.model.commands.Command
 import com.maddyhome.idea.vim.vimscript.model.commands.GlobalCommand
 import com.maddyhome.idea.vim.vimscript.model.commands.SubstituteCommand
@@ -143,6 +146,11 @@ class ExEntryPanel private constructor() : JPanel(), VimCommandLine {
       glassPane.setOpaque(false)
       glassPane.add(this)
       glassPane.addComponentListener(resizePanelListener)
+      val project = editor.project
+      if (project != null) {
+        toolWindowListenerConnection = project.messageBus.connect()
+        toolWindowListenerConnection!!.subscribe(ToolWindowManagerListener.TOPIC, ToolWindowPositioningListener { positionPanel() })
+      }
       positionPanel()
       glassPane.isVisible = true
       putClientProperty(ToolWindowManagerImpl.PARENT_COMPONENT, parent)
@@ -195,6 +203,8 @@ class ExEntryPanel private constructor() : JPanel(), VimCommandLine {
 
         putClientProperty(ToolWindowManagerImpl.PARENT_COMPONENT, null)
         oldGlass!!.removeComponentListener(resizePanelListener)
+        toolWindowListenerConnection?.disconnect()
+        toolWindowListenerConnection = null
         oldGlass!!.isVisible = false
         oldGlass!!.remove(this)
         oldGlass!!.setOpaque(wasOpaque)
@@ -510,6 +520,8 @@ class ExEntryPanel private constructor() : JPanel(), VimCommandLine {
     }
   }
 
+  private var toolWindowListenerConnection: MessageBusConnection? = null
+
   init {
 
     val layout = GridBagLayout()

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

@@ -0,0 +1,43 @@
+package com.maddyhome.idea.vim.vimscript.model.functions.handlers
+
+import com.intellij.openapi.actionSystem.ActionManager
+import com.intellij.openapi.actionSystem.impl.PresentationFactory
+import com.intellij.openapi.actionSystem.impl.Utils
+import com.intellij.openapi.keymap.impl.ActionProcessor
+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.VimInt
+import com.maddyhome.idea.vim.vimscript.model.datatypes.asVimInt
+import com.maddyhome.idea.vim.vimscript.model.functions.BuiltinFunctionHandler
+import java.awt.event.KeyEvent
+
+@VimscriptFunction(name = "isactionenabled")
+internal class IsActionEnabled : BuiltinFunctionHandler<VimInt>() {
+  override fun doFunction(
+    arguments: Arguments,
+    editor: VimEditor,
+    context: ExecutionContext,
+    vimContext: VimLContext,
+  ): VimInt {
+    val action = ActionManager.getInstance().getAction(arguments.getString(0).value)
+    if (action == null) {
+      return false.asVimInt()
+    }
+
+    val presentationFactory = PresentationFactory()
+    val wrappedContext = Utils.createAsyncDataContext(context.ij)
+    val actionProcessor = object : ActionProcessor() {}
+    val inputEventAdjusted = KeyEvent(editor.ij.contentComponent, KeyEvent.KEY_PRESSED, 0L, 0, KeyEvent.VK_UNDEFINED, '\u0000')
+
+    val updateEvent = Utils.runUpdateSessionForInputEvent(listOf(action), inputEventAdjusted, wrappedContext, "IdeaVim", actionProcessor, presentationFactory) { _, updater, events ->
+      val presentation = updater(action)
+      events[presentation]
+    }
+
+    val result = updateEvent != null && updateEvent.presentation.isEnabled
+    return result.asVimInt()
+  }
+}

src/main/resources/ksp-generated/frontend_vimscript_functions.json

@@ -1,4 +1,5 @@
 {
   "has": "com.maddyhome.idea.vim.vimscript.model.functions.handlers.HasFunctionHandler",
+  "isactionenabled": "com.maddyhome.idea.vim.vimscript.model.functions.handlers.IsActionEnabled",
   "pumvisible": "com.maddyhome.idea.vim.vimscript.model.functions.handlers.PopupMenuVisibleFunctionHandler"
 }

src/test/java/org/jetbrains/plugins/ideavim/action/motion/search/SearchEntryFwdActionTest.kt

@@ -8,12 +8,14 @@
 
 package org.jetbrains.plugins.ideavim.action.motion.search
 
+import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.state.mode.Mode
 import com.maddyhome.idea.vim.state.mode.SelectionType
 import com.maddyhome.idea.vim.ui.ex.ExEntryPanel
 import org.jetbrains.plugins.ideavim.VimTestCase
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
@@ -27,6 +29,14 @@ class SearchEntryFwdActionTest : VimTestCase() {
     assertStatusLineCleared()
   }
 
+  @Test
+  fun `test search not found shows only error message on output panel`() {
+    configureByText("lorem ipsum dolor sit amet")
+    enterSearch("nonexistent")
+    val panelText = injector.outputPanel.getCurrentOutputPanel()?.text ?: ""
+    assertEquals("E486: Pattern not found: nonexistent", panelText)
+  }
+
   @Test
   fun `search in visual mode`() {
     doTest(

src/test/java/org/jetbrains/plugins/ideavim/action/motion/search/SearchWholeWordForwardActionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -65,6 +65,49 @@ class SearchWholeWordForwardActionTest : VimTestCase() {
     )
   }
 
+  @Test
+  fun `test repeated star search wraps around`() {
+    configureByText(
+      """
+      aaa
+      abc
+      def
+      abc
+      dfg
+      abc
+      agg
+      abc
+      xyz
+      """.trimIndent(),
+    )
+    typeText("5j") // move to line 5, "abc"
+    assertPosition(5, 0)
+
+    typeText("*")
+    assertPosition(7, 0) // next "abc" forward
+
+    typeText("*")
+    assertPosition(1, 0) // wraps to first "abc"
+
+    typeText("*")
+    assertPosition(3, 0)
+
+    typeText("*")
+    assertPosition(5, 0)
+
+    typeText("*")
+    assertPosition(7, 0)
+
+    typeText("*")
+    assertPosition(1, 0) // wraps again
+
+    typeText("*")
+    assertPosition(3, 0)
+
+    typeText("*")
+    assertPosition(5, 0)
+  }
+
   @Test
   fun `test last word`() {
     doTest(

src/test/java/org/jetbrains/plugins/ideavim/ex/AddressTest.kt

@@ -169,4 +169,31 @@ class AddressTest : VimTestCase() {
     typeText(commandToKeys("/bar//foo/d"))
     assertState("a\nfoo\nbar\nbar\nbaz\n")
   }
+
+  @Test
+  fun `test backslash-slash range without previous search reports E35`() {
+    // Before this fix, using \/ with no previous search caused a NullPointerException instead of E35
+    configureByText("1\n2\n3\n")
+    typeText(commandToKeys("\\/d"))
+    assertPluginError(true)
+    assertPluginErrorMessage("E35: No previous regular expression")
+  }
+
+  @Test
+  fun `test backslash-question range without previous search reports E35`() {
+    // Before this fix, using \? with no previous search caused a NullPointerException instead of E35
+    configureByText("1\n2\n3\n")
+    typeText(commandToKeys("\\?d"))
+    assertPluginError(true)
+    assertPluginErrorMessage("E35: No previous regular expression")
+  }
+
+  @Test
+  fun `test backslash-ampersand range without previous substitute reports E33`() {
+    // Before this fix, using \& with no previous substitute caused a NullPointerException instead of E33
+    configureByText("1\n2\n3\n")
+    typeText(commandToKeys("\\&d"))
+    assertPluginError(true)
+    assertPluginErrorMessage("E33: No previous substitute regular expression")
+  }
 }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/HistoryCommandTest.kt

@@ -224,17 +224,6 @@ class HistoryCommandTest : VimTestCase() {
     )
   }
 
-  @Test
-  fun `test history cmd lists empty command history`() {
-    assertCommandOutput(
-      "history cmd",
-      """
-        |      #  cmd history
-        |>     1  history cmd
-      """.trimMargin()
-    )
-  }
-
   @Test
   fun `test history cmd lists current cmd in history`() {
     assertCommandOutput(
@@ -499,7 +488,7 @@ class HistoryCommandTest : VimTestCase() {
 
 
   @Test
-  fun `test history search with first number lists single entry from saerch history`() {
+  fun `test history search with first number lists single entry from search history`() {
     repeat(10) { i -> enterSearch("foo${i + 1}") }
     injector.outputPanel.getCurrentOutputPanel()?.clearText()
     assertCommandOutput(

tests/property-tests/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
   testImplementation("org.jetbrains.kotlin:kotlin-test:$kotlinVersion")
   testImplementation(testFixtures(project(":"))) // The root project
   testImplementation("org.junit.vintage:junit-vintage-engine:6.0.3")
+  testImplementation("org.jetbrains:jetCheck:0.2.3")
 
   intellijPlatform {
     // Snapshots don't use installers

tests/split-mode-tests/src/test/kotlin/com/maddyhome/idea/vim/split/FileOpsSplitTest.kt

@@ -17,7 +17,6 @@ class FileOpsSplitTest : IdeaVimStarterTestBase() {
   @Test
   fun `save file with write command`() {
     openFile(createFile("src/Save1.txt", "Line 1\nLine 2\nLine 3\n"))
-    clickEditor()
     typeVimAndEscape("0iSAVED ")
     pause()
     exCommand("w")

tests/split-mode-tests/src/test/kotlin/com/maddyhome/idea/vim/split/IdeaVimStarterTestBase.kt

@@ -29,7 +29,6 @@ import com.intellij.ide.starter.plugins.PluginConfigurator
 import com.intellij.ide.starter.project.LocalProjectInfo
 import com.intellij.ide.starter.runner.Starter
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
 import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeAll
@@ -125,9 +124,45 @@ abstract class IdeaVimStarterTestBase {
 
   // ── IDE interaction helpers ─────────────────────────────────
 
-  /** Opens a file in the editor by relative path. */
+  /** Opens a file in the editor by relative path and waits until the editor is ready for input. */
   protected fun openFile(relativePath: String) {
     driver.withContext { openFile(relativePath) }
+    ensureEditorReady(relativePath)
+  }
+
+  private fun ensureEditorReady(relativePath: String, timeoutMs: Long = 10_000) {
+    val deadline = System.currentTimeMillis() + timeoutMs
+    var lastText = ""
+    while (System.currentTimeMillis() < deadline) {
+      try {
+        lastText = editorText()
+        if (lastText.isNotBlank()) break
+      } catch (_: Exception) {
+        // Editor component not yet available — retry
+      }
+      Thread.sleep(200)
+    }
+    check(lastText.isNotBlank()) {
+      "Editor for '$relativePath' did not become ready within ${timeoutMs}ms"
+    }
+    clickEditor()
+
+    // Verify IdeaVim's key handler is actually attached by sending `gg` (go to first line)
+    // and checking the caret moves to line 1. This confirms vim is processing keystrokes.
+    val vimReady = waitUntil(timeoutMs = 10_000, pollMs = 500) {
+      try {
+        driver.withContext {
+          ideFrame { codeEditor().apply { waitFound(); keyboard { typeText("gg") } } }
+        }
+        Thread.sleep(300)
+        caretLine() <= 1
+      } catch (_: Exception) {
+        false
+      }
+    }
+    check(vimReady) {
+      "IdeaVim key handler did not attach for '$relativePath' within timeout"
+    }
   }
 
   /** Types vim keys in the active editor. */
@@ -177,6 +212,27 @@ abstract class IdeaVimStarterTestBase {
     }
   }
 
+  /** Triggers the IDE "Navigate > Back" action (Cmd+[ on macOS, Ctrl+Alt+Left on Linux). */
+  protected fun ideaGoBack() {
+    driver.withContext {
+      ideFrame {
+        codeEditor().apply {
+          if (System.getProperty("os.name").lowercase().contains("mac")) {
+            keyboard { hotKey(java.awt.event.KeyEvent.VK_META, java.awt.event.KeyEvent.VK_OPEN_BRACKET) }
+          } else {
+            keyboard {
+              hotKey(
+                java.awt.event.KeyEvent.VK_CONTROL,
+                java.awt.event.KeyEvent.VK_ALT,
+                java.awt.event.KeyEvent.VK_LEFT
+              )
+            }
+          }
+        }
+      }
+    }
+  }
+
   /** Presses Ctrl-G (file info). */
   protected fun ctrlG() {
     driver.withContext {
@@ -207,6 +263,23 @@ abstract class IdeaVimStarterTestBase {
     Thread.sleep(ms)
   }
 
+  /**
+   * Retries [check] every [pollMs] until it returns true or [timeoutMs] elapses.
+   * Use instead of fixed pauses to handle variable split-mode RPC latency on CI.
+   */
+  protected fun waitUntil(
+    timeoutMs: Long = 5000,
+    pollMs: Long = 200,
+    check: () -> Boolean,
+  ): Boolean {
+    val deadline = System.currentTimeMillis() + timeoutMs
+    while (System.currentTimeMillis() < deadline) {
+      if (check()) return true
+      Thread.sleep(pollMs)
+    }
+    return false
+  }
+
   // ── Editor state helpers ────────────────────────────────────
 
   /** Reads the current editor text. */
@@ -229,42 +302,48 @@ abstract class IdeaVimStarterTestBase {
 
   // ── Assertions ──────────────────────────────────────────────
 
-  /** Asserts the editor contains the given text. */
+  /** Asserts the editor contains the given text, polling until timeout. */
   protected fun assertEditorContains(expected: String, message: String? = null) {
-    val text = editorText()
-    assertTrue(text.contains(expected)) {
+    var text = ""
+    val found = waitUntil { text = editorText(); text.contains(expected) }
+    assertTrue(found) {
       (message ?: "Editor should contain '$expected'") + ". Actual: $text"
     }
   }
 
-  /** Asserts the editor does NOT contain the given text. */
+  /** Asserts the editor does NOT contain the given text, polling until timeout. */
   protected fun assertEditorNotContains(unexpected: String, message: String? = null) {
+    // Give operations time to settle, then check
+    pause(1000)
     val text = editorText()
     assertFalse(text.contains(unexpected)) {
       (message ?: "Editor should not contain '$unexpected'") + ". Actual: $text"
     }
   }
 
-  /** Asserts the caret is at the given line (1-based). */
+  /** Asserts the caret is at the given line (1-based), polling until timeout. */
   protected fun assertCaretAtLine(expected: Int, message: String? = null) {
-    val actual = caretLine()
-    assertEquals(expected, actual) {
+    var actual = 0
+    val found = waitUntil { actual = caretLine(); actual == expected }
+    assertTrue(found) {
       (message ?: "Caret should be at line $expected") + ". Actual line: $actual"
     }
   }
 
-  /** Asserts the caret is before the given line. */
+  /** Asserts the caret is before the given line, polling until timeout. */
   protected fun assertCaretBefore(line: Int, message: String? = null) {
-    val actual = caretLine()
-    assertTrue(actual < line) {
+    var actual = 0
+    val found = waitUntil { actual = caretLine(); actual < line }
+    assertTrue(found) {
       (message ?: "Caret should be before line $line") + ". Actual line: $actual"
     }
   }
 
-  /** Asserts the caret is past the given line. */
+  /** Asserts the caret is past the given line, polling until timeout. */
   protected fun assertCaretAfter(line: Int, message: String? = null) {
-    val actual = caretLine()
-    assertTrue(actual > line) {
+    var actual = 0
+    val found = waitUntil { actual = caretLine(); actual > line }
+    assertTrue(found) {
       (message ?: "Caret should be after line $line") + ". Actual line: $actual"
     }
   }

tests/split-mode-tests/src/test/kotlin/com/maddyhome/idea/vim/split/JumpNavigationSplitTest.kt

@@ -46,4 +46,21 @@ class JumpNavigationSplitTest : IdeaVimStarterTestBase() {
     pause()
     assertCaretBefore(10, "Ctrl-O should jump back near start after search")
   }
+
+  @Test
+  fun `IDE Back navigation records jump so apostrophe mark navigates back`() {
+    openFile(longFile("Jump3"))
+
+    typeVim("G")
+    pause(300)
+    assertCaretAfter(40, "G should move to end of file")
+
+    ideaGoBack()
+    pause(500)
+    assertCaretBefore(10, "IDE Back should return to start of file")
+
+    typeVim("''")
+    pause(300)
+    assertCaretAfter(40, "'' should return to position before IDE Back (end of file)")
+  }
 }

tests/split-mode-tests/src/test/kotlin/com/maddyhome/idea/vim/split/RepeatUndoSplitTest.kt

@@ -20,10 +20,14 @@ class RepeatUndoSplitTest : IdeaVimStarterTestBase() {
     typeVimAndEscape("0sX")
     assertEditorContains("Xbcdef", "First char should be X")
 
-    typeVim("l.")
+    typeVim("l")
+    pause()
+    typeVim(".")
     assertEditorContains("XXcdef", "Second char should also be X")
 
-    typeVim("uu")
+    typeVim("u")
+    pause()
+    typeVim("u")
     assertEditorContains("Xbcdef", "First undo should revert dot-repeat only")
   }
 
@@ -38,8 +42,9 @@ class RepeatUndoSplitTest : IdeaVimStarterTestBase() {
     assertEditorContains("HiHi", "Dot repeat should insert again")
 
     typeVim("u")
-    val text = editorText()
-    assertTrue(text.contains("Hi ") && !text.contains("HiHi")) {
+    var text = ""
+    val found = waitUntil { text = editorText(); text.contains("Hi ") && !text.contains("HiHi") }
+    assertTrue(found) {
       "Undo should revert dot repeat only. Actual: $text"
     }
   }
@@ -51,8 +56,11 @@ class RepeatUndoSplitTest : IdeaVimStarterTestBase() {
     typeVimAndEscape("0cwHELLO")
     assertEditorContains("HELLO", "Should have changed word")
 
-    typeVim("w.")
-    val helloCount = editorText().lines().first().split("HELLO").size - 1
+    typeVim("w")
+    pause()
+    typeVim(".")
+    var helloCount = 0
+    waitUntil { helloCount = editorText().lines().first().split("HELLO").size - 1; helloCount >= 2 }
     assertTrue(helloCount >= 2) { "Should have two HELLOs. Actual: ${editorText()}" }
 
     typeVim("u")

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimFileBase.kt

@@ -15,14 +15,12 @@ import com.maddyhome.idea.vim.helper.endOffsetInclusive
 import com.maddyhome.idea.vim.state.mode.SelectionType.CHARACTER_WISE
 import com.maddyhome.idea.vim.state.mode.inVisualMode
 import com.maddyhome.idea.vim.state.mode.selectionType
-import java.lang.Long.toHexString
-
 abstract class VimFileBase : VimFile {
   override fun displayHexInfo(editor: VimEditor) {
     val offset = editor.currentCaret().offset
     val ch = editor.text()[offset]
 
-    injector.messages.showMessage(editor, toHexString(ch.code.toLong()))
+    injector.messages.showMessage(editor, ch.code.toString(16))
   }
 
   override fun displayLocationInfo(editor: VimEditor) {

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimMarkService.kt

@@ -150,6 +150,13 @@ interface VimMarkService {
    */
   fun loadLegacyState(element: Any) {}
 
+  /**
+   * Sets the BEFORE_JUMP_MARK directly from a position, without requiring an open editor or caret.
+   * Used by jump listeners that receive position data from the IDE navigation history.
+   * Default no-op; implementations that maintain local mark state should override this.
+   */
+  fun setJumpMark(filepath: String, protocol: String, line: Int, col: Int) {}
+
   fun isValidMark(char: Char, operation: Operation, isCaretPrimary: Boolean): Boolean
 
   enum class Operation {

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimMarkServiceBase.kt

@@ -248,6 +248,10 @@ abstract class VimMarkServiceBase : VimMarkService {
     return setMark(caret, mark)
   }
 
+  override fun setJumpMark(filepath: String, protocol: String, line: Int, col: Int) {
+    getLocalMarks(filepath)[BEFORE_JUMP_MARK] = VimMark(BEFORE_JUMP_MARK, line, col, filepath, protocol)
+  }
+
   protected open fun createGlobalMark(editor: VimEditor, char: Char, offset: Int): Mark? {
     val markChar = char.normalizeMarkChar()
     if (!markChar.isGlobalMark()) return null

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimMessages.kt

@@ -20,10 +20,18 @@ interface VimMessages {
 
   /**
    * Displays an error message to the user (typically in red).
+   * Clears any existing output panel content before showing the message.
    * The message panel closes on any keystroke and passes the key through to the editor.
    */
   fun showErrorMessage(editor: VimEditor, message: String?)
 
+  /**
+   * Appends an error message to the existing output panel content (typically in red).
+   * Unlike [showErrorMessage], this does not clear prior output.
+   * Use this when reporting errors during script execution where earlier output should be preserved.
+   */
+  fun appendErrorMessage(editor: VimEditor, message: String?)
+
   /**
    * Legacy method for displaying messages.
    * @deprecated Use [showMessage] or [showErrorMessage] instead.

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimOutputPanelService.kt

@@ -34,4 +34,9 @@ interface VimOutputPanelService {
     text: String,
     messageType: MessageType = MessageType.STANDARD,
   )
+
+  fun clear(
+    editor: VimEditor,
+    context: ExecutionContext,
+  )
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimOutputPanelServiceBase.kt

@@ -18,4 +18,12 @@ abstract class VimOutputPanelServiceBase : VimOutputPanelService {
     panel.addText(text, true, messageType)
     panel.show()
   }
+
+  override fun clear(
+    editor: VimEditor,
+    context: ExecutionContext,
+  ) {
+    val panel = getOrCreate(editor, context)
+    panel.clearText()
+  }
 }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimScriptExecutorBase.kt

@@ -65,13 +65,13 @@ abstract class VimScriptExecutorBase : VimscriptExecutor {
           }
           finalResult = ExecutionResult.Error
           if (indicateErrors) {
-            injector.messages.showErrorMessage(editor, e.message)
+            injector.messages.appendErrorMessage(editor, e.message)
           } else {
             logger.warn("Failed while executing $unit. " + e.message)
           }
         } catch (e: NotImplementedError) {
           if (indicateErrors) {
-            injector.messages.showErrorMessage(editor, "Not implemented yet :(")
+            injector.messages.appendErrorMessage(editor, "Not implemented yet :(")
           }
         } catch (e: Exception) {
           logger.warn(e.toString())

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/api/VimSearchGroupBase.kt

@@ -653,7 +653,9 @@ abstract class VimSearchGroupBase : VimSearchGroup {
       caret.moveToOffset(matchRange.startOffset)
       val highlight = addSubstitutionConfirmationHighlight(editor, matchRange.startOffset, matchRange.endOffset)
       injector.modalInput.create(
-        editor, context, injector.messages.message("command.substitute.replace.with.prompt", lineToNextSubstitute.second.second),
+        editor,
+        context,
+        injector.messages.message("command.substitute.replace.with.prompt", lineToNextSubstitute.second.second),
         SubstituteWithAskInputInterceptor(
           editor, caret, nextSubstitute, highlight, line, 0, parent, pattern, regex,
           oldLastSubstituteString, line2, hasExpression, substituteString, options,
@@ -854,7 +856,7 @@ abstract class VimSearchGroupBase : VimSearchGroup {
       if (lastMatchLine != -1) {
         caret.moveToOffset(injector.motion.moveCaretToLineStartSkipLeading(editor, lastMatchLine))
       } else {
-        injector.messages.showStatusBarMessage(null, "E486: Pattern not found: $pattern")
+        injector.messages.showErrorMessage(editor, "E486: Pattern not found: $pattern")
       }
     }
 
@@ -863,7 +865,7 @@ abstract class VimSearchGroupBase : VimSearchGroup {
     // todo throw multiple exceptions at once
     if (exceptions.isNotEmpty()) {
       injector.messages.indicateError()
-      injector.messages.showStatusBarMessage(null, exceptions[0].message)
+      injector.messages.showErrorMessage(editor, exceptions[0].message)
     }
   }
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/ex/ranges/Address.kt

@@ -204,7 +204,7 @@ private class SearchAddress(pattern: String, offset: Int, move: Boolean) : Addre
     private val logger = vimLogger<SearchAddress>()
   }
 
-  private val patterns: MutableList<String?> = mutableListOf()
+  private val patterns: MutableList<String> = mutableListOf()
   private val directions: MutableList<Direction> = mutableListOf()
 
   init {
@@ -216,17 +216,17 @@ private class SearchAddress(pattern: String, offset: Int, move: Boolean) : Addre
       var pat = tok.nextToken()
       when (pat) {
         "\\/" -> {
-          patterns.add(injector.searchGroup.lastSearchPattern)
+          patterns.add(injector.searchGroup.lastSearchPattern ?: throw exExceptionMessage("E35"))
           directions.add(Direction.FORWARDS)
         }
 
         "\\?" -> {
-          patterns.add(injector.searchGroup.lastSearchPattern)
+          patterns.add(injector.searchGroup.lastSearchPattern ?: throw exExceptionMessage("E35"))
           directions.add(Direction.BACKWARDS)
         }
 
         "\\&" -> {
-          patterns.add(injector.searchGroup.lastSubstitutePattern)
+          patterns.add(injector.searchGroup.lastSubstitutePattern ?: throw exExceptionMessage("E33"))
           directions.add(Direction.FORWARDS)
         }
 
@@ -266,7 +266,7 @@ private class SearchAddress(pattern: String, offset: Int, move: Boolean) : Addre
 
       // Note that wrapscan, ignorecase, etc. all come from current option values, as expected
       searchOffset = getSearchOffset(editor, line0, direction)
-      searchOffset = injector.searchGroup.processSearchRange(editor, pattern!!, patternOffset, searchOffset, direction)
+      searchOffset = injector.searchGroup.processSearchRange(editor, pattern, patternOffset, searchOffset, direction)
 
       if (searchOffset == -1) {
         if (injector.options(editor).wrapscan) {

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/helper/EngineModeExtensions.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2023 The IdeaVim authors
+ * Copyright 2003-2026 The IdeaVim authors
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE.txt file or at
@@ -25,9 +25,7 @@ fun VimEditor.exitVisualMode() {
     if (inBlockSelection) {
       removeSecondaryCarets()
     }
-    injector.application.runWriteAction {
-      nativeCarets().forEach(VimCaret::removeSelection)
-    }
+    nativeCarets().forEach(VimCaret::removeSelection)
   }
   if (inVisualMode || inCommandLineModeWithVisual) {
     vimLastSelectionType = selectionType

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/thinapi/TextObjectScopeImpl.kt

@@ -9,6 +9,7 @@
 package com.maddyhome.idea.vim.thinapi
 
 import com.intellij.vim.api.VimApi
+import com.intellij.vim.api.models.CaretId
 import com.intellij.vim.api.scopes.TextObjectRange
 import com.intellij.vim.api.scopes.TextObjectScope
 import com.maddyhome.idea.vim.KeyHandler
@@ -41,7 +42,7 @@ internal class TextObjectScopeImpl(
     keys: String,
     registerDefaultMapping: Boolean,
     preserveSelectionAnchor: Boolean,
-    rangeProvider: suspend VimApi.(count: Int) -> TextObjectRange?,
+    rangeProvider: suspend VimApi.(caret: CaretId, count: Int) -> TextObjectRange?,
   ) {
     val plugKeys = "<Plug>($pluginName-$keys)"
 
@@ -88,7 +89,7 @@ private class TextObjectExtensionHandler(
   private val listenerOwner: ListenerOwner,
   private val mappingOwner: MappingOwner,
   private val preserveSelectionAnchor: Boolean,
-  private val rangeProvider: suspend VimApi.(count: Int) -> TextObjectRange?,
+  private val rangeProvider: suspend VimApi.(caret: CaretId, count: Int) -> TextObjectRange?,
 ) : ExtensionHandler {
 
   override val isRepeatable: Boolean = false
@@ -130,7 +131,7 @@ private class ApiTextObjectActionHandler(
   private val listenerOwner: ListenerOwner,
   private val mappingOwner: MappingOwner,
   override val preserveSelectionAnchor: Boolean,
-  private val rangeProvider: suspend VimApi.(count: Int) -> TextObjectRange?,
+  private val rangeProvider: suspend VimApi.(caret: CaretId, count: Int) -> TextObjectRange?,
 ) : TextObjectActionHandler() {
 
   // Will be set based on the result of rangeProvider
@@ -149,7 +150,7 @@ private class ApiTextObjectActionHandler(
     val vimApi = VimApiImpl(listenerOwner, mappingOwner, editor.projectId)
 
     // Execute the range provider (suspend lambda bridged via runBlocking for now)
-    val apiRange = kotlinx.coroutines.runBlocking { vimApi.rangeProvider(count) } ?: return null
+    val apiRange = kotlinx.coroutines.runBlocking { vimApi.rangeProvider(CaretId(caret.id), count) } ?: return null
 
     // Convert API range to internal TextRange and set visual type
     return when (apiRange) {

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/DelfunctionCommand.kt

@@ -41,9 +41,7 @@ data class DelfunctionCommand(
       try {
         injector.functionService.deleteFunction(name, scope, this)
       } catch (e: ExException) {
-        if (e.message != null && e.message!!.startsWith("E130")) {
-          // "ignoreIfMissing" flag handles the "E130: Unknown function" exception
-        } else {
+        if (e.code != "E130") {
           throw e
         }
       }

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/commands/GoToLineCommand.kt

@@ -15,7 +15,7 @@ import com.maddyhome.idea.vim.api.injector
 import com.maddyhome.idea.vim.command.OperatorArguments
 import com.maddyhome.idea.vim.ex.ranges.Range
 import com.maddyhome.idea.vim.vimscript.model.ExecutionResult
-import java.lang.Integer.min
+import kotlin.math.min
 
 /**
  * see "h :[range]"

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/vimscript/model/functions/DefinedFunctionHandler.kt

@@ -65,7 +65,7 @@ data class DefinedFunctionHandler(val function: FunctionDeclaration) :
     val returnValue = executeFunctionBody(exceptionsCaught, editor, context)
 
     if (exceptionsCaught.isNotEmpty()) {
-      injector.messages.showErrorMessage(editor, exceptionsCaught.last().message)
+      injector.messages.appendErrorMessage(editor, exceptionsCaught.last().message)
     }
     return returnValue ?: VimInt.ZERO
   }