Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

keymap: Avoid format-vs-rules collision in JetBrains overlay (#55364)

Tautik Agrahariea3d0f7abeb3
diff --git a/assets/keymaps/linux/jetbrains.json b/assets/keymaps/linux/jetbrains.json
index de4d538d40d..889f89def32 100644
--- a/assets/keymaps/linux/jetbrains.json
+++ b/assets/keymaps/linux/jetbrains.json
@@ -190,6 +190,17 @@
{ "context": "DebugPanel", "bindings": { "alt-5": "workspace::CloseActiveDock" } },
{ "context": "Diagnostics > Editor", "bindings": { "alt-6": "pane::CloseActiveItem" } },
{ "context": "OutlinePanel", "bindings": { "alt-7": "workspace::CloseActiveDock" } },
+ {
+ // `ctrl-alt-l` is bound to `editor::Format` (jetbrains "Reformat Code") in
+ // the Editor context above, which collides with the default
+ // `agent::OpenRulesLibrary` binding. Mirror the windows keymap and use
+ // `shift-alt-l` instead so the menu hint and the action stay in sync.
+ "context": "AgentPanel",
+ "bindings": {
+ "ctrl-alt-l": null,
+ "shift-alt-l": "agent::OpenRulesLibrary",
+ },
+ },
{
"context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel",
"bindings": {
diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json
index 291d7d5e7a8..9df47fe2412 100644
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -194,6 +194,17 @@
{ "context": "DebugPanel", "bindings": { "cmd-5": "workspace::CloseActiveDock" } },
{ "context": "Diagnostics > Editor", "bindings": { "cmd-6": "pane::CloseActiveItem" } },
{ "context": "OutlinePanel", "bindings": { "cmd-7": "workspace::CloseActiveDock" } },
+ {
+ // `cmd-alt-l` is bound to `editor::Format` (jetbrains "Reformat Code") in
+ // the Editor context above, which collides with the default
+ // `agent::OpenRulesLibrary` binding. Mirror the windows keymap and use
+ // `shift-alt-l` instead so the menu hint and the action stay in sync.
+ "context": "AgentPanel",
+ "bindings": {
+ "cmd-alt-l": null,
+ "shift-alt-l": "agent::OpenRulesLibrary",
+ },
+ },
{
"context": "Dock || Workspace || OutlinePanel || ProjectPanel || CollabPanel",
"bindings": {