Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update keybinds to use new names

Browse source
This commit is contained in:
Piotr Osiewicz 2023-08-08 14:33:51 +02:00
parent d497f279f0
commit 0ca29e56c2
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
assets/keymaps/default.json
View file

@ -238,7 +238,7 @@
"context": "ProjectSearchBar", "context": "ProjectSearchBar",
"bindings": { "bindings": {
"escape": "project_search::ToggleFocus", "escape": "project_search::ToggleFocus",
"alt-tab": "project_search::CycleMode" "alt-tab": "search::CycleMode"
} }
}, },
{ {
@ -252,7 +252,7 @@
"context": "ProjectSearchView", "context": "ProjectSearchView",
"bindings": { "bindings": {
"escape": "project_search::ToggleFocus", "escape": "project_search::ToggleFocus",
"alt-tab": "project_search::CycleMode" "alt-tab": "search::CycleMode"
} }
}, },
{ {
@ -264,7 +264,7 @@
"alt-enter": "search::SelectAllMatches", "alt-enter": "search::SelectAllMatches",
"alt-cmd-c": "search::ToggleCaseSensitive", "alt-cmd-c": "search::ToggleCaseSensitive",
"alt-cmd-w": "search::ToggleWholeWord", "alt-cmd-w": "search::ToggleWholeWord",
"alt-cmd-r": "search::ToggleRegex", "alt-cmd-r": "search::ActivateRegexMode",
"alt-cmd-f": "project_search::ToggleFilters" "alt-cmd-f": "project_search::ToggleFilters"
} }
}, },

18
crates/search/src/project_search.rs
View file

@ -2,8 +2,8 @@ use crate::{
elements::ButtonSide, elements::ButtonSide,
history::SearchHistory, history::SearchHistory,
mode::{SearchMode, Side}, mode::{SearchMode, Side},
CycleMode, NextHistoryQuery, PreviousHistoryQuery, SearchOptions, SelectNextMatch, ActivateRegexMode, CycleMode, NextHistoryQuery, PreviousHistoryQuery, SearchOptions,
SelectPrevMatch, ToggleCaseSensitive, ToggleWholeWord, SelectNextMatch, SelectPrevMatch, ToggleCaseSensitive, ToggleWholeWord,
}; };
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use collections::HashMap; use collections::HashMap;
@ -66,6 +66,7 @@ pub fn init(cx: &mut AppContext) {
cx.add_action(ProjectSearchBar::cycle_mode); cx.add_action(ProjectSearchBar::cycle_mode);
cx.add_action(ProjectSearchBar::next_history_query); cx.add_action(ProjectSearchBar::next_history_query);
cx.add_action(ProjectSearchBar::previous_history_query); cx.add_action(ProjectSearchBar::previous_history_query);
cx.add_action(ProjectSearchBar::activate_regex_mode);
cx.capture_action(ProjectSearchBar::tab); cx.capture_action(ProjectSearchBar::tab);
cx.capture_action(ProjectSearchBar::tab_previous); cx.capture_action(ProjectSearchBar::tab_previous);
add_toggle_option_action::<ToggleCaseSensitive>(SearchOptions::CASE_SENSITIVE, cx); add_toggle_option_action::<ToggleCaseSensitive>(SearchOptions::CASE_SENSITIVE, cx);
@ -1296,6 +1297,19 @@ impl ProjectSearchBar {
} }
} }
fn activate_regex_mode(pane: &mut Pane, _: &ActivateRegexMode, cx: &mut ViewContext<Pane>) {
if let Some(search_view) = pane
.active_item()
.and_then(|item| item.downcast::<ProjectSearchView>())
{
search_view.update(cx, |view, cx| {
view.activate_search_mode(SearchMode::Regex, cx)
});
} else {
cx.propagate_action();
}
}
fn toggle_filters(&mut self, cx: &mut ViewContext<Self>) -> bool { fn toggle_filters(&mut self, cx: &mut ViewContext<Self>) -> bool {
if let Some(search_view) = self.active_project_search.as_ref() { if let Some(search_view) = self.active_project_search.as_ref() {
search_view.update(cx, |search_view, cx| { search_view.update(cx, |search_view, cx| {