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

Preserve selected item when refiltering project symbols

Browse source 
Add manual symbol selection in project symbols picker

When navigating to a symbol using arrow keys, store the selected symbol
so we can restore the same selection after re-filtering.
This commit is contained in:
Hendrik Sollich 2025-08-01 20:29:50 +02:00
parent a8b83985ab
commit c0ffeeef2c
1 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/project_symbols/src/project_symbols.rs
View file

@ -44,6 +44,7 @@ pub struct ProjectSymbolsDelegate {
external_match_candidates: Vec<StringMatchCandidate>,
show_worktree_root_name: bool,
matches: Vec<StringMatch>,
manually_selected: Option<Symbol>,
}
impl ProjectSymbolsDelegate {
@ -57,6 +58,7 @@ impl ProjectSymbolsDelegate {
external_match_candidates: Default::default(),
matches: Default::default(),
show_worktree_root_name: false,
manually_selected: None,
}
}
@ -99,6 +101,18 @@ impl ProjectSymbolsDelegate {
}
self.matches = matches;
// Preserve manually selected item if it exists
if let Some(manually_selected) = &self.manually_selected {
if let Some(index) = self.matches.iter().position(|mat| {
let symbol = &self.symbols[mat.candidate_id];
symbol.path == manually_selected.path && symbol.range == manually_selected.range
}) {
self.set_selected_index(index, window, cx);
return;
}
}
self.set_selected_index(0, window, cx);
}
}
@ -168,6 +182,11 @@ impl PickerDelegate for ProjectSymbolsDelegate {
_cx: &mut Context<Picker<Self>>,
) {
self.selected_match_index = ix;
// Store the manually selected symbol
if let Some(mat) = self.matches.get(ix) {
self.manually_selected = Some(self.symbols[mat.candidate_id].clone());
}
}
fn update_matches(