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-56
+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() {
+  public static @NotNull ChangeGroup getChange() {
-    return VimInjectorKt.getInjector().getChangeGroup();
+    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
+        val fixedKeyStroke = fixKeyStroke(defaultKeyStroke)
-        return 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 ->
+      register("ia", preserveSelectionAnchor = false) { caret, count ->
-        findArgumentRange(isInner = true, count)
+        findArgumentRange(isInner = true, caret, count)
       }
-      register("aa", preserveSelectionAnchor = false) { count ->
+      register("aa", preserveSelectionAnchor = false) { caret, count ->
-        findArgumentRange(isInner = false, 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 allCaretOffsets = editor.caretModel.allCarets.map { it.offset }
-    val highlighter = highlightMatch(editor, range.startOffset, range.endOffset, current, pattern)
+
-    highlighters.add(highlighter)
+  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) {
+  return editor.markupModel.addRangeHighlighter(start, end, layer, attributes, targetArea)
-    // 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
-  }
 }
 
 /**

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

@@ -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
@@ -9,9 +9,7 @@
 package com.maddyhome.idea.vim.newapi
 
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.project.Project
+import com.maddyhome.idea.vim.api.MessageType
-import com.intellij.openapi.project.ProjectManager
-import com.intellij.openapi.wm.WindowManager
 import com.maddyhome.idea.vim.api.VimEditor
 import com.maddyhome.idea.vim.api.VimMessagesBase
 import com.maddyhome.idea.vim.api.globalOptions
@@ -25,56 +23,50 @@ internal class IjVimMessages : VimMessagesBase() {
   private var message: String? = null
   private var error = false
   private var lastBeepTimeMillis = 0L
-  private var allowClearStatusBarMessage = true
 
-  override fun showStatusBarMessage(editor: VimEditor?, message: String?) {
+  override fun showMessage(editor: VimEditor, message: String?) {
-    fun setStatusBarMessage(project: Project, message: String?) {
+    injector.outputPanel.clear(editor, injector.executionContextManager.getEditorExecutionContext(editor))
-      WindowManager.getInstance().getStatusBar(project)?.let {
+    showMessageInternal(editor, message, MessageType.STANDARD)
-        it.info = if (message.isNullOrBlank()) "" else "Vim - $message"
-      }
   }
 
+  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()
+  }
+
+  private fun showMessageInternal(editor: VimEditor, message: String?, messageType: MessageType) {
     this.message = message
 
-    val project = editor?.ij?.project
+    if (message.isNullOrBlank()) {
-    if (project != null) {
+      clearStatusBarMessage()
-      setStatusBarMessage(project, message)
+      return
-    } else {
-      // TODO: We really shouldn't set the status bar text for other projects. That's rude.
-      ProjectManager.getInstance().openProjects.forEach {
-        setStatusBarMessage(it, message)
-      }
     }
 
-    // Redraw happens automatically based on changes or scrolling. If we've just set the message (e.g., searching for a
+    val context = injector.executionContextManager.getEditorExecutionContext(editor)
-    // string, hitting the bottom and scrolling to the top), make sure we don't immediately clear it when scrolling.
+    injector.outputPanel.output(editor, context, message, messageType)
-    allowClearStatusBarMessage = false
+  }
-    ApplicationManager.getApplication().invokeLater {
+
-      allowClearStatusBarMessage = true
+  @Suppress("DEPRECATION")
+  override fun showStatusBarMessage(editor: VimEditor?, message: String?) {
+    if (editor != null) {
+      showMessage(editor, message)
+    } else {
+      // Legacy path for when editor is null - just store the message
+      this.message = message
     }
   }
 
   override fun getStatusBarMessage(): String? = message
 
-  // Vim doesn't appear to have a policy about clearing the status bar, other than on "redraw". This can be forced with
-  // <C-L> or the `:redraw` command, but also happens as the screen changes, e.g., when inserting or deleting lines,
-  // scrolling, entering Command-line mode and probably lots more. We should manually clear the status bar when these
-  // things happen.
   override fun clearStatusBarMessage() {
-    val currentMessage = message
+    if (message.isNullOrEmpty()) return
-    if (currentMessage.isNullOrEmpty()) return
+    injector.outputPanel.getCurrentOutputPanel()?.close()
-
-    // Don't clear the status bar message if we've only just set it
-    if (!allowClearStatusBarMessage) return
-
-    ProjectManager.getInstance().openProjects.forEach { project ->
-      WindowManager.getInstance().getStatusBar(project)?.let { statusBar ->
-        // Only clear the status bar if it's showing our last message
-        if (statusBar.info?.contains(currentMessage) == true) {
-          statusBar.info = ""
-        }
-      }
-    }
     message = null
   }
 

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,12 +11,15 @@ 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
+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
@@ -24,7 +27,6 @@ import com.maddyhome.idea.vim.api.MessageType
 import com.maddyhome.idea.vim.api.VimOutputPanel
 import com.maddyhome.idea.vim.api.globalOptions
 import com.maddyhome.idea.vim.api.injector
-import com.maddyhome.idea.vim.diagnostic.VimLogger
 import com.maddyhome.idea.vim.helper.requestFocus
 import com.maddyhome.idea.vim.helper.selectEditorFont
 import com.maddyhome.idea.vim.helper.vimMorePanel
@@ -36,121 +38,167 @@ import java.awt.event.ComponentAdapter
 import java.awt.event.ComponentEvent
 import java.awt.event.KeyAdapter
 import java.awt.event.KeyEvent
-import java.lang.ref.WeakReference
 import javax.swing.JComponent
 import javax.swing.JLabel
-import javax.swing.JRootPane
 import javax.swing.JScrollPane
-import javax.swing.JTextArea
+import javax.swing.JTextPane
 import javax.swing.KeyStroke
 import javax.swing.SwingUtilities
+import javax.swing.text.DefaultCaret
+import javax.swing.text.SimpleAttributeSet
+import javax.swing.text.StyleConstants
+import javax.swing.text.StyledDocument
 import kotlin.math.ceil
 import kotlin.math.min
 
+
 /**
- * This panel displays text in a `more` like window and implements [VimOutputPanel].
+ * Panel that displays text in a `more` like window overlaid on the editor.
  */
-class OutputPanel(editorRef: WeakReference<Editor>) : JBPanel<OutputPanel?>(), VimOutputPanel {
+class OutputPanel private constructor(
-  private val myEditorRef: WeakReference<Editor> = editorRef
+  private val editor: Editor,
-  val editor: Editor? get() = myEditorRef.get()
+) : JBPanel<OutputPanel>(), VimOutputPanel {
 
-  val myLabel: JLabel = JLabel("more")
+  private val textPane = JTextPane()
-  private val myText = JTextArea()
+  private val resizeAdapter: ComponentAdapter
-  private val myScrollPane: JScrollPane =
+  private var defaultForeground: Color? = null
-    JBScrollPane(myText, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER)
-  private val myAdapter: ComponentAdapter
-  private var myLineHeight = 0
 
-  private var myOldGlass: JComponent? = null
+  private var glassPane: JComponent? = null
-  private var myOldLayout: LayoutManager? = null
+  private var originalLayout: LayoutManager? = null
-  private var myWasOpaque = false
+  private var wasOpaque = false
+  private var toolWindowListenerConnection: MessageBusConnection? = null
 
-  var myActive: Boolean = false
+  var active: Boolean = false
+  private val segments = mutableListOf<TextLine>()
 
-  val isActive: Boolean
+  private val labelComponent: JLabel = JLabel("more")
-    get() = myActive
+  private val scrollPane: JScrollPane =
+    JBScrollPane(textPane, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER)
+  private var cachedLineHeight = 0
+  private var isSingleLine = false
 
   init {
-    // Create a text editor for the text and a label for the prompt
+    textPane.isEditable = false
-    val layout = BorderLayout(0, 0)
+    textPane.caret = object : DefaultCaret() {
-    setLayout(layout)
+      override fun setVisible(v: Boolean) {
-    add(myScrollPane, BorderLayout.CENTER)
+        super.setVisible(false)
-    add(myLabel, BorderLayout.SOUTH)
+      }
+    }
+    textPane.highlighter = null
 
-    // Set the text area read only, and support wrap
+    resizeAdapter = object : ComponentAdapter() {
-    myText.isEditable = false
-    myText.setLineWrap(true)
-
-    myAdapter = object : ComponentAdapter() {
       override fun componentResized(e: ComponentEvent?) {
         positionPanel()
       }
     }
 
-    // Setup some listeners to handle keystrokes
+    // Suppress the fancy frame background used in the Islands theme
-    val moreKeyListener = MoreKeyListener()
+    ClientProperty.putRecursive(this, IdeBackgroundUtil.NO_BACKGROUND, true)
-    addKeyListener(moreKeyListener)
-    myText.addKeyListener(moreKeyListener)
 
-    // Suppress the fancy frame background used in the Islands theme, which comes from a custom Graphics implementation
+    // Initialize panel
-    // applied to the IdeRoot, and used to paint all children, including this panel. This client property is checked by
+    setLayout(BorderLayout(0, 0))
-    // JBPanel.getComponentGraphics to give us the original Graphics, opting out of the fancy painting.
+    add(scrollPane, BorderLayout.CENTER)
-    ClientProperty.putRecursive<Boolean?>(this, IdeBackgroundUtil.NO_BACKGROUND, true)
+    add(labelComponent, BorderLayout.SOUTH)
+
+    val keyListener = OutputPanelKeyListener()
+    addKeyListener(keyListener)
+    textPane.addKeyListener(keyListener)
     editor?.let { putClientProperty(ToolWindowManagerImpl.PARENT_COMPONENT, it.component) }
 
     updateUI()
   }
 
-  // Called automatically when the LAF is changed and the component is visible, and manually by the LAF listener handler
   override fun updateUI() {
     super.updateUI()
 
     setBorder(ExPanelBorder())
 
-    // Swing uses a bad pattern of calling updateUI() from the constructor. At this moment, all these variables are null
     @Suppress("SENSELESS_COMPARISON")
-    if (myText != null && myLabel != null && myScrollPane != null) {
+    if (textPane != null && labelComponent != null && scrollPane != null) {
       setFontForElements()
-      myText.setBorder(null)
+      textPane.setBorder(null)
-      myScrollPane.setBorder(null)
+      scrollPane.setBorder(null)
-      myLabel.setForeground(myText.getForeground())
+      labelComponent.setForeground(textPane.getForeground())
-
-      // Make sure the panel is positioned correctly in case we're changing font size
       positionPanel()
     }
   }
 
   override var text: String
-    get() = myText.text
+    get() = textPane.getText() ?: ""
     set(value) {
-      // ExOutputPanel will strip a trailing newline. We'll do it now so that tests have the same behaviour.
       val newValue = value.removeSuffix("\n")
-      myText.text = newValue
+      segments.clear()
-      val ed = editor
+      if (newValue.isEmpty()) return
-      if (ed != null) {
+      segments.add(TextLine(newValue, null))
-        myText.setFont(selectEditorFont(ed, newValue))
     }
-      myText.setCaretPosition(0)
+
-      if (newValue.isNotEmpty()) {
+  override var label: String
+    get() = labelComponent.text
+    set(value) {
+      labelComponent.text = value
+    }
+
+  /**
+   * Sets styled text with multiple segments, each potentially having a different color.
+   */
+  fun setStyledText(lines: List<TextLine>) {
+    val doc = textPane.styledDocument
+    doc.remove(0, doc.length)
+
+    if (defaultForeground == null) {
+      defaultForeground = textPane.foreground
+    }
+
+    if (lines.size > 1) {
+      setMultiLineText(lines, doc)
+    } else {
+      doc.insertString(doc.length, lines[0].text.removeSuffix("\n"), getLineColor(lines[0]))
+    }
+
+    val fullText = doc.getText(0, doc.length)
+    textPane.setFont(selectEditorFont(editor, fullText))
+    textPane.setCaretPosition(0)
+    if (fullText.isNotEmpty()) {
       activate()
     }
   }
 
-  override var label: String
+  private fun setMultiLineText(
-    get() = myLabel.text ?: ""
+    lines: List<TextLine>,
-    set(value) {
+    doc: StyledDocument,
-      myLabel.text = value
+  ) {
-      val ed = editor
+    for ((index, line) in lines.withIndex()) {
-      if (ed != null) {
+      val text = line.text.removeSuffix("\n")
-        myLabel.setFont(selectEditorFont(ed, value))
+      val attrs = getLineColor(line)
+      val separator = if (index < lines.size - 1) "\n" else ""
+      doc.insertString(doc.length, text + separator, attrs)
     }
   }
 
+  private fun getLineColor(segment: TextLine): SimpleAttributeSet {
+    val attrs = SimpleAttributeSet()
+    val color = segment.color ?: defaultForeground
+    if (color != null) {
+      StyleConstants.setForeground(attrs, color)
+    }
+    return attrs
+  }
+
   override fun addText(text: String, isNewLine: Boolean, messageType: MessageType) {
-    if (this.text.isNotEmpty() && isNewLine) {
+    val color = when (messageType) {
-      this.text += "\n$text"
+      MessageType.ERROR -> JBColor.RED
-    } else {
+      MessageType.STANDARD -> null
-      this.text += text
+    }
+    segments.add(TextLine(text, color))
+  }
+
+  override fun show() {
+    val currentPanel = injector.outputPanel.getCurrentOutputPanel()
+    if (currentPanel != null && currentPanel != this) currentPanel.close()
+
+    setStyledText(segments)
+    if (!active) {
+      activate()
     }
   }
 
@@ -159,20 +207,15 @@ class OutputPanel(editorRef: WeakReference<Editor>) : JBPanel<OutputPanel?>(), V
   }
 
   override fun clearText() {
+    segments.clear()
+  }
+
+  fun clear() {
     text = ""
   }
 
-  override fun show() {
-    editor ?: return
-    val currentPanel = injector.outputPanel.getCurrentOutputPanel()
-    if (currentPanel != null && currentPanel != this) currentPanel.close()
-
-    if (!myActive) {
-      activate()
-    }
-  }
-
   override fun handleKey(key: KeyStroke) {
+
     if (isAtEnd) {
       close(key)
       return
@@ -197,183 +240,77 @@ class OutputPanel(editorRef: WeakReference<Editor>) : JBPanel<OutputPanel?>(), V
 
   override fun getForeground(): Color? {
     @Suppress("SENSELESS_COMPARISON")
-    if (myText == null) {
+    if (textPane == null) {
-      // Swing uses a bad pattern of calling getForeground() from the constructor. At this moment, `myText` is null.
       return super.getForeground()
     }
-    return myText.getForeground()
+    return textPane.getForeground()
   }
 
   override fun getBackground(): Color? {
     @Suppress("SENSELESS_COMPARISON")
-    if (myText == null) {
+    if (textPane == null) {
-      // Swing uses a bad pattern of calling getBackground() from the constructor. At this moment, `myText` is null.
       return super.getBackground()
     }
-    return myText.getBackground()
+    return textPane.getBackground()
   }
 
   /**
-   * Turns off the ex entry field and optionally puts the focus back to the original component
+   * Turns off the output panel and optionally puts the focus back to the original component.
    */
   fun deactivate(refocusOwningEditor: Boolean) {
-    if (!myActive) return
+    if (!active) return
-    myActive = false
+    active = false
-    myText.text = ""
+    clearText()
-    val ed = editor
+    textPane.text = ""
-    if (refocusOwningEditor && ed != null) {
+    if (refocusOwningEditor) {
-      requestFocus(ed.contentComponent)
+      requestFocus(editor.contentComponent)
     }
-    if (myOldGlass != null) {
+    if (glassPane != null) {
-      myOldGlass!!.removeComponentListener(myAdapter)
+      glassPane!!.removeComponentListener(resizeAdapter)
-      myOldGlass!!.isVisible = false
+      toolWindowListenerConnection?.disconnect()
-      myOldGlass!!.remove(this)
+      toolWindowListenerConnection = null
-      myOldGlass!!.setOpaque(myWasOpaque)
+      glassPane!!.isVisible = false
-      myOldGlass!!.setLayout(myOldLayout)
+      glassPane!!.remove(this)
+      glassPane!!.setOpaque(wasOpaque)
+      glassPane!!.setLayout(originalLayout)
     }
   }
 
   /**
-   * Turns on the more window for the given editor
+   * Turns on the output panel for the given editor.
    */
   fun activate() {
-    val ed = editor ?: return
+    disableOldGlass()
-    val root = SwingUtilities.getRootPane(ed.contentComponent)
-    deactivateOldGlass(root)
 
     setFontForElements()
     positionPanel()
 
-    if (myOldGlass != null) {
+    if (glassPane != null) {
-      myOldGlass!!.isVisible = true
+      glassPane!!.isVisible = true
     }
 
-    myActive = true
+    active = true
-    requestFocus(myText)
+    if (isSingleLine) return
+
+    requestFocus(textPane)
   }
 
-  private fun deactivateOldGlass(root: JRootPane?) {
+  private fun disableOldGlass() {
-    if (root == null) return
+    val root = SwingUtilities.getRootPane(editor.contentComponent) ?: return
-    myOldGlass = root.getGlassPane() as JComponent?
+    glassPane = root.getGlassPane() as JComponent?
-    if (myOldGlass != null) {
+    if (glassPane == null) {
-      myOldLayout = myOldGlass!!.layout
-      myWasOpaque = myOldGlass!!.isOpaque
-      myOldGlass!!.setLayout(null)
-      myOldGlass!!.setOpaque(false)
-      myOldGlass!!.add(this)
-      myOldGlass!!.addComponentListener(myAdapter)
-    }
-  }
-
-  private fun setFontForElements() {
-    val ed = editor ?: return
-    myText.setFont(selectEditorFont(ed, myText.getText()))
-    myLabel.setFont(selectEditorFont(ed, myLabel.text))
-  }
-
-  override fun scrollLine() {
-    scrollOffset(myLineHeight)
-  }
-
-  override fun scrollPage() {
-    scrollOffset(myScrollPane.getVerticalScrollBar().visibleAmount)
-  }
-
-  override fun scrollHalfPage() {
-    val sa = myScrollPane.getVerticalScrollBar().visibleAmount / 2.0
-    val offset = ceil(sa / myLineHeight) * myLineHeight
-    scrollOffset(offset.toInt())
-  }
-
-  fun onBadKey() {
-    val ed = editor ?: return
-    myLabel.setText(injector.messages.message("message.ex.output.more.prompt.full"))
-    myLabel.setFont(selectEditorFont(ed, myLabel.text))
-  }
-
-  private fun scrollOffset(more: Int) {
-    val ed = editor ?: return
-    val `val` = myScrollPane.getVerticalScrollBar().value
-    myScrollPane.getVerticalScrollBar().setValue(`val` + more)
-    myScrollPane.getHorizontalScrollBar().setValue(0)
-    if (isAtEnd) {
-      myLabel.setText(injector.messages.message("message.ex.output.end.prompt"))
-    } else {
-      myLabel.setText(injector.messages.message("message.ex.output.more.prompt"))
-    }
-    myLabel.setFont(selectEditorFont(ed, myLabel.text))
-  }
-
-  val isAtEnd: Boolean
-    get() {
-      val isSingleLine = myText.getLineCount() == 1
-      if (isSingleLine) return true
-      val scrollBar = myScrollPane.getVerticalScrollBar()
-      val value = scrollBar.value
-      if (!scrollBar.isVisible) {
-        return true
-      }
-      return value >= scrollBar.maximum - scrollBar.visibleAmount ||
-        scrollBar.maximum <= scrollBar.visibleAmount
-    }
-
-  private fun positionPanel() {
-    val ed = editor ?: return
-    val contentComponent = ed.contentComponent
-    val scroll = SwingUtilities.getAncestorOfClass(JScrollPane::class.java, contentComponent)
-    val rootPane = SwingUtilities.getRootPane(contentComponent)
-    if (scroll == null || rootPane == null) {
-      // These might be null if we're invoked during component initialisation and before it's been added to the tree
       return
     }
-
+    originalLayout = glassPane!!.layout
-    size = scroll.size
+    wasOpaque = glassPane!!.isOpaque
-
+    glassPane!!.setLayout(null)
-    myLineHeight = myText.getFontMetrics(myText.getFont()).height
+    glassPane!!.setOpaque(false)
-    val count: Int = countLines(myText.getText())
+    glassPane!!.add(this)
-    val visLines = size.height / myLineHeight - 1
+    glassPane!!.addComponentListener(resizeAdapter)
-    val lines = min(count, visLines)
+    val project = editor.project
-    setSize(
+    if (project != null) {
-      size.width,
+      toolWindowListenerConnection = project.messageBus.connect()
-      lines * myLineHeight + myLabel.getPreferredSize().height + border.getBorderInsets(this).top * 2
+      toolWindowListenerConnection!!.subscribe(ToolWindowManagerListener.TOPIC, ToolWindowPositioningListener { positionPanel() })
-    )
-
-    val height = size.height
-    val bounds = scroll.bounds
-    bounds.translate(0, scroll.getHeight() - height)
-    bounds.height = height
-    val pos = SwingUtilities.convertPoint(scroll.getParent(), bounds.location, rootPane.getGlassPane())
-    bounds.location = pos
-    setBounds(bounds)
-
-    myScrollPane.getVerticalScrollBar().setValue(0)
-    if (!injector.globalOptions().more) {
-      // FIX
-      scrollOffset(100000)
-    } else {
-      scrollOffset(0)
-    }
-  }
-
-  fun close(key: KeyStroke? = null) {
-    val ed = editor ?: return
-    ApplicationManager.getApplication().invokeLater {
-      deactivate(true)
-      val project = ed.project
-      if (project != null && key != null && key.keyChar != '\n') {
-        val keys: MutableList<KeyStroke> = ArrayList(1)
-        keys.add(key)
-        if (LOG.isTrace()) {
-          LOG.trace(
-            "Adding new keys to keyStack as part of playback. State before adding keys: " +
-              getInstance().keyStack.dump()
-          )
-        }
-        getInstance().keyStack.addKeys(keys)
-        val context: ExecutionContext =
-          injector.executionContextManager.getEditorExecutionContext(IjVimEditor(ed))
-        VimPlugin.getMacro().playbackKeys(IjVimEditor(ed), context, 1)
-      }
     }
   }
 
@@ -381,61 +318,88 @@ class OutputPanel(editorRef: WeakReference<Editor>) : JBPanel<OutputPanel?>(), V
     close(null)
   }
 
-  private class MoreKeyListener : KeyAdapter() {
+  fun close(key: KeyStroke?) {
-    /**
+    val passKeyBack = isSingleLine
-     * Invoked when a key has been pressed.
+    ApplicationManager.getApplication().invokeLater {
-     */
+      deactivate(true)
-    override fun keyTyped(e: KeyEvent) {
+      val project = editor.project
-      val currentPanel: VimOutputPanel = injector.outputPanel.getCurrentOutputPanel() ?: return
+      // For single line messages, pass any key back to the editor (including Enter)
-
+      // For multi-line messages, don't pass Enter back (it was used to dismiss)
-      val keyCode = e.getKeyCode()
+      if (project != null && key != null && (passKeyBack || key.keyChar != '\n')) {
-      val keyChar = e.getKeyChar()
+        val keys: MutableList<KeyStroke> = ArrayList(1)
-      val modifiers = e.modifiersEx
+        keys.add(key)
-      val keyStroke = if (keyChar == KeyEvent.CHAR_UNDEFINED)
+        getInstance().keyStack.addKeys(keys)
-        KeyStroke.getKeyStroke(keyCode, modifiers)
+        val context: ExecutionContext =
-      else
+          injector.executionContextManager.getEditorExecutionContext(IjVimEditor(editor))
-        KeyStroke.getKeyStroke(keyChar, modifiers)
+        VimPlugin.getMacro().playbackKeys(IjVimEditor(editor), context, 1)
-      currentPanel.handleKey(keyStroke)
-    }
-  }
-
-  class LafListener : LafManagerListener {
-    override fun lookAndFeelChanged(source: LafManager) {
-      if (VimPlugin.isNotEnabled()) return
-
-      // This listener is only invoked for local scenarios, and we only need to update local editor UI. This will invoke
-      // updateUI on the output pane and it's child components
-      for (vimEditor in injector.editorGroup.getEditors()) {
-        val editor = (vimEditor as IjVimEditor).editor
-        if (!isPanelActive(editor)) continue
-        IJSwingUtilities.updateComponentTreeUI(getInstance(editor))
       }
     }
   }
 
-  companion object {
+  private fun setFontForElements() {
-    private val LOG: VimLogger = injector.getLogger<OutputPanel>(OutputPanel::class.java)
+    textPane.setFont(selectEditorFont(editor, textPane.getText()))
-
+    labelComponent.setFont(selectEditorFont(editor, labelComponent.text))
-    fun getNullablePanel(editor: Editor): OutputPanel? {
-      return editor.vimMorePanel as? OutputPanel
   }
 
-    fun isPanelActive(editor: Editor): Boolean {
+  private fun positionPanel() {
-      return getNullablePanel(editor)?.myActive ?: false
+    val scroll = positionPanelStart() ?: return
+    val lineHeight = textPane.getFontMetrics(textPane.getFont()).height
+    val count = countLines(textPane.getText())
+    val visLines = size.height / lineHeight - 1
+    val lines = min(count, visLines)
+
+    // Simple output: single line that fits entirely - no label needed
+    isSingleLine = count == 1 && count <= visLines
+    labelComponent.isVisible = !isSingleLine
+
+    val extraHeight = if (isSingleLine) 0 else labelComponent.getPreferredSize().height
+    setSize(
+      size.width,
+      lines * lineHeight + extraHeight + border.getBorderInsets(this).top * 2
+    )
+
+    finishPositioning(scroll)
+
+    // Force layout so that viewport sizes are valid before checking scroll state
+    validate()
+
+    // onPositioned
+    cachedLineHeight = lineHeight
+    scrollPane.getVerticalScrollBar().setValue(0)
+    if (!isSingleLine) {
+      if (!injector.globalOptions().more) {
+        scrollOffset(100000)
+      } else {
+        scrollOffset(0)
+      }
+    }
   }
 
-    fun getInstance(editor: Editor): OutputPanel {
+  private fun positionPanelStart(): JScrollPane? {
-      var panel: OutputPanel? = getNullablePanel(editor)
+    val contentComponent = editor.contentComponent
-      if (panel == null) {
+    val scroll = SwingUtilities.getAncestorOfClass(JScrollPane::class.java, contentComponent) as? JScrollPane
-        panel = OutputPanel(WeakReference(editor))
+    val rootPane = SwingUtilities.getRootPane(contentComponent)
-        editor.vimMorePanel = panel
+    if (scroll == null || rootPane == null) {
+      return null
     }
-      return panel
+
+    size = scroll.size
+    return scroll
+  }
+
+  private fun finishPositioning(scroll: JScrollPane) {
+    val rootPane = SwingUtilities.getRootPane(editor.contentComponent)
+    val bounds = scroll.bounds
+    bounds.translate(0, scroll.getHeight() - size.height)
+    bounds.height = size.height
+    val pos = SwingUtilities.convertPoint(scroll.getParent(), bounds.location, rootPane.getGlassPane())
+    bounds.location = pos
+    setBounds(bounds)
   }
 
   private fun countLines(text: String): Int {
     if (text.isEmpty()) {
-        return 0
+      return 1
     }
 
     var count = 0
@@ -450,5 +414,124 @@ class OutputPanel(editorRef: WeakReference<Editor>) : JBPanel<OutputPanel?>(), V
 
     return count
   }
+
+  override fun scrollLine() {
+    scrollOffset(cachedLineHeight)
+  }
+
+  override fun scrollPage() {
+    scrollOffset(scrollPane.getVerticalScrollBar().visibleAmount)
+  }
+
+  override fun scrollHalfPage() {
+    val sa = scrollPane.getVerticalScrollBar().visibleAmount / 2.0
+    val offset = ceil(sa / cachedLineHeight) * cachedLineHeight
+    scrollOffset(offset.toInt())
+  }
+
+  fun onBadKey() {
+    labelComponent.setText(injector.messages.message("message.ex.output.more.prompt.full"))
+    labelComponent.setFont(selectEditorFont(editor, labelComponent.text))
+  }
+
+  private fun scrollOffset(more: Int) {
+    scrollPane.validate()
+    val scrollBar = scrollPane.getVerticalScrollBar()
+    val value = scrollBar.value
+    scrollBar.setValue(value + more)
+    scrollPane.getHorizontalScrollBar().setValue(0)
+
+    // Check if we're at the end or if content fits entirely (nothing to scroll)
+    if (isAtEnd) {
+      labelComponent.setText(injector.messages.message("message.ex.output.end.prompt"))
+    } else {
+      labelComponent.setText(injector.messages.message("message.ex.output.more.prompt"))
+    }
+    labelComponent.setFont(selectEditorFont(editor, labelComponent.text))
+  }
+
+  val isAtEnd: Boolean
+    get() {
+      if (isSingleLine) return true
+      val contentHeight = textPane.preferredSize.height
+      val viewportHeight = scrollPane.viewport.height
+      if (contentHeight <= viewportHeight) return true
+      val scrollBar = scrollPane.getVerticalScrollBar()
+      return scrollBar.value >= scrollBar.maximum - scrollBar.visibleAmount
+    }
+
+  private inner class OutputPanelKeyListener : KeyAdapter() {
+    override fun keyTyped(e: KeyEvent) {
+      val currentPanel: VimOutputPanel = injector.outputPanel.getCurrentOutputPanel() ?: return
+
+      val keyChar = e.keyChar
+      val modifiers = e.modifiersEx
+      val keyStroke = KeyStroke.getKeyStroke(keyChar, modifiers)
+      currentPanel.handleKey(keyStroke)
+    }
+
+    override fun keyPressed(e: KeyEvent) {
+      if (!e.isActionKey && e.keyCode != KeyEvent.VK_ENTER) return
+      val currentPanel = injector.outputPanel.getCurrentOutputPanel() as? OutputPanel ?: return
+
+      val keyCode = e.keyCode
+      val modifiers = e.modifiersEx
+      val keyStroke = KeyStroke.getKeyStroke(keyCode, modifiers)
+
+      if (isSingleLine) {
+        currentPanel.close(keyStroke)
+        e.consume()
+        return
+      }
+
+      // Multi-line mode: arrow keys scroll, down/right at end closes
+      when (keyCode) {
+        KeyEvent.VK_ENTER -> {
+          if (currentPanel.isAtEnd) currentPanel.close() else currentPanel.scrollLine()
+          e.consume()
+        }
+
+        KeyEvent.VK_DOWN -> if (currentPanel.isAtEnd) currentPanel.close(keyStroke) else currentPanel.scrollLine()
+        KeyEvent.VK_RIGHT -> if (currentPanel.isAtEnd) currentPanel.close(keyStroke) else currentPanel.scrollLine()
+        KeyEvent.VK_UP -> currentPanel.scrollOffset(-cachedLineHeight)
+        KeyEvent.VK_LEFT -> currentPanel.scrollOffset(-cachedLineHeight)
+        KeyEvent.VK_PAGE_DOWN -> if (currentPanel.isAtEnd) currentPanel.close(keyStroke) else currentPanel.scrollPage()
+        KeyEvent.VK_PAGE_UP -> currentPanel.scrollOffset(-scrollPane.verticalScrollBar.visibleAmount)
+      }
+    }
+  }
+
+  class LafListener : LafManagerListener {
+    override fun lookAndFeelChanged(source: LafManager) {
+      if (VimPlugin.isNotEnabled()) return
+
+      for (vimEditor in injector.editorGroup.getEditors()) {
+        val editor = (vimEditor as IjVimEditor).editor
+        if (!isPanelActive(editor)) continue
+        IJSwingUtilities.updateComponentTreeUI(getInstance(editor))
+      }
+    }
+  }
+
+  companion object {
+    fun getNullablePanel(editor: Editor): OutputPanel? {
+      return editor.vimMorePanel as OutputPanel?
+    }
+
+    fun isPanelActive(editor: Editor): Boolean {
+      return getNullablePanel(editor) != null
+    }
+
+    fun getInstance(editor: Editor): OutputPanel {
+      var panel: OutputPanel? = getNullablePanel(editor)
+      if (panel == null) {
+        panel = OutputPanel(editor)
+        editor.vimMorePanel = panel
+      }
+      return panel
+    }
   }
 }
+
+
+data class TextLine(val text: String, val color: Color?)

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/ui/ex/IjOutputPanelService.kt

@@ -22,11 +22,11 @@ class IjOutputPanelService : VimOutputPanelServiceBase() {
   private var activeOutputPanel: WeakReference<VimOutputPanel>? = null
 
   override fun getCurrentOutputPanel(): VimOutputPanel? {
-    return activeOutputPanel?.get()?.takeIf { (it as OutputPanel).isActive }
+    return activeOutputPanel?.get()?.takeIf { (it as OutputPanel).active }
   }
 
   override fun create(editor: VimEditor, context: ExecutionContext): VimOutputPanel {
-    val panel = OutputPanel(WeakReference(editor.ij))
+    val panel = OutputPanel.getInstance(editor.ij)
     activeOutputPanel = WeakReference(panel)
     return panel
   }

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/CmdCommandTest.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
@@ -134,7 +134,7 @@ class CmdCommandTest : VimTestCase() {
     VimPlugin.getCommand().resetAliases()
     configureByText("\n")
     typeText(commandToKeys("command! -range Error echo <args>"))
-    assertPluginError(false)
+    assertPluginError(true)
     kotlin.test.assertEquals("'-range' is not supported by `command`", injector.messages.getStatusBarMessage())
   }
 
@@ -143,7 +143,7 @@ class CmdCommandTest : VimTestCase() {
     VimPlugin.getCommand().resetAliases()
     configureByText("\n")
     typeText(commandToKeys("command! -complete=color Error echo <args>"))
-    assertPluginError(false)
+    assertPluginError(true)
     kotlin.test.assertEquals("'-complete' is not supported by `command`", injector.messages.getStatusBarMessage())
   }
 

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/commands/ExecuteCommandTest.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
@@ -24,7 +24,6 @@ class ExecuteCommandTest : VimTestCase() {
   fun `test execute with range`() {
     configureByText("\n")
     typeText(commandToKeys("1,2execute 'echo 42'"))
-    assertNoExOutput()
     assertPluginError(true)
   }
 

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

@@ -72,7 +72,6 @@ class HistoryCommandTest : VimTestCase() {
   fun `test history with 'history' option set to 0 shows nothing`() {
     enterCommand("set history=0")
     enterCommand("history")
-    assertNoExOutput()
     assertPluginError(false)
     assertPluginErrorMessage("'history' option is zero")
   }
@@ -225,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(
@@ -500,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(

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/functions/bitwiseFunctions/AndFunctionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2025 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
@@ -43,7 +43,6 @@ class AndFunctionTest : VimTestCase() {
   @Test
   fun `test and function with list causes error`() {
     enterCommand("echo and([1, 2, 3], [2, 3, 4])")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E745: Using a List as a Number")
   }
@@ -51,7 +50,6 @@ class AndFunctionTest : VimTestCase() {
   @Test
   fun `test and function with dict causes error`() {
     enterCommand("echo and({1: 2, 3: 4}, {3: 4, 5: 6})")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E728: Using a Dictionary as a Number")
   }
@@ -59,7 +57,6 @@ class AndFunctionTest : VimTestCase() {
   @Test
   fun `test and function with float causes error`() {
     enterCommand("echo and(1.5, 2.5)")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E805: Using a Float as a Number")
   }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/functions/bitwiseFunctions/InvertFunctionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2025 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
@@ -28,7 +28,6 @@ class InvertFunctionTest : VimTestCase() {
   @Test
   fun `test invert function with list causes error`() {
     enterCommand("echo invert([1, 2, 3])")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E745: Using a List as a Number")
   }
@@ -36,7 +35,6 @@ class InvertFunctionTest : VimTestCase() {
   @Test
   fun `test invert function with dict causes error`() {
     enterCommand("echo invert({1: 2, 3: 4})")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E728: Using a Dictionary as a Number")
   }
@@ -44,7 +42,6 @@ class InvertFunctionTest : VimTestCase() {
   @Test
   fun `test invert function with float causes error`() {
     enterCommand("echo invert(1.5)")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E805: Using a Float as a Number")
   }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/functions/bitwiseFunctions/OrFunctionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2025 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
@@ -43,7 +43,6 @@ class OrFunctionTest : VimTestCase() {
   @Test
   fun `test or function with list causes error`() {
     enterCommand("echo or([1, 2, 3], [2, 3, 4])")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E745: Using a List as a Number")
   }
@@ -51,7 +50,6 @@ class OrFunctionTest : VimTestCase() {
   @Test
   fun `test or function with dict causes error`() {
     enterCommand("echo or({1: 2, 3: 4}, {3: 4, 5: 6})")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E728: Using a Dictionary as a Number")
   }
@@ -59,7 +57,6 @@ class OrFunctionTest : VimTestCase() {
   @Test
   fun `test or function with float causes error`() {
     enterCommand("echo or(1.5, 2.5)")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E805: Using a Float as a Number")
   }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/functions/bitwiseFunctions/XorFunctionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2025 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
@@ -43,7 +43,6 @@ class XorFunctionTest : VimTestCase() {
   @Test
   fun `test xor function with list causes error`() {
     enterCommand("echo xor([1, 2, 3], [2, 3, 4])")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E745: Using a List as a Number")
   }
@@ -51,7 +50,6 @@ class XorFunctionTest : VimTestCase() {
   @Test
   fun `test xor function with dict causes error`() {
     enterCommand("echo xor({1: 2, 3: 4}, {3: 4, 5: 6})")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E728: Using a Dictionary as a Number")
   }
@@ -59,7 +57,6 @@ class XorFunctionTest : VimTestCase() {
   @Test
   fun `test xor function with float causes error`() {
     enterCommand("echo xor(1.5, 2.5)")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E805: Using a Float as a Number")
   }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/functions/stringFunctions/ToLowerFunctionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2025 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
@@ -33,7 +33,6 @@ class ToLowerFunctionTest : VimTestCase() {
   @Test
   fun `test tolower with list causes error`() {
     enterCommand("echo tolower([1, 2, 3])")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E730: Using a List as a String")
   }
@@ -41,7 +40,6 @@ class ToLowerFunctionTest : VimTestCase() {
   @Test
   fun `test tolower with dict causes error`() {
     enterCommand("echo tolower({1: 2, 3: 4})")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E731: Using a Dictionary as a String")
   }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/functions/stringFunctions/ToUpperFunctionTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2025 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
@@ -33,7 +33,6 @@ class ToUpperFunctionTest : VimTestCase() {
   @Test
   fun `test toupper with list causes error`() {
     enterCommand("echo toupper([1, 2, 3])")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E730: Using a List as a String")
   }
@@ -41,7 +40,6 @@ class ToUpperFunctionTest : VimTestCase() {
   @Test
   fun `test toupper with dict causes error`() {
     enterCommand("echo toupper({1: 2, 3: 4})")
-    assertNoExOutput()
     assertPluginError(true)
     assertPluginErrorMessage("E731: Using a Dictionary as a String")
   }

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/statements/FunctionDeclarationTest.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
@@ -207,7 +207,12 @@ class FunctionDeclarationTest : VimTestCase() {
     typeText(commandToKeys("echo F1()"))
     assertPluginError(true)
     assertPluginErrorMessage("E121: Undefined variable: x")
-    assertExOutput("0")
+    assertExOutput(
+      """
+      E121: Undefined variable: x
+      0
+    """.trimIndent()
+    )
 
     typeText(commandToKeys("delf! F1"))
     typeText(commandToKeys("delf! F2"))

src/test/java/org/jetbrains/plugins/ideavim/ex/implementation/statements/TryCatchTest.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
@@ -154,7 +154,12 @@ class TryCatchTest : VimTestCase() {
       ),
     )
     assertPluginError(true)
-    assertExOutput("finally block")
+    assertExOutput(
+      """
+      finally block
+      my exception
+    """.trimIndent()
+    )
   }
 
   @Test

src/test/java/org/jetbrains/plugins/ideavim/group/SearchGroupTest.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
@@ -223,7 +223,7 @@ class SearchGroupTest : VimTestCase() {
     ) {
       enterCommand("set nowrapscan")
     }
-    assertPluginError(false)
+    assertPluginError(true)
     assertPluginErrorMessage("E385: Search hit BOTTOM without match for: one")
   }
 
@@ -242,7 +242,7 @@ class SearchGroupTest : VimTestCase() {
         three
       """.trimIndent()
     )
-    assertPluginError(false)
+    assertPluginError(true)
     assertPluginErrorMessage("E486: Pattern not found: banana")
   }
 
@@ -282,7 +282,7 @@ class SearchGroupTest : VimTestCase() {
     ) {
       enterCommand("set nowrapscan")
     }
-    assertPluginError(false)
+    assertPluginError(true)
     assertPluginErrorMessage("E384: Search hit TOP without match for: three")
   }
 
@@ -301,7 +301,7 @@ class SearchGroupTest : VimTestCase() {
         three
       """.trimIndent()
     )
-    assertPluginError(false)
+    assertPluginError(true)
     assertPluginErrorMessage("E486: Pattern not found: banana")
   }
 
@@ -615,7 +615,7 @@ class SearchGroupTest : VimTestCase() {
     )
     enterCommand("set nowrapscan")
     typeText("10", "/", searchCommand("one"))
-    assertPluginError(false)
+    assertPluginError(true)
     assertPluginErrorMessage("E385: Search hit BOTTOM without match for: one")
     assertPosition(2, 0)
   }
@@ -679,7 +679,7 @@ class SearchGroupTest : VimTestCase() {
     )
     enterCommand("set nowrapscan")
     typeText("12", "?one<CR>")
-    assertPluginError(false)
+    assertPluginError(true)
     assertPluginErrorMessage("E384: Search hit TOP without match for: one")
     assertPosition(8, 0)
   }

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()
+    var text = ""
-    assertTrue(text.contains(expected)) {
+    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()
+    var actual = 0
-    assertEquals(expected, actual) {
+    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()
+    var actual = 0
-    assertTrue(actual < line) {
+    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()
+    var actual = 0
-    assertTrue(actual > line) {
+    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()
+    var text = ""
-    assertTrue(text.contains("Hi ") && !text.contains("HiHi")) {
+    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.")
+    typeVim("w")
-    val helloCount = editorText().lines().first().split("HELLO").size - 1
+    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

@@ -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
@@ -12,7 +12,33 @@ import com.maddyhome.idea.vim.helper.EngineMessageHelper
 import org.jetbrains.annotations.PropertyKey
 
 interface VimMessages {
+  /**
+   * Displays an informational message to the user.
+   * The message panel closes on any keystroke and passes the key through to the editor.
+   */
+  fun showMessage(editor: VimEditor, message: String?)
+
+  /**
+   * 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.
+   */
+  @Deprecated("Use showMessage or showErrorMessage instead", ReplaceWith("showMessage(editor, message)"))
   fun showStatusBarMessage(editor: VimEditor?, message: String?)
+
   fun getStatusBarMessage(): String?
   fun clearStatusBarMessage()
   fun indicateError()
@@ -28,13 +54,4 @@ interface VimMessages {
   fun message(@PropertyKey(resourceBundle = EngineMessageHelper.BUNDLE) key: String, vararg params: Any): String
 
   fun updateStatusBar(editor: VimEditor)
-
-  fun showMessage(editor: VimEditor, message: String) {
-    showStatusBarMessage(editor, message)
-  }
-
-  fun showErrorMessage(editor: VimEditor, message: String?) {
-    showStatusBarMessage(editor, message)
-    indicateError()
-  }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2024 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
@@ -29,7 +29,8 @@ interface VimOutputPanel {
    * Note: The full text content is not updated in the display until [show] is invoked.
    *
    * @param text The text to append.
-   * @param isNewLine Whether to start the appended text on a new line. Defaults to true.
+   * @param isNewLine Whether to start the appended text on a new line.
+   * @param messageType The type of message, used to determine text styling.
    */
   fun addText(text: String, isNewLine: Boolean = true, messageType: MessageType = MessageType.STANDARD)
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2024 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
@@ -26,8 +26,17 @@ interface VimOutputPanelService {
   fun getCurrentOutputPanel(): VimOutputPanel?
 
   /**
-   * Appends text to the existing output panel or creates a new one with the given text.
+   * Appends text to the existing output panel or creates a new one with the given text and message type.
-   * Basic method that should be sufficient in most cases.
    */
-  fun output(editor: VimEditor, context: ExecutionContext, text: String)
+  fun output(
+    editor: VimEditor,
+    context: ExecutionContext,
+    text: String,
+    messageType: MessageType = MessageType.STANDARD,
+  )
+
+  fun clear(
+    editor: VimEditor,
+    context: ExecutionContext,
+  )
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2003-2024 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
@@ -13,9 +13,17 @@ abstract class VimOutputPanelServiceBase : VimOutputPanelService {
     return getCurrentOutputPanel() ?: create(editor, context)
   }
 
-  override fun output(editor: VimEditor, context: ExecutionContext, text: String) {
+  override fun output(editor: VimEditor, context: ExecutionContext, text: String, messageType: MessageType) {
     val panel = getOrCreate(editor, context)
-    panel.addText(text)
+    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,10 +25,8 @@ fun VimEditor.exitVisualMode() {
     if (inBlockSelection) {
       removeSecondaryCarets()
     }
-    injector.application.runWriteAction {
     nativeCarets().forEach(VimCaret::removeSelection)
   }
-  }
   if (inVisualMode || inCommandLineModeWithVisual) {
     vimLastSelectionType = selectionType
     injector.application.runReadAction {

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")) {
+        if (e.code != "E130") {
-          // "ignoreIfMissing" flag handles the "E130: Unknown function" exception
-        } else {
           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
   }