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.

keymaps: Sync debugger bindings across platforms to match VS Code (#58729)

Andrej73032a0e813a513
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 9b940924714..7321e74a822 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -34,7 +34,6 @@
"ctrl-alt-,": "zed::OpenSettingsFile",
"ctrl-q": "zed::Quit",
"f4": "debugger::Start",
- "f11": "zed::ToggleFullScreen",
"ctrl-alt-z": "edit_prediction::RatePredictions",
"ctrl-alt-shift-i": "edit_prediction::ToggleMenu",
"ctrl-alt-l": "lsp_tool::ToggleMenu",
@@ -633,6 +632,7 @@
"shift-f6": "workspace::FocusPreviousPart",
"ctrl-f6": "workspace::FocusNextPart",
"alt-open": "projects::OpenRecent",
+ "f11": "zed::ToggleFullScreen",
// Change the default action on `menu::Confirm` by setting the parameter
// "alt-ctrl-o": ["projects::OpenRecent", { "create_new_window": true }],
"alt-ctrl-o": "projects::OpenRecent",
@@ -774,6 +774,11 @@
"context": "Workspace && debugger_stopped",
"bindings": {
"f5": "debugger::Continue",
+ "f7": "debugger::StepOver",
+ "f10": "debugger::StepOver",
+ "f11": "debugger::StepInto",
+ "ctrl-f11": "debugger::StepInto",
+ "shift-f11": "debugger::StepOut",
},
},
{
@@ -1109,18 +1114,16 @@
},
},
{
- // While a debug session is live, debugger controls take over their F-keys.
- // `f6` becomes Pause (region navigation stays on `ctrl-f6` / `shift-f6`),
- // and step/stop/rerun are scoped here so they're inert when not debugging.
+ // While a debug session is live, `Pause`/`Stop`/`RerunSession` take over their F-keys
+ // (region navigation stays on `ctrl-f6` / `shift-f6`), so they're inert when not debugging.
+ // Step commands and `Continue` are scoped to `debugger_stopped` instead, since they only
+ // make sense while execution is actually paused.
// `debugger::Start` stays global so a session can be started from anywhere.
"context": "Workspace && debugger_session",
"bindings": {
"f6": "debugger::Pause",
"shift-f5": "debugger::Stop",
"ctrl-shift-f5": "debugger::RerunSession",
- "f7": "debugger::StepOver",
- "ctrl-f11": "debugger::StepInto",
- "shift-f11": "debugger::StepOut",
},
},
{
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index b82f06de467..01648236029 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -38,8 +38,6 @@
"cmd-h": "zed::Hide",
"alt-cmd-h": "zed::HideOthers",
"cmd-m": "zed::Minimize",
- "fn-f": "zed::ToggleFullScreen",
- "ctrl-cmd-f": "zed::ToggleFullScreen",
"ctrl-cmd-z": "edit_prediction::RatePredictions",
"ctrl-cmd-i": "edit_prediction::ToggleMenu",
"ctrl-cmd-l": "lsp_tool::ToggleMenu",
@@ -694,6 +692,8 @@
"f6": "workspace::FocusNextPart",
"shift-f6": "workspace::FocusPreviousPart",
"cmd-f6": "workspace::FocusNextPart",
+ "fn-f": "zed::ToggleFullScreen",
+ "ctrl-cmd-f": "zed::ToggleFullScreen",
// Change the default action on `menu::Confirm` by setting the parameter
// "alt-cmd-o": ["projects::OpenRecent", {"create_new_window": true }],
"alt-cmd-o": "projects::OpenRecent",
@@ -823,7 +823,6 @@
// Unbind `f5` to avoid dispatching the `debugger::Rerun` as that is what `f5` is bound to in the `Workspace`
// context.
"f5": null,
- "f11": "debugger::StepInto",
},
},
{
@@ -831,6 +830,11 @@
"use_key_equivalents": true,
"bindings": {
"f5": "debugger::Continue",
+ "f7": "debugger::StepOver",
+ "f10": "debugger::StepOver",
+ "f11": "debugger::StepInto",
+ "ctrl-f11": "debugger::StepInto",
+ "shift-f11": "debugger::StepOut",
},
},
// Bindings from Sublime Text
@@ -1165,9 +1169,10 @@
},
},
{
- // While a debug session is live, debugger controls take over their F-keys.
- // `f6` becomes Pause (region navigation stays on `cmd-f6` / `shift-f6`),
- // and step/stop/rerun are scoped here so they're inert when not debugging.
+ // While a debug session is live, `Pause`/`Stop`/`RerunSession` take over their F-keys
+ // (region navigation stays on `cmd-f6` / `shift-f6`), so they're inert when not debugging.
+ // Step commands and `Continue` are scoped to `debugger_stopped` instead, since they only
+ // make sense while execution is actually paused.
// `debugger::Start` stays global so a session can be started from anywhere.
"context": "Workspace && debugger_session",
"use_key_equivalents": true,
@@ -1175,9 +1180,6 @@
"f6": "debugger::Pause",
"shift-f5": "debugger::Stop",
"shift-cmd-f5": "debugger::RerunSession",
- "f7": "debugger::StepOver",
- "ctrl-f11": "debugger::StepInto",
- "shift-f11": "debugger::StepOut",
},
},
{
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index e9c0f12ba69..7a4ef74a71f 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -33,7 +33,6 @@
"ctrl-alt-,": "zed::OpenSettingsFile",
"ctrl-q": "zed::Quit",
"f4": "debugger::Start",
- "f11": "zed::ToggleFullScreen",
"ctrl-shift-i": "edit_prediction::ToggleMenu",
"shift-alt-l": "lsp_tool::ToggleMenu",
"ctrl-shift-alt-c": "editor::DisplayCursorNames",
@@ -633,6 +632,7 @@
"ctrl-f6": "workspace::FocusNextPart",
// Change the default action on `menu::Confirm` by setting the parameter
// "ctrl-alt-o": ["projects::OpenRecent", { "create_new_window": true }],
+ "f11": "zed::ToggleFullScreen",
"ctrl-r": "projects::OpenRecent",
// Change to open path modal for existing remote connection by setting the parameter
// "ctrl-shift-alt-o": ["projects::OpenRemote", { "from_existing_connection": true }],
@@ -732,6 +732,10 @@
"use_key_equivalents": true,
"bindings": {
"f5": "debugger::Continue",
+ "f10": "debugger::StepOver",
+ "f11": "debugger::StepInto",
+ "ctrl-f11": "debugger::StepInto",
+ "shift-f11": "debugger::StepOut",
},
},
{
@@ -1105,9 +1109,10 @@
},
},
{
- // While a debug session is live, debugger controls take over their F-keys.
- // `f6` becomes Pause (region navigation stays on `ctrl-f6` / `shift-f6`),
- // and step/stop/rerun are scoped here so they're inert when not debugging.
+ // While a debug session is live, `Pause`/`Stop`/`RerunSession` take over their F-keys
+ // (region navigation stays on `ctrl-f6` / `shift-f6`), so they're inert when not debugging.
+ // Step commands and `Continue` are scoped to `debugger_stopped` instead, since they only
+ // make sense while execution is actually paused.
// `debugger::Start` stays global so a session can be started from anywhere.
"context": "Workspace && debugger_session",
"use_key_equivalents": true,
@@ -1115,8 +1120,6 @@
"f6": "debugger::Pause",
"shift-f5": "debugger::Stop",
"ctrl-shift-f5": "debugger::RerunSession",
- "f10": "debugger::StepOver",
- "shift-f11": "debugger::StepOut",
},
},
{