From 21b4a0d50ee3e89938ae7bdf02acc4be8519cdde Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Sat, 25 Jan 2025 17:06:53 -0500 Subject: [PATCH] Adjust `editor: open excerpts split` key binding (#23646) The pattern in Zed and in other editors is to use `cmd` to modify some file-opening action to open it in a split rather than in the current pane. - In the project pane, a `click` opens a file, and a `cmd-click` opens it in a split - In the file finder, `enter` opens the file, and a `cmd-enter` opens it in a split It makes sense to me that if `alt-enter` opens a file from the excerpt, that `cmd-alt-enter` opens it in a split, following the pattern above. Note: I'm not auto-merging this, as others might disagree. Note: I didn't touch the Vim binding. Release Notes: - Breaking Change: Changed `editor: open excerpts split` key binding to `cmd-alt-enter` on macOS and `ctrl-alt-enter` on Linux. --- assets/keymaps/default-linux.json | 4 ++-- assets/keymaps/default-macos.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 70aab85fab..4fd1956b00 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -544,7 +544,7 @@ "bindings": { "alt-enter": "editor::OpenExcerpts", "shift-enter": "editor::ExpandExcerpts", - "ctrl-k enter": "editor::OpenExcerptsSplit", + "ctrl-alt-enter": "editor::OpenExcerptsSplit", "ctrl-shift-e": "pane::RevealInProjectPanel", "ctrl-f8": "editor::GoToHunk", "ctrl-shift-f8": "editor::GoToPrevHunk", @@ -646,7 +646,7 @@ "shift-down": "menu::SelectNext", "shift-up": "menu::SelectPrev", "alt-enter": "editor::OpenExcerpts", - "ctrl-k enter": "editor::OpenExcerptsSplit" + "ctrl-alt-enter": "editor::OpenExcerptsSplit" } }, { diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index 0538312f3d..2fbd698858 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -622,7 +622,7 @@ "bindings": { "alt-enter": "editor::OpenExcerpts", "shift-enter": "editor::ExpandExcerpts", - "cmd-k enter": "editor::OpenExcerptsSplit", + "cmd-alt-enter": "editor::OpenExcerptsSplit", "cmd-shift-e": "pane::RevealInProjectPanel", "cmd-f8": "editor::GoToHunk", "cmd-shift-f8": "editor::GoToPrevHunk", @@ -669,7 +669,7 @@ "shift-down": "menu::SelectNext", "shift-up": "menu::SelectPrev", "alt-enter": "editor::OpenExcerpts", - "cmd-k enter": "editor::OpenExcerptsSplit" + "cmd-alt-enter": "editor::OpenExcerptsSplit" } }, {