extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-22 16:33:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

support forward slash for directory completion in Windows (#3201)

Browse Source 
While the "main" separator in Windows is the backslash, it supports the
forward slash as a separator too.
Add support for this so that the behavior is similar to the way Windows
PowerShell handles the forward slash: it is recognized as a separator,
and when using <tab> for path completion the slash is reversed.
This commit is contained in:
Naftali Goldstein 2021-03-23 05:20:01 +02:00 committed by GitHub
parent a5cdd22bfe
commit 840bd98e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,8 @@ pub struct PathSuggestion {
impl PathCompleter { impl PathCompleter {
pub fn path_suggestions(&self, partial: &str, matcher: &dyn Matcher) -> Vec<PathSuggestion> { pub fn path_suggestions(&self, partial: &str, matcher: &dyn Matcher) -> Vec<PathSuggestion> {
let expanded = nu_parser::expand_ndots(partial); let expanded = nu_parser::expand_ndots(partial);
let expanded = expanded.as_ref(); let expanded = expanded.replace(std::path::is_separator, &SEP.to_string());
let expanded: &str = expanded.as_ref();
let (base_dir_name, partial) = match expanded.rfind(SEP) { let (base_dir_name, partial) = match expanded.rfind(SEP) {
Some(pos) => expanded.split_at(pos + SEP.len_utf8()), Some(pos) => expanded.split_at(pos + SEP.len_utf8()),

2
crates/nu-command/src/commands/run_external.rs
View File

@ -143,7 +143,7 @@ async fn maybe_autocd_dir<'a>(
// - the command name ends in a path separator, or // - the command name ends in a path separator, or
// - it's not a command on the path and no arguments were given. // - it's not a command on the path and no arguments were given.
let name = &cmd.name; let name = &cmd.name;
let path_name = if name.ends_with(std::path::MAIN_SEPARATOR) let path_name = if name.ends_with(std::path::is_separator)
|| (cmd.args.is_empty() || (cmd.args.is_empty()
&& PathBuf::from(name).is_dir() && PathBuf::from(name).is_dir()
&& dunce::canonicalize(name).is_ok() && dunce::canonicalize(name).is_ok()