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

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
commit 952cdb4e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
} else {
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| {
if reset_selections {
if is_new_search {
editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
s.select_ranges(match_ranges.first().cloned())
});
@ -584,7 +584,7 @@ impl ProjectSearchView {
cx,
);
});
if self.query_editor.is_focused(cx) {
if is_new_search && self.query_editor.is_focused(cx) {
self.focus_results_editor(cx);
}
}