mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 08:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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 Joseph Lyons
parent 37ad025ccd
commit f877d26c3a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/search/src/project_search.rs
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);
} }
} }