Mirrors/clap
2
0
Fork 0
mirror of https://github.com/clap-rs/clap synced 2024-12-13 14:22:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix(complete): Ensure paths are sorted

Browse source
This commit is contained in:
Ed Page 2024-08-21 14:11:48 -05:00
parent 431e2bc931
commit 47aedc6906
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
clap_complete/src/engine/custom.rs
View file

@ -77,6 +77,7 @@ pub(crate) fn complete_path(
is_wanted: &dyn Fn(&std::path::Path) -> bool,
) -> Vec<CompletionCandidate> {
let mut completions = Vec::new();
let mut potential = Vec::new();
let value_path = std::path::Path::new(value_os);
let (prefix, current) = split_file_name(value_path);
@ -88,7 +89,7 @@ pub(crate) fn complete_path(
Some(current_dir) => current_dir,
None => {
// Can't complete without a `current_dir`
return Vec::new();
return completions;
}
};
current_dir.join(prefix)
@ -109,15 +110,24 @@ pub(crate) fn complete_path(
if entry.metadata().map(|m| m.is_dir()).unwrap_or(false) {
let mut suggestion = prefix.join(raw_file_name);
suggestion.push(""); // Ensure trailing `/`
completions.push(CompletionCandidate::new(suggestion.as_os_str().to_owned()));
let candidate = CompletionCandidate::new(suggestion.as_os_str().to_owned());
if is_wanted(&entry.path()) {
completions.push(candidate);
} else {
potential.push(candidate);
}
} else {
let path = entry.path();
if is_wanted(&path) {
if is_wanted(&entry.path()) {
let suggestion = prefix.join(raw_file_name);
completions.push(CompletionCandidate::new(suggestion.as_os_str().to_owned()));
let candidate = CompletionCandidate::new(suggestion.as_os_str().to_owned());
completions.push(candidate);
}
}
}
completions.sort();
potential.sort();
completions.extend(potential);
completions
}