Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-28 05:53:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove "./" prefix for file path completions (#5387)

Browse source
This commit is contained in:
Richard 2022-04-30 23:54:04 +02:00 committed by GitHub
parent f16401152b
commit 07893e01c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/nu-cli/src/completions/file_completions.rs
View file

@ -128,7 +128,11 @@ pub fn file_path_completion(
entry.ok().and_then(|entry| { entry.ok().and_then(|entry| {
let mut file_name = entry.file_name().to_string_lossy().into_owned(); let mut file_name = entry.file_name().to_string_lossy().into_owned();
if matches(&partial, &file_name, match_algorithm) { if matches(&partial, &file_name, match_algorithm) {
let mut path = format!("{}{}", base_dir_name, file_name); let mut path = if is_current_dir(&base_dir_name) {
file_name.to_string()
} else {
format!("{}{}", base_dir_name, file_name)
};
if entry.path().is_dir() { if entry.path().is_dir() {
path.push(SEP); path.push(SEP);
file_name.push(SEP); file_name.push(SEP);
@ -158,3 +162,7 @@ pub fn file_path_completion(
pub fn matches(partial: &str, from: &str, match_algorithm: MatchAlgorithm) -> bool { pub fn matches(partial: &str, from: &str, match_algorithm: MatchAlgorithm) -> bool {
match_algorithm.matches_str(&from.to_ascii_lowercase(), &partial.to_ascii_lowercase()) match_algorithm.matches_str(&from.to_ascii_lowercase(), &partial.to_ascii_lowercase())
} }
fn is_current_dir(base_dir: &str) -> bool {
base_dir == format!(".{}", SEP)
}