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

remove conditional action registration for activate semantic search mode

Browse source
This commit is contained in:
KCaverly 2023-09-20 12:38:29 -04:00
parent 22d095bd35
commit 37a0c6615f
4 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,9 +71,9 @@ pub fn init(cx: &mut AppContext) {
cx.add_action(ProjectSearchBar::activate_text_mode);
// This action should only be registered if the semantic index is enabled
if SemanticIndex::enabled(cx) {
cx.add_action(ProjectSearchBar::activate_semantic_mode);
}
// We are registering it all the time, as I dont want to introduce a dependency
// for Semantic Index Settings globally whenever search is tested.
cx.add_action(ProjectSearchBar::activate_semantic_mode);
cx.capture_action(ProjectSearchBar::tab);
cx.capture_action(ProjectSearchBar::tab_previous);
@ -1449,15 +1449,17 @@ impl ProjectSearchBar {
_: &ActivateSemanticMode,
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::Semantic, cx)
});
} else {
cx.propagate_action();
if SemanticIndex::enabled(cx) {
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::Semantic, cx)
});
} else {
cx.propagate_action();
}
}
}