Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge e1d4edd62a into b1b60bb7fe

Browse source
This commit is contained in:
Hendrik Sollich 2025-08-26 14:02:39 -04:00 • committed by GitHub
commit 25c4c84d6d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
crates/outline/src/outline.rs
View file

@ -119,6 +119,7 @@ struct OutlineViewDelegate {
active_editor: Entity<Editor>, active_editor: Entity<Editor>,
outline: Outline<Anchor>, outline: Outline<Anchor>,
selected_match_index: usize, selected_match_index: usize,
manually_selected: Option<usize>,
prev_scroll_position: Option<Point<f32>>, prev_scroll_position: Option<Point<f32>>,
matches: Vec<StringMatch>, matches: Vec<StringMatch>,
last_query: String, last_query: String,
@ -139,6 +140,7 @@ impl OutlineViewDelegate {
last_query: Default::default(), last_query: Default::default(),
matches: Default::default(), matches: Default::default(),
selected_match_index: 0, selected_match_index: 0,
manually_selected: None,
prev_scroll_position: Some(editor.update(cx, |editor, cx| editor.scroll_position(cx))), prev_scroll_position: Some(editor.update(cx, |editor, cx| editor.scroll_position(cx))),
active_editor: editor, active_editor: editor,
outline, outline,
@ -165,6 +167,7 @@ impl OutlineViewDelegate {
if navigate && !self.matches.is_empty() { if navigate && !self.matches.is_empty() {
let selected_match = &self.matches[self.selected_match_index]; let selected_match = &self.matches[self.selected_match_index];
self.manually_selected = Some(selected_match.candidate_id);
let outline_item = &self.outline.items[selected_match.candidate_id]; let outline_item = &self.outline.items[selected_match.candidate_id];
self.active_editor.update(cx, |active_editor, cx| { self.active_editor.update(cx, |active_editor, cx| {
@ -180,6 +183,8 @@ impl OutlineViewDelegate {
); );
active_editor.request_autoscroll(Autoscroll::center(), cx); active_editor.request_autoscroll(Autoscroll::center(), cx);
}); });
} else if self.manually_selected.is_some() {
self.manually_selected = None;
} }
} }
} }
@ -261,13 +266,29 @@ impl PickerDelegate for OutlineViewDelegate {
self.outline self.outline
.search(&query, cx.background_executor().clone()), .search(&query, cx.background_executor().clone()),
); );
selected_index = self
.matches if let Some(manually_selected) = self.manually_selected.and_then(|manually_selected| {
.iter() self.matches
.enumerate() .iter()
.max_by_key(|(_, m)| OrderedFloat(m.score)) .find(|mtch| mtch.candidate_id == manually_selected)
.map(|(ix, _)| ix) .map(|mtch| mtch.candidate_id)
.unwrap_or(0); }) {
selected_index = self
.matches
.iter()
.enumerate()
.find(|(_, m)| m.candidate_id == manually_selected)
.map(|(ix, _)| ix)
.unwrap_or(0);
} else {
selected_index = self
.matches
.iter()
.enumerate()
.max_by_key(|(_, m)| OrderedFloat(m.score))
.map(|(ix, _)| ix)
.unwrap_or(0);
}
} }
self.last_query = query; self.last_query = query;
self.set_selected_index(selected_index, !self.last_query.is_empty(), cx); self.set_selected_index(selected_index, !self.last_query.is_empty(), cx);