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

Highlight fuzzy match positions in command palette

Browse source
This commit is contained in:
Max Brunsfeld 2022-04-18 09:00:47 -07:00
parent 3bbc021a7e
commit f5377c2f50
1 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
crates/command_palette/src/command_palette.rs
View file

@ -135,7 +135,19 @@ impl PickerDelegate for CommandPalette {
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
cx.spawn(move |this, mut cx| async move { cx.spawn(move |this, mut cx| async move {
let matches = fuzzy::match_strings( let matches = if query.is_empty() {
candidates
.into_iter()
.enumerate()
.map(|(index, candidate)| StringMatch {
candidate_id: index,
string: candidate.string,
positions: Vec::new(),
score: 0.0,
})
.collect()
} else {
fuzzy::match_strings(
&candidates, &candidates,
&query, &query,
true, true,
@ -143,7 +155,8 @@ impl PickerDelegate for CommandPalette {
&Default::default(), &Default::default(),
cx.background(), cx.background(),
) )
.await; .await
};
this.update(&mut cx, |this, _| { this.update(&mut cx, |this, _| {
this.matches = matches; this.matches = matches;
if this.matches.is_empty() { if this.matches.is_empty() {
@ -186,7 +199,11 @@ impl PickerDelegate for CommandPalette {
let keystroke_spacing = theme.command_palette.keystroke_spacing; let keystroke_spacing = theme.command_palette.keystroke_spacing;
Flex::row() Flex::row()
.with_child(Label::new(mat.string.clone(), style.label.clone()).boxed()) .with_child(
Label::new(mat.string.clone(), style.label.clone())
.with_highlights(mat.positions.clone())
.boxed(),
)
.with_children(command.keystrokes.iter().map(|keystroke| { .with_children(command.keystrokes.iter().map(|keystroke| {
Flex::row() Flex::row()
.with_children( .with_children(