extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 06:05:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #363 from twe4ked/cd-back

Browse Source 
Implement `cd -` to return to the previous directory
This commit is contained in:
Andrés N. Robalino
2019-09-08 01:00:32 -05:00
committed by GitHub
parent 07151b8360 159cf27e39
commit eecda3ecba
2 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/shell/filesystem_shell.rs
View File

@ -15,6 +15,7 @@ use std::path::{Path, PathBuf};
pub struct FilesystemShell {
pub(crate) path: String,
last_path: String,
completer: NuCompleter,
hinter: HistoryHinter,
}
@ -29,6 +30,7 @@ impl Clone for FilesystemShell {
fn clone(&self) -> Self {
FilesystemShell {
path: self.path.clone(),
last_path: self.path.clone(),
completer: NuCompleter {
file_completer: FilenameCompleter::new(),
commands: self.completer.commands.clone(),
@ -44,6 +46,7 @@ impl FilesystemShell {
Ok(FilesystemShell {
path: path.to_string_lossy().to_string(),
last_path: path.to_string_lossy().to_string(),
completer: NuCompleter {
file_completer: FilenameCompleter::new(),
commands,
@ -56,8 +59,10 @@ impl FilesystemShell {
path: String,
commands: CommandRegistry,
) -> Result<FilesystemShell, std::io::Error> {
let last_path = path.clone();
Ok(FilesystemShell {
path,
last_path,
completer: NuCompleter {
file_completer: FilenameCompleter::new(),
commands,
@ -181,14 +186,29 @@ impl Shell for FilesystemShell {
Some(v) => {
let target = v.as_path()?;
let path = PathBuf::from(self.path());
match dunce::canonicalize(path.join(target).as_path()) {
match dunce::canonicalize(path.join(&target).as_path()) {
Ok(p) => p,
Err(_) => {
return Err(ShellError::labeled_error(
let error = Err(ShellError::labeled_error(
"Can not change to directory",
"directory not found",
v.span().clone(),
));
if let Some(t) = target.to_str() {
if t == "-" {
match dunce::canonicalize(PathBuf::from(self.last_path.clone()).as_path()) {
Ok(p) => p,
Err(_) => {
return error;
}
}
} else {
return error;
}
} else {
return error;
}
}
}
}
@ -980,6 +1000,7 @@ impl Shell for FilesystemShell {
pathbuf
}
};
self.last_path = self.path.clone();
self.path = path.to_string_lossy().to_string();
}