Fix keybindings conflict for Project Search filters and Text Findex (#60677)
# Objective Fixes #60540 ## Solution I suggest to focus on new feature keybindings support `Text Finder` instead of supporting old `DeployReplace`: 1. Add `cmd+opt+f` bind for `Text Finder` in `Editor` and `BufferSearch` to all platforms (now it's not there) 2. Remove `cmd+opt+f` bind for `buffer_search::DeployReplace` from `Editor` and `BufferSearch` on macOS. 3. Add breaking changes `buffer_search::DeployReplace` has no keybind anymore on macOS. ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable ## Showcase <details> <summary>Click to view showcase</summary> Uploading github.mov… </details> --- Release Notes: - `Text Search` now opens from almost all contexts (added `Editor`, `BufferSearch`) - Breaking changes: Dropped support for toggle filters hotkey in `BufferSearch` in macOS instead of supporting new `Text Search` feature with `cmd+alt+f`
This commit is contained in:
1 parent
e8edc63761
commit
ea77ca2818
3 files changed
+6
-3
No files matched your search
@@ -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",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
||||
@@ -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",
|
||||
},
|
||||
|
||||
@@ -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",
|
||||
},
|
||||
},
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user