From 583232897560211e214d3fc0c93d774ae649fb93 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Thu, 14 Nov 2024 17:32:04 +0100
Subject: [PATCH] Use vim-like keybindings for splitting out of the file finder
 (#20680)

Follow-up of https://github.com/zed-industries/zed/pull/20507

Release Notes:

- (breaking Preview) Adjusted file finder split keybindings to be less
conflicting

Co-authored-by: Conrad Irwin <conrad@zed.dev>
---
 assets/keymaps/default-linux.json | 16 ++++++++++------
 assets/keymaps/default-macos.json | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index ffd196bce19d64caebb6fb419d41002573bd7793..664e13ee77787588d03077369fb642b353948e92 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -648,19 +648,23 @@
     }
   },
   {
-    "context": "FileFinder",
+    "context": "FileFinder && !menu_open",
     "bindings": {
       "ctrl-shift-p": "file_finder::SelectPrev",
-      "ctrl-k": "file_finder::OpenMenu"
+      "ctrl": "file_finder::OpenMenu",
+      "ctrl-j": "pane::SplitDown",
+      "ctrl-k": "pane::SplitUp",
+      "ctrl-h": "pane::SplitLeft",
+      "ctrl-l": "pane::SplitRight"
     }
   },
   {
     "context": "FileFinder && menu_open",
     "bindings": {
-      "u": "pane::SplitUp",
-      "d": "pane::SplitDown",
-      "l": "pane::SplitLeft",
-      "r": "pane::SplitRight"
+      "j": "pane::SplitDown",
+      "k": "pane::SplitUp",
+      "h": "pane::SplitLeft",
+      "l": "pane::SplitRight"
     }
   },
   {
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 2dd537d5c3f45e8aef6f6e5fba6644d5c79ebde2..82edba33057c72ab7423b50392f0df35751182e6 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -648,19 +648,23 @@
     }
   },
   {
-    "context": "FileFinder",
+    "context": "FileFinder && !menu_open",
     "bindings": {
       "cmd-shift-p": "file_finder::SelectPrev",
-      "cmd-k": "file_finder::OpenMenu"
+      "cmd": "file_finder::OpenMenu",
+      "cmd-j": "pane::SplitDown",
+      "cmd-k": "pane::SplitUp",
+      "cmd-h": "pane::SplitLeft",
+      "cmd-l": "pane::SplitRight"
     }
   },
   {
     "context": "FileFinder && menu_open",
     "bindings": {
-      "u": "pane::SplitUp",
-      "d": "pane::SplitDown",
-      "l": "pane::SplitLeft",
-      "r": "pane::SplitRight"
+      "j": "pane::SplitDown",
+      "k": "pane::SplitUp",
+      "h": "pane::SplitLeft",
+      "l": "pane::SplitRight"
     }
   },
   {