VIM-4134 Fix focus in gi ga nerdtree

Author: 1grzyb1

src/main/java/com/maddyhome/idea/vim/extension/nerdtree/NerdTree.kt

@@ -252,7 +252,7 @@ private fun createMappings(): Map<List<KeyStroke>, NerdTreeAction> = navigationM
     NerdTreeAction { event, tree ->
       val file = event.getData(CommonDataKeys.VIRTUAL_FILE) ?: return@NerdTreeAction
       if (file.isDirectory) return@NerdTreeAction
-      injector.window.splitWindowVertical(event.dataContext.vim, file.path)
+      injector.window.splitWindowVertical(event.dataContext.vim, file.path, focusNew = false)
       tree.requestFocus()
     },
   )
@@ -262,7 +262,7 @@ private fun createMappings(): Map<List<KeyStroke>, NerdTreeAction> = navigationM
     NerdTreeAction { event, tree ->
       val file = event.getData(CommonDataKeys.VIRTUAL_FILE) ?: return@NerdTreeAction
       if (file.isDirectory) return@NerdTreeAction
-      injector.window.splitWindowHorizontal(event.dataContext.vim, file.path)
+      injector.window.splitWindowHorizontal(event.dataContext.vim, file.path, focusNew = false)
       tree.requestFocus()
     },
   )

src/main/java/com/maddyhome/idea/vim/extension/nerdtree/NerdTreeEverywhere.kt

@@ -85,13 +85,13 @@ class NerdTreeEverywhere : VimExtension {
     register("NERDTreeMapPreviewVSplit", "gs", NerdTreeAction { event, tree ->
       val file = event.getData(CommonDataKeys.VIRTUAL_FILE) ?: return@NerdTreeAction
       if (file.isDirectory) return@NerdTreeAction
-      injector.window.splitWindowVertical(event.dataContext.vim, file.path)
+      injector.window.splitWindowVertical(event.dataContext.vim, file.path, focusNew = false)
       tree.requestFocus()
     })
     register("NERDTreeMapPreviewSplit", "gi", NerdTreeAction { event, tree ->
       val file = event.getData(CommonDataKeys.VIRTUAL_FILE) ?: return@NerdTreeAction
       if (file.isDirectory) return@NerdTreeAction
-      injector.window.splitWindowHorizontal(event.dataContext.vim, file.path)
+      injector.window.splitWindowHorizontal(event.dataContext.vim, file.path, focusNew = false)
       tree.requestFocus()
     })
   }) {

src/main/java/com/maddyhome/idea/vim/group/WindowGroup.java

@@ -263,13 +263,13 @@ public void selectWindow(@NotNull ExecutionContext context, int index) {
   }
 
   @Override
-  public void splitWindowHorizontal(@NotNull ExecutionContext context, @NotNull String filename) {
-    splitWindow(SwingConstants.HORIZONTAL, (DataContext)context.getContext(), filename);
+  public void splitWindowHorizontal(@NotNull ExecutionContext context, @NotNull String filename, boolean focusNew) {
+    splitWindow(SwingConstants.HORIZONTAL, (DataContext)context.getContext(), filename, focusNew);
   }
 
   @Override
-  public void splitWindowVertical(@NotNull ExecutionContext context, @NotNull String filename) {
-    splitWindow(SwingConstants.VERTICAL, (DataContext)context.getContext(), filename);
+  public void splitWindowVertical(@NotNull ExecutionContext context, @NotNull String filename, boolean focusNew) {
+    splitWindow(SwingConstants.VERTICAL, (DataContext)context.getContext(), filename, focusNew);
   }
 
   @Override
@@ -309,7 +309,7 @@ private void selectWindow(@NotNull EditorWindow currentWindow,
     windows.get(normalized).setAsCurrentWindow(true);
   }
 
-  private void splitWindow(int orientation, @NotNull DataContext context, @NotNull String filename) {
+  private void splitWindow(int orientation, @NotNull DataContext context, @NotNull String filename, boolean focusNew) {
     final Project project = PlatformDataKeys.PROJECT.getData(context);
     if (project == null) return;
     final FileEditorManagerEx fileEditorManager = FileEditorManagerEx.getInstanceEx(project);
@@ -331,7 +331,7 @@ private void splitWindow(int orientation, @NotNull DataContext context, @NotNull
 
     final EditorWindow editorWindow = fileEditorManager.getSplitters().getCurrentWindow();
     if (editorWindow != null) {
-      editorWindow.split(orientation, true, virtualFile, true);
+      editorWindow.split(orientation, true, virtualFile, focusNew);
     }
   }
 

vim-engine/src/main/kotlin/com/maddyhome/idea/vim/group/VimWindowGroup.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
@@ -16,8 +16,8 @@ interface VimWindowGroup {
   fun selectWindow(context: ExecutionContext, index: Int)
   fun selectPreviousWindow(context: ExecutionContext)
   fun closeAllExceptCurrent(context: ExecutionContext)
-  fun splitWindowVertical(context: ExecutionContext, filename: String)
-  fun splitWindowHorizontal(context: ExecutionContext, filename: String)
+  fun splitWindowVertical(context: ExecutionContext, filename: String, focusNew: Boolean = true)
+  fun splitWindowHorizontal(context: ExecutionContext, filename: String, focusNew: Boolean = true)
   fun closeCurrentWindow(context: ExecutionContext)
   fun closeAll(context: ExecutionContext)
 }