zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update file finder correctly when project files change

Browse Source
This commit is contained in:
Max Brunsfeld 2022-04-19 13:10:36 -07:00
parent 93d307aecb
commit 47379677f2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/file_finder/src/file_finder.rs
View File

@ -129,7 +129,7 @@ impl FileFinder {
} }
fn project_updated(&mut self, _: ModelHandle<Project>, cx: &mut ViewContext<Self>) { fn project_updated(&mut self, _: ModelHandle<Project>, cx: &mut ViewContext<Self>) {
self.spawn_search(self.latest_search_query.clone(), cx) self.spawn_search(self.picker.read(cx).query(cx), cx)
.detach(); .detach();
} }
@ -379,7 +379,7 @@ mod tests {
// Simulate a search being cancelled after the time limit, // Simulate a search being cancelled after the time limit,
// returning only a subset of the matches that would have been found. // returning only a subset of the matches that would have been found.
finder.spawn_search(query.clone(), cx).detach(); drop(finder.spawn_search(query.clone(), cx));
finder.set_matches( finder.set_matches(
finder.latest_search_id, finder.latest_search_id,
true, // did-cancel true, // did-cancel
@ -389,7 +389,7 @@ mod tests {
); );
// Simulate another cancellation. // Simulate another cancellation.
finder.spawn_search(query.clone(), cx).detach(); drop(finder.spawn_search(query.clone(), cx));
finder.set_matches( finder.set_matches(
finder.latest_search_id, finder.latest_search_id,
true, // did-cancel true, // did-cancel

6
crates/picker/src/picker.rs
View File

@ -150,6 +150,10 @@ impl<D: PickerDelegate> Picker<D> {
self self
} }
pub fn query(&self, cx: &AppContext) -> String {
self.query_editor.read(cx).text(cx)
}
fn on_query_editor_event( fn on_query_editor_event(
&mut self, &mut self,
_: ViewHandle<Editor>, _: ViewHandle<Editor>,
@ -171,7 +175,7 @@ impl<D: PickerDelegate> Picker<D> {
fn update_matches(&mut self, cx: &mut ViewContext<Self>) { fn update_matches(&mut self, cx: &mut ViewContext<Self>) {
if let Some(delegate) = self.delegate.upgrade(cx) { if let Some(delegate) = self.delegate.upgrade(cx) {
let query = self.query_editor.read(cx).text(cx); let query = self.query(cx);
let update = delegate.update(cx, |d, cx| d.update_matches(query, cx)); let update = delegate.update(cx, |d, cx| d.update_matches(query, cx));
cx.notify(); cx.notify();
self.update_task = Some(cx.spawn(|this, mut cx| async move { self.update_task = Some(cx.spawn(|this, mut cx| async move {