zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-01 05:15:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Select closest match when find query changes

Browse Source
This commit is contained in:
Antonio Scandurra 2022-02-18 16:45:59 +01:00
parent 0eb0faa2a1
commit ea39eb384d
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/find/src/find.rs
View File

@ -157,7 +157,7 @@ impl Toolbar for FindBar {
self.active_editor_subscription = self.active_editor_subscription =
Some(cx.subscribe(&editor, Self::on_active_editor_event)); Some(cx.subscribe(&editor, Self::on_active_editor_event));
self.active_editor = Some(editor); self.active_editor = Some(editor);
self.update_matches(cx); self.update_matches(false, cx);
true true
} else { } else {
false false
@ -347,7 +347,7 @@ impl FindBar {
SearchMode::Regex => &mut self.regex_mode, SearchMode::Regex => &mut self.regex_mode,
}; };
*value = !*value; *value = !*value;
self.update_matches(cx); self.update_matches(true, cx);
cx.notify(); cx.notify();
} }
@ -410,7 +410,7 @@ impl FindBar {
editor::Event::Edited => { editor::Event::Edited => {
self.query_contains_error = false; self.query_contains_error = false;
self.clear_matches(cx); self.clear_matches(cx);
self.update_matches(cx); self.update_matches(true, cx);
cx.notify(); cx.notify();
} }
_ => {} _ => {}
@ -424,7 +424,7 @@ impl FindBar {
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) { ) {
match event { match event {
editor::Event::Edited => self.update_matches(cx), editor::Event::Edited => self.update_matches(false, cx),
editor::Event::SelectionsChanged => self.update_match_index(cx), editor::Event::SelectionsChanged => self.update_match_index(cx),
_ => {} _ => {}
} }
@ -440,7 +440,7 @@ impl FindBar {
} }
} }
fn update_matches(&mut self, cx: &mut ViewContext<Self>) { fn update_matches(&mut self, select_closest_match: bool, cx: &mut ViewContext<Self>) {
let query = self.query_editor.read(cx).text(cx); let query = self.query_editor.read(cx).text(cx);
self.pending_search.take(); self.pending_search.take();
if let Some(editor) = self.active_editor.as_ref() { if let Some(editor) = self.active_editor.as_ref() {
@ -468,17 +468,28 @@ impl FindBar {
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.editors_with_matches this.editors_with_matches
.insert(editor.downgrade(), ranges.clone()); .insert(editor.downgrade(), ranges.clone());
this.update_match_index(cx);
if !this.dismissed { if !this.dismissed {
editor.update(cx, |editor, cx| { editor.update(cx, |editor, cx| {
let theme = &this.settings.borrow().theme.find; let theme = &this.settings.borrow().theme.find;
if select_closest_match {
if let Some(match_ix) = this.active_match_index {
editor.select_ranges(
[ranges[match_ix].clone()],
Some(Autoscroll::Fit),
cx,
);
}
}
editor.highlight_ranges::<Self>( editor.highlight_ranges::<Self>(
ranges, ranges,
theme.match_background, theme.match_background,
cx, cx,
) );
}); });
} }
this.update_match_index(cx);
}); });
} }
} }