From eec8a3b555d4e96365cfc78abe01a5f5cd0b673e Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Tue, 27 Apr 2021 14:58:54 -0700 Subject: [PATCH] Simplify file finder update_matches logic --- zed/src/file_finder.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zed/src/file_finder.rs b/zed/src/file_finder.rs index 6a7c7280c1bd2b94db6b44ef262f4aa041ebd739..e9eb580340ab150107f3b35b828eb1e1f16c2e36 100644 --- a/zed/src/file_finder.rs +++ b/zed/src/file_finder.rs @@ -422,13 +422,13 @@ impl FileFinder { ) { if search_id >= self.latest_search_id { self.latest_search_id = search_id; - if did_cancel && self.latest_search_did_cancel && query == self.latest_search_query { + if self.latest_search_did_cancel && query == self.latest_search_query { util::extend_sorted(&mut self.matches, matches.into_iter(), 100, |a, b| b.cmp(a)); } else { self.matches = matches; - self.latest_search_did_cancel = did_cancel; - self.latest_search_query = query; } + self.latest_search_query = query; + self.latest_search_did_cancel = did_cancel; self.include_root_name = include_root_name; self.list_state.scroll_to(self.selected_index()); ctx.notify();