Fix race condition resetting editor on focus gain

Fixes VIM-3773
JetBrains · Jan 14, 2025 · 7548b16 · 7548b16
1 parent 1105f61
commit 7548b16
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/com/maddyhome/idea/vim/listener/IJEditorFocusListener.kt b/src/main/java/com/maddyhome/idea/vim/listener/IJEditorFocusListener.kt
@@ -80,7 +80,9 @@ class IJEditorFocusListener : EditorListener {
       if (ijEditor.isDisposed) return@invokeLater
       val consoleView: ConsoleViewImpl? = ijEditor.getUserData(ConsoleViewImpl.CONSOLE_VIEW_IN_EDITOR_VIEW)
       if (consoleView != null && consoleView.isRunning && !ijEditor.inInsertMode) {
+        // Switch to Insert mode, but make sure we reset the editor to actually make it apply
         switchToInsertMode.run()
+        KeyHandler.getInstance().reset(editor)
       }
     }
     KeyHandler.getInstance().reset(editor)