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

remove kill search, and restart search immediately upon cycle mode

Browse source 
Co-authored-by: Piotr <piotr@zed.dev>
This commit is contained in:
KCaverly 2023-08-16 16:13:21 +01:00
parent aeda5d9842
commit c99b530968
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -176,15 +176,6 @@ impl ProjectSearch {
}) })
} }
fn kill_search(&mut self) {
dbg!("Killing search");
self.active_query = None;
self.match_ranges.clear();
self.pending_search = None;
self.no_results = None;
dbg!("Killed search");
}
fn search(&mut self, query: SearchQuery, cx: &mut ModelContext<Self>) { fn search(&mut self, query: SearchQuery, cx: &mut ModelContext<Self>) {
let search = self let search = self
.project .project
@ -688,7 +679,7 @@ impl ProjectSearchView {
if previous_mode == mode { if previous_mode == mode {
return; return;
} }
self.model.update(cx, |model, _| model.kill_search());
self.current_mode = mode; self.current_mode = mode;
match mode { match mode {
@ -746,6 +737,10 @@ impl ProjectSearchView {
self.active_match_index = None; self.active_match_index = None;
} }
} }
if let Some(query) = self.build_search_query(cx) {
self.search(cx);
};
cx.notify(); cx.notify();
} }
fn new(model: ModelHandle<ProjectSearch>, cx: &mut ViewContext<Self>) -> Self { fn new(model: ModelHandle<ProjectSearch>, cx: &mut ViewContext<Self>) -> Self {