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

Don't highlight project search matches either

Browse Source
This commit is contained in:
Conrad Irwin
2023-07-28 12:17:32 -06:00
parent 39f02c2b72
commit fac0e2dd56
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/editor/src/editor.rs
+1 -1
View File
@@ -1537,7 +1537,7 @@ impl Editor {
self.collapse_matches = collapse_matches; self.collapse_matches = collapse_matches;
} }
fn range_for_match<T: std::marker::Copy>(&self, range: &Range<T>) -> Range<T> { pub fn range_for_match<T: std::marker::Copy>(&self, range: &Range<T>) -> Range<T> {
if self.collapse_matches { if self.collapse_matches {
return range.start..range.start; return range.start..range.start;
} }
crates/search/src/project_search.rs
+6 -1
View File
@@ -654,6 +654,7 @@ impl ProjectSearchView {
let range_to_select = match_ranges[new_index].clone(); let range_to_select = match_ranges[new_index].clone();
self.results_editor.update(cx, |editor, cx| { self.results_editor.update(cx, |editor, cx| {
let range_to_select = editor.range_for_match(&range_to_select);
editor.unfold_ranges([range_to_select.clone()], false, true, cx); editor.unfold_ranges([range_to_select.clone()], false, true, cx);
editor.change_selections(Some(Autoscroll::fit()), cx, |s| { editor.change_selections(Some(Autoscroll::fit()), cx, |s| {
s.select_ranges([range_to_select]) s.select_ranges([range_to_select])
@@ -695,8 +696,12 @@ impl ProjectSearchView {
let is_new_search = 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 is_new_search { if is_new_search {
let range_to_select = match_ranges
.first()
.clone()
.map(|range| editor.range_for_match(range));
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(range_to_select)
}); });
} }
editor.highlight_background::<Self>( editor.highlight_background::<Self>(