holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show completions more than one level below ~ (#2503)

Browse Source 
Previously, we'd check for a `~/` prefix and then return the home directory as
the base `PathBuf`. We failed to consider pushing any of the other possible path
components into this base dir, which prevent completions more than one level
deep (for example, `~/.config/<TAB>` would fail).
This commit is contained in:
Jason Gedge 2020-09-06 20:06:13 -04:00 committed by GitHub
parent 5a725f9651
commit c973850571
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/nu-cli/src/completion/path.rs
View File

@ -23,17 +23,22 @@ impl Completer {
let base_dir = if base_dir_name == "" { let base_dir = if base_dir_name == "" {
PathBuf::from(".") PathBuf::from(".")
} else if base_dir_name == format!("~{}", SEP) { } else {
#[cfg(feature = "directories")] #[cfg(feature = "directories")]
{ {
dirs::home_dir().unwrap_or_else(|| PathBuf::from("~")) let home_prefix = format!("~{}", SEP);
if base_dir_name.starts_with(&home_prefix) {
let mut home_dir = dirs::home_dir().unwrap_or_else(|| PathBuf::from("~"));
home_dir.push(&base_dir_name[2..]);
home_dir
} else {
PathBuf::from(base_dir_name)
}
} }
#[cfg(not(feature = "directories"))] #[cfg(not(feature = "directories"))]
{ {
PathBuf::from("~") PathBuf::from(base_dir_name)
} }
} else {
PathBuf::from(base_dir_name)
}; };
if let Ok(result) = base_dir.read_dir() { if let Ok(result) = base_dir.read_dir() {