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

Improve StringMatchCandidate::new interface (#22011)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2024-12-14 13:35:36 -07:00 • committed by GitHub
parent 9daa426e93
commit 25970650a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 92 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/assistant/src/context_store.rs
View file

@ -716,7 +716,7 @@ impl ContextStore {
let candidates = metadata
.iter()
.enumerate()
.map(|(id, metadata)| StringMatchCandidate::new(id, metadata.title.clone()))
.map(|(id, metadata)| StringMatchCandidate::new(id, &metadata.title))
.collect::<Vec<_>>();
let matches = fuzzy::match_strings(
&candidates,

5
crates/assistant/src/prompt_library.rs
View file

@ -1439,10 +1439,7 @@ impl PromptStore {
.iter()
.enumerate()
.filter_map(|(ix, metadata)| {
Some(StringMatchCandidate::new(
ix,
metadata.title.as_ref()?.to_string(),
))
Some(StringMatchCandidate::new(ix, metadata.title.as_ref()?))
})
.collect::<Vec<_>>();
let matches = fuzzy::match_strings(

6
crates/assistant/src/slash_command.rs
View file

@ -78,11 +78,7 @@ impl SlashCommandCompletionProvider {
.command_names(cx)
.into_iter()
.enumerate()
.map(|(ix, def)| StringMatchCandidate {
id: ix,
string: def.to_string(),
char_bag: def.as_ref().into(),
})
.map(|(ix, def)| StringMatchCandidate::new(ix, &def))
.collect::<Vec<_>>();
let command_name = command_name.to_string();
let editor = self.editor.clone();

5
crates/assistant/src/slash_command/diagnostics_command.rs
View file

@ -218,10 +218,7 @@ impl Options {
}
fn match_candidates_for_args() -> [StringMatchCandidate; 1] {
[StringMatchCandidate::new(
0,
INCLUDE_WARNINGS_ARGUMENT.to_string(),
)]
[StringMatchCandidate::new(0, INCLUDE_WARNINGS_ARGUMENT)]
}
}

6
crates/assistant/src/slash_command/tab_command.rs
View file

@ -249,11 +249,7 @@ fn tab_items_for_queries(
.enumerate()
.filter_map(|(id, (full_path, ..))| {
let path_string = full_path.as_deref()?.to_string_lossy().to_string();
Some(fuzzy::StringMatchCandidate {
id,
char_bag: path_string.as_str().into(),
string: path_string,
})
Some(fuzzy::StringMatchCandidate::new(id, &path_string))
})
.collect::<Vec<_>>();
let mut processed_matches = HashSet::default();