Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
git_ui: Make JetBrains Ctrl-K focus the commit message (#66330)
Michal Matczuk2dcdc4f21629
diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.jsonindex 183fade8a18..29137ff76b5 100644--- a/assets/keymaps/linux/jetbrains.json+++ b/assets/keymaps/linux/jetbrains.json@@ -123,7 +123,7 @@"shift-f10": "task::Spawn","ctrl-f5": "task::Rerun","ctrl-e": "file_finder::Toggle",- "ctrl-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor+ "ctrl-k": "git_panel::FocusEditor","ctrl-shift-n": "file_finder::Toggle","ctrl-alt-n": "file_finder::Toggle","ctrl-n": "project_symbols::Toggle",diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.jsonindex 176663ff2b3..8b8fdb8464b 100644--- a/assets/keymaps/macos/jetbrains.json+++ b/assets/keymaps/macos/jetbrains.json@@ -126,7 +126,7 @@"shift-f10": "task::Spawn","cmd-f5": "task::Rerun","cmd-e": "file_finder::Toggle",- "cmd-k": "git_panel::ToggleFocus", // bug: This should also focus commit editor+ "cmd-k": "git_panel::FocusEditor","cmd-shift-o": "file_finder::Toggle","cmd-shift-n": "file_finder::Toggle","cmd-n": "project_symbols::Toggle",diff --git a/crates/git_ui/src/git_panel.rs b/crates/git_ui/src/git_panel.rsindex c206a1d8a9b..346aa792bd0 100644--- a/crates/git_ui/src/git_panel.rs+++ b/crates/git_ui/src/git_panel.rs@@ -542,6 +542,11 @@ pub fn register(workspace: &mut Workspace) {workspace.register_action(|workspace, _: &ToggleFocus, window, cx| {workspace.toggle_panel_focus::<GitPanel>(window, cx);});+ workspace.register_action(|workspace, _: &FocusEditor, window, cx| {+ if let Some(panel) = workspace.focus_panel::<GitPanel>(window, cx) {+ panel.update(cx, |panel, cx| panel.focus_editor(&FocusEditor, window, cx));+ }+ });workspace.register_action(|workspace, _: &Toggle, window, cx| {if !workspace.toggle_panel_focus::<GitPanel>(window, cx) {workspace.close_panel::<GitPanel>(window, cx);@@ -2626,6 +2631,10 @@ impl GitPanel {}fn focus_editor(&mut self, _: &FocusEditor, window: &mut Window, cx: &mut Context<Self>) {+ self.set_active_tab(GitPanelTab::Changes, window, cx);+ if self.commit_editor_collapsed {+ self.toggle_commit_editor(&ToggleCommitEditor, window, cx);+ }self.commit_editor.update(cx, |editor, cx| {window.focus(&editor.focus_handle(cx), cx);});