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.

Fix keybindings conflict for Project Search filters and Text Findex (#60677)

Pavel Druzhininea77ca2818f3
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 834568fbe57..5b0476282f8 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -146,6 +146,7 @@
"ctrl-shift-backspace": "editor::GoToPreviousChange",
"ctrl-shift-alt-backspace": "editor::GoToNextChange",
"alt-enter": "editor::OpenSelectionsInMultibuffer",
+ "ctrl-alt-f": "text_finder::Toggle",
},
},
{
@@ -413,6 +414,7 @@
"ctrl-f": "search::FocusSearch",
"ctrl-h": "search::ToggleReplace",
"ctrl-l": "search::ToggleSelection",
+ "ctrl-alt-f": "text_finder::Toggle",
},
},
{
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 639ab247eeb..b44a32c0860 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -163,12 +163,12 @@
"cmd-shift-enter": "editor::NewlineAbove",
"cmd-k z": "editor::ToggleSoftWrap",
"cmd-f": "buffer_search::Deploy",
- "cmd-alt-f": "buffer_search::DeployReplace",
"cmd-alt-l": ["buffer_search::Deploy", { "selection_search_enabled": true }],
"cmd-e": "buffer_search::UseSelectionForFind",
"cmd->": "agent::AddSelectionToThread",
"cmd-alt-e": "editor::SelectEnclosingSymbol",
"alt-enter": "editor::OpenSelectionsInMultibuffer",
+ "alt-cmd-f": "text_finder::Toggle",
},
},
{
@@ -452,9 +452,9 @@
"cmd-shift-enter": "editor::ToggleFoldAll",
"alt-enter": "search::SelectAllMatches",
"cmd-f": "search::FocusSearch",
- "cmd-alt-f": "search::ToggleReplace",
"cmd-alt-l": "search::ToggleSelection",
"cmd-shift-o": "outline::Toggle",
+ "alt-cmd-f": "text_finder::Toggle",
},
},
{
@@ -561,7 +561,6 @@
"alt-enter": "search::SelectAllMatches",
"alt-cmd-c": "search::ToggleCaseSensitive",
"alt-cmd-w": "search::ToggleWholeWord",
- "alt-cmd-f": "project_search::ToggleFilters",
"alt-cmd-x": "search::ToggleRegex",
"cmd-k shift-enter": "pane::TogglePinTab",
},
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index 7f316838019..c2723cf3965 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -142,6 +142,7 @@
"ctrl-shift-backspace": "editor::GoToPreviousChange",
"ctrl-shift-alt-backspace": "editor::GoToNextChange",
"alt-enter": "editor::OpenSelectionsInMultibuffer",
+ "ctrl-alt-f": "text_finder::Toggle",
},
},
{
@@ -416,6 +417,7 @@
"ctrl-f": "search::FocusSearch",
"ctrl-h": "search::ToggleReplace",
"ctrl-l": "search::ToggleSelection",
+ "ctrl-alt-f": "text_finder::Toggle",
},
},
{