From a91948aeb4003235d89c483cecec889f0a2569ed Mon Sep 17 00:00:00 2001 From: Michael Sloan Date: Sat, 19 Apr 2025 18:01:43 -0600 Subject: [PATCH] agent: Reorder some linux keybindings to match mac keybindings (#29107) Release Notes: - Made keybindings for agent panel closer to the precedence order used on Mac. This fixes use of `enter` to add context from the menu triggered by `@` referencing. --- assets/keymaps/default-linux.json | 240 +++++++++--------- .../find_and_replace_diff_card/base.toml | 2 +- 2 files changed, 121 insertions(+), 121 deletions(-) diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index ce7bcb2f53736bb3d0946ce9a0f393fece72230b..4f2798796cf401bce5cca26c158b3d8b67e52f4f 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -49,15 +49,6 @@ "down": "menu::SelectNext" } }, - { - "context": "Prompt", - "bindings": { - "left": "menu::SelectPrevious", - "right": "menu::SelectNext", - "h": "menu::SelectPrevious", - "l": "menu::SelectNext" - } - }, { "context": "Editor", "bindings": { @@ -139,24 +130,6 @@ "ctrl-shift-alt-backspace": "editor::GoToNextChange" } }, - { - "context": "Editor && !agent_diff", - "bindings": { - "ctrl-k ctrl-r": "git::Restore", - "ctrl-alt-y": "git::ToggleStaged", - "alt-y": "git::StageAndNext", - "alt-shift-y": "git::UnstageAndNext" - } - }, - { - "context": "AgentDiff", - "bindings": { - "ctrl-y": "agent::Keep", - "ctrl-n": "agent::Reject", - "ctrl-shift-y": "agent::KeepAll", - "ctrl-shift-n": "agent::RejectAll" - } - }, { "context": "Editor && mode == full", "bindings": { @@ -205,6 +178,31 @@ "ctrl-c": "markdown::Copy" } }, + { + "context": "Editor && jupyter && !ContextEditor", + "bindings": { + "ctrl-shift-enter": "repl::Run", + "ctrl-alt-enter": "repl::RunInPlace" + } + }, + { + "context": "Editor && !agent_diff", + "bindings": { + "ctrl-k ctrl-r": "git::Restore", + "ctrl-alt-y": "git::ToggleStaged", + "alt-y": "git::StageAndNext", + "alt-shift-y": "git::UnstageAndNext" + } + }, + { + "context": "AgentDiff", + "bindings": { + "ctrl-y": "agent::Keep", + "ctrl-n": "agent::Reject", + "ctrl-shift-y": "agent::KeepAll", + "ctrl-shift-n": "agent::RejectAll" + } + }, { "context": "AssistantPanel", "bindings": { @@ -220,6 +218,93 @@ "ctrl-n": "assistant::NewChat" } }, + { + "context": "ContextEditor > Editor", + "bindings": { + "ctrl-enter": "assistant::Assist", + "ctrl-shift-enter": "assistant::Edit", + "ctrl-s": "workspace::Save", + "save": "workspace::Save", + "ctrl->": "assistant::QuoteSelection", + "ctrl-<": "assistant::InsertIntoEditor", + "ctrl-alt-/": "assistant::ToggleModelSelector", + "shift-enter": "assistant::Split", + "ctrl-r": "assistant::CycleMessageRole", + "enter": "assistant::ConfirmCommand", + "alt-enter": "editor::Newline" + } + }, + { + "context": "AgentPanel", + "bindings": { + "ctrl-n": "agent::NewThread", + "ctrl-alt-n": "agent::NewTextThread", + "ctrl-shift-h": "agent::OpenHistory", + "ctrl-alt-c": "agent::OpenConfiguration", + "ctrl-alt-p": "assistant::OpenPromptLibrary", + "ctrl-i": "agent::ToggleProfileSelector", + "ctrl-alt-/": "assistant::ToggleModelSelector", + "ctrl-shift-a": "agent::ToggleContextPicker", + "shift-escape": "agent::ExpandMessageEditor", + "ctrl-e": "agent::ChatMode", + "ctrl-alt-e": "agent::RemoveAllContext" + } + }, + { + "context": "AgentPanel > Markdown", + "bindings": { + "copy": "markdown::CopyAsMarkdown", + "ctrl-c": "markdown::CopyAsMarkdown" + } + }, + { + "context": "AgentPanel && prompt_editor", + "bindings": { + "cmd-n": "agent::NewTextThread", + "cmd-alt-t": "agent::NewThread" + } + }, + { + "context": "MessageEditor > Editor", + "bindings": { + "enter": "agent::Chat", + "ctrl-i": "agent::ToggleProfileSelector", + "shift-ctrl-r": "agent::OpenAgentDiff" + } + }, + { + "context": "EditMessageEditor > Editor", + "bindings": { + "escape": "menu::Cancel", + "enter": "menu::Confirm", + "alt-enter": "editor::Newline" + } + }, + { + "context": "AgentFeedbackMessageEditor > Editor", + "bindings": { + "escape": "menu::Cancel", + "enter": "menu::Confirm", + "alt-enter": "editor::Newline" + } + }, + { + "context": "ContextStrip", + "bindings": { + "up": "agent::FocusUp", + "right": "agent::FocusRight", + "left": "agent::FocusLeft", + "down": "agent::FocusDown", + "backspace": "agent::RemoveFocusedContext", + "enter": "agent::AcceptSuggestedContext" + } + }, + { + "context": "ThreadHistory", + "bindings": { + "backspace": "agent::RemoveSelectedThread" + } + }, { "context": "PromptLibrary", "bindings": { @@ -603,105 +688,20 @@ } }, { - "context": "Editor && jupyter && !ContextEditor", - "bindings": { - "ctrl-shift-enter": "repl::Run", - "ctrl-alt-enter": "repl::RunInPlace" - } - }, - { - "context": "ContextEditor > Editor", - "bindings": { - "ctrl-enter": "assistant::Assist", - "ctrl-shift-enter": "assistant::Edit", - "ctrl-s": "workspace::Save", - "save": "workspace::Save", - "ctrl->": "assistant::QuoteSelection", - "ctrl-<": "assistant::InsertIntoEditor", - "ctrl-alt-/": "assistant::ToggleModelSelector", - "shift-enter": "assistant::Split", - "ctrl-r": "assistant::CycleMessageRole", - "enter": "assistant::ConfirmCommand", - "alt-enter": "editor::Newline" - } - }, - { - "context": "AgentPanel", + "context": "PromptEditor", "bindings": { - "ctrl-n": "agent::NewThread", - "ctrl-alt-n": "agent::NewTextThread", - "ctrl-shift-h": "agent::OpenHistory", - "ctrl-alt-c": "agent::OpenConfiguration", - "ctrl-alt-p": "assistant::OpenPromptLibrary", - "ctrl-i": "agent::ToggleProfileSelector", - "ctrl-alt-/": "assistant::ToggleModelSelector", - "ctrl-shift-a": "agent::ToggleContextPicker", - "shift-escape": "agent::ExpandMessageEditor", - "ctrl-e": "agent::ChatMode", + "ctrl-[": "assistant::CyclePreviousInlineAssist", + "ctrl-]": "assistant::CycleNextInlineAssist", "ctrl-alt-e": "agent::RemoveAllContext" } }, { - "context": "AgentPanel > Markdown", - "bindings": { - "copy": "markdown::CopyAsMarkdown", - "ctrl-c": "markdown::CopyAsMarkdown" - } - }, - { - "context": "AgentPanel && prompt_editor", - "bindings": { - "cmd-n": "agent::NewTextThread", - "cmd-alt-t": "agent::NewThread" - } - }, - { - "context": "MessageEditor > Editor", - "bindings": { - "enter": "agent::Chat", - "ctrl-i": "agent::ToggleProfileSelector", - "shift-ctrl-r": "agent::OpenAgentDiff" - } - }, - { - "context": "EditMessageEditor > Editor", - "bindings": { - "escape": "menu::Cancel", - "enter": "menu::Confirm", - "alt-enter": "editor::Newline" - } - }, - { - "context": "AgentFeedbackMessageEditor > Editor", - "bindings": { - "escape": "menu::Cancel", - "enter": "menu::Confirm", - "alt-enter": "editor::Newline" - } - }, - { - "context": "ContextStrip", - "bindings": { - "up": "agent::FocusUp", - "right": "agent::FocusRight", - "left": "agent::FocusLeft", - "down": "agent::FocusDown", - "backspace": "agent::RemoveFocusedContext", - "enter": "agent::AcceptSuggestedContext" - } - }, - { - "context": "ThreadHistory", - "bindings": { - "backspace": "agent::RemoveSelectedThread" - } - }, - { - "context": "PromptEditor", + "context": "Prompt", "bindings": { - "ctrl-[": "assistant::CyclePreviousInlineAssist", - "ctrl-]": "assistant::CycleNextInlineAssist", - "ctrl-alt-e": "agent::RemoveAllContext" + "left": "menu::SelectPrevious", + "right": "menu::SelectNext", + "h": "menu::SelectPrevious", + "l": "menu::SelectNext" } }, { diff --git a/crates/eval/examples/find_and_replace_diff_card/base.toml b/crates/eval/examples/find_and_replace_diff_card/base.toml index c88298997d17c8b53aad1a1e73df094788bebf5d..9cc9370bc6ca391681d86942d5eeb89f3281a1b4 100644 --- a/crates/eval/examples/find_and_replace_diff_card/base.toml +++ b/crates/eval/examples/find_and_replace_diff_card/base.toml @@ -1,3 +1,3 @@ url = "https://github.com/zed-industries/zed.git" -revision = "38fcadf9481d018543c65f36ac3bafeba190179b" +revision = "03ecb88fe30794873f191ddb728f597935b3101c" language_extension = "rs"