From 0f548c6add32485b7ab4c9200c5b6e9bd72acfbe Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Mon, 6 Jan 2025 16:34:44 +0000 Subject: [PATCH] Make `show project panel` keyboard shortcut work in more places (#22713) - Closes: https://github.com/zed-industries/zed/issues/22699 - Refine the key binding for `cmd-shift-e` (macOS) / `ctrl-shift-e` (linux) - Now Works after closing the final buffer - Now Works from other panels (Terminal/Assistant/Collab/Chat/etc) Follow-up to: - https://github.com/zed-industries/zed/pull/21228 Release Notes: - Fixed Project Panel toggle (`cmd-shift-e` / `ctrl-shift-e`) so it works in more contexts. --- assets/keymaps/default-linux.json | 5 +++-- assets/keymaps/default-macos.json | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index dc803f1278ca029df0c2b3b45d539cd52301e7f4..19c6af49a2ea2c424d610b6b4e79f5041eb5e5a0 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -172,6 +172,7 @@ "context": "AssistantPanel", "bindings": { "ctrl-k c": "assistant::CopyCode", + "ctrl-shift-e": "project_panel::ToggleFocus", "ctrl-g": "search::SelectNextMatch", "ctrl-shift-g": "search::SelectPrevMatch", "ctrl-shift-m": "assistant::ToggleModelSelector", @@ -411,7 +412,7 @@ "ctrl-shift-p": "command_palette::Toggle", "f1": "command_palette::Toggle", "ctrl-shift-m": "diagnostics::Deploy", - "ctrl-shift-e": "pane::RevealInProjectPanel", + "ctrl-shift-e": "project_panel::ToggleFocus", "ctrl-shift-b": "outline_panel::ToggleFocus", "ctrl-?": "assistant::ToggleFocus", "ctrl-alt-s": "workspace::SaveAll", @@ -532,6 +533,7 @@ "alt-enter": "editor::OpenExcerpts", "shift-enter": "editor::ExpandExcerpts", "ctrl-k enter": "editor::OpenExcerptsSplit", + "ctrl-shift-e": "pane::RevealInProjectPanel", "ctrl-f8": "editor::GoToHunk", "ctrl-shift-f8": "editor::GoToPrevHunk", "ctrl-enter": "assistant::InlineAssist" @@ -612,7 +614,6 @@ "ctrl-delete": ["project_panel::Delete", { "skip_prompt": false }], "alt-ctrl-r": "project_panel::RevealInFileManager", "ctrl-shift-enter": "project_panel::OpenWithSystem", - "ctrl-shift-e": "project_panel::ToggleFocus", "ctrl-shift-f": "project_panel::NewSearchInDirectory", "shift-down": "menu::SelectNext", "shift-up": "menu::SelectPrev", diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index 748d99447a265ed277fc561a10ccebceec8ddcdb..5679bf53f9d90dc315ed1f2e2e8b90883850f95a 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -196,6 +196,7 @@ "use_key_equivalents": true, "bindings": { "cmd-k c": "assistant::CopyCode", + "cmd-shift-e": "project_panel::ToggleFocus", "cmd-g": "search::SelectNextMatch", "cmd-shift-g": "search::SelectPrevMatch", "cmd-shift-m": "assistant::ToggleModelSelector", @@ -475,7 +476,7 @@ "ctrl-shift-tab": ["tab_switcher::Toggle", { "select_last": true }], "cmd-shift-p": "command_palette::Toggle", "cmd-shift-m": "diagnostics::Deploy", - "cmd-shift-e": "pane::RevealInProjectPanel", + "cmd-shift-e": "project_panel::ToggleFocus", "cmd-shift-b": "outline_panel::ToggleFocus", "cmd-?": "assistant::ToggleFocus", "cmd-alt-s": "workspace::SaveAll", @@ -595,6 +596,7 @@ "alt-enter": "editor::OpenExcerpts", "shift-enter": "editor::ExpandExcerpts", "cmd-k enter": "editor::OpenExcerptsSplit", + "cmd-shift-e": "pane::RevealInProjectPanel", "cmd-f8": "editor::GoToHunk", "cmd-shift-f8": "editor::GoToPrevHunk", "ctrl-enter": "assistant::InlineAssist" @@ -663,7 +665,6 @@ "cmd-delete": ["project_panel::Delete", { "skip_prompt": false }], "alt-cmd-r": "project_panel::RevealInFileManager", "ctrl-shift-enter": "project_panel::OpenWithSystem", - "cmd-shift-e": "project_panel::ToggleFocus", "cmd-alt-backspace": ["project_panel::Delete", { "skip_prompt": false }], "cmd-shift-f": "project_panel::NewSearchInDirectory", "shift-down": "menu::SelectNext",