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: Fix cmd-o in macOS JetBrains keymap opening file dialog instead of project symbols (#66137)

Dmytro Danilenkov4ba7d82f6872
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index e4d0fe51ed0..9bb5bb422a6 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -28,7 +28,6 @@
"alt-shift-enter": "menu::Restart",
"cmd-shift-w": "workspace::CloseWindow",
"shift-escape": "workspace::ToggleZoom",
- "cmd-o": "workspace::Open",
"cmd-=": ["zed::IncreaseBufferFontSize", { "persist": false }],
"cmd-+": ["zed::IncreaseBufferFontSize", { "persist": false }],
"cmd--": ["zed::DecreaseBufferFontSize", { "persist": false }],
@@ -696,6 +695,7 @@
"context": "Workspace",
"use_key_equivalents": true,
"bindings": {
+ "cmd-o": "workspace::Open",
"alt-/": "which_key::ShowPendingBindings",
// Move focus between the major regions of the window (editor, open
// panels, status bar). Accessibility navigation; mirrors VS Code's
diff --git a/assets/keymaps/macos/jetbrains.json b/assets/keymaps/macos/jetbrains.json
index 8b8fdb8464b..7378c178127 100644
--- a/assets/keymaps/macos/jetbrains.json
+++ b/assets/keymaps/macos/jetbrains.json
@@ -1,4 +1,11 @@
[
+ {
+ "context": "Workspace",
+ "use_key_equivalents": true,
+ "bindings": {
+ "cmd-o": null,
+ },
+ },
{
"bindings": {
"cmd-{": "pane::ActivatePreviousItem",