mirrors/just
1
0
Fork 0
mirror of https://github.com/casey/just.git synced 2025-12-23 11:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

De-duplicate suggestion methods (#2392)

Browse source
This commit is contained in:
Greg Shuflin 2024-09-27 15:10:10 -07:00 • committed by GitHub
parent bfaea9f02e
commit 70476bea9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

72
src/justfile.rs
View file

@ -34,53 +34,39 @@ pub(crate) struct Justfile<'src> {
}
impl<'src> Justfile<'src> {
pub(crate) fn suggest_recipe(&self, input: &str) -> Option<Suggestion<'src>> {
let mut suggestions = self
.recipes
.keys()
.map(|name| {
(
edit_distance(name, input),
Suggestion { name, target: None },
)
})
.chain(self.aliases.iter().map(|(name, alias)| {
(
edit_distance(name, input),
Suggestion {
name,
target: Some(alias.target.name.lexeme()),
},
)
}))
.filter(|(distance, _suggestion)| distance < &3)
.collect::<Vec<(usize, Suggestion)>>();
suggestions.sort_by_key(|(distance, _suggestion)| *distance);
suggestions
.into_iter()
fn find_suggestion(
input: &str,
candidates: impl Iterator<Item = Suggestion<'src>>,
) -> Option<Suggestion<'src>> {
candidates
.map(|suggestion| (edit_distance(input, suggestion.name), suggestion))
.filter(|(distance, _suggestion)| *distance < 3)
.min_by_key(|(distance, _suggestion)| *distance)
.map(|(_distance, suggestion)| suggestion)
.next()
}
pub(crate) fn suggest_recipe(&self, input: &str) -> Option<Suggestion<'src>> {
Self::find_suggestion(
input,
self
.recipes
.keys()
.map(|name| Suggestion { name, target: None })
.chain(self.aliases.iter().map(|(name, alias)| Suggestion {
name,
target: Some(alias.target.name.lexeme()),
})),
)
}
pub(crate) fn suggest_variable(&self, input: &str) -> Option<Suggestion<'src>> {
let mut suggestions = self
.assignments
.keys()
.map(|name| {
(
edit_distance(name, input),
Suggestion { name, target: None },
)
})
.filter(|(distance, _suggestion)| distance < &3)
.collect::<Vec<(usize, Suggestion)>>();
suggestions.sort_by_key(|(distance, _suggestion)| *distance);
suggestions
.into_iter()
.map(|(_distance, suggestion)| suggestion)
.next()
Self::find_suggestion(
input,
self
.assignments
.keys()
.map(|name| Suggestion { name, target: None }),
)
}
pub(crate) fn run(