oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2145 from zed-industries/fix-focus-in-project-search

Browse Source 
Focus results editor only when starting a new project search
This commit is contained in:
Antonio Scandurra
2023-02-08 18:25:02 +01:00
committed by GitHub
parent 37c052f53d 76c066baee
commit 952cdb4e98
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/search/src/project_search.rs
+3 -3
View File
@@ -571,9 +571,9 @@ impl ProjectSearchView {
self.active_match_index = None; self.active_match_index = None;
} else { } else {
let prev_search_id = mem::replace(&mut self.search_id, self.model.read(cx).search_id); let prev_search_id = mem::replace(&mut self.search_id, self.model.read(cx).search_id);
let reset_selections = self.search_id != prev_search_id; let is_new_search = self.search_id != prev_search_id;
self.results_editor.update(cx, |editor, cx| { self.results_editor.update(cx, |editor, cx| {
if reset_selections { if is_new_search {
editor.change_selections(Some(Autoscroll::fit()), cx, |s| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
s.select_ranges(match_ranges.first().cloned()) s.select_ranges(match_ranges.first().cloned())
}); });
@@ -584,7 +584,7 @@ impl ProjectSearchView {
cx, cx,
); );
}); });
if self.query_editor.is_focused(cx) { if is_new_search && self.query_editor.is_focused(cx) {
self.focus_results_editor(cx); self.focus_results_editor(cx);
} }
} }