add cd - support (#787)

This commit is contained in:
JT 2022-01-20 15:51:44 -05:00 committed by GitHub
parent 724cfaa890
commit b4e61a056c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
use nu_engine::{current_dir, CallExt}; use nu_engine::{current_dir, CallExt};
use nu_protocol::ast::Call; use nu_protocol::ast::{Call, Expr, Expression};
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Category, PipelineData, ShellError, Signature, SyntaxShape, Value}; use nu_protocol::{Category, PipelineData, ShellError, Signature, SyntaxShape, Value};
@ -28,10 +28,36 @@ impl Command for Cd {
call: &Call, call: &Call,
_input: PipelineData, _input: PipelineData,
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> { ) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
let raw_path = call.nth(0);
let path_val: Option<Value> = call.opt(engine_state, stack, 0)?; let path_val: Option<Value> = call.opt(engine_state, stack, 0)?;
let cwd = current_dir(engine_state, stack)?; let cwd = current_dir(engine_state, stack)?;
let (path, span) = match path_val { let (path, span) = match raw_path {
Some(v) => match &v {
Expression {
expr: Expr::Filepath(val),
span,
..
} if val == "-" => {
let oldpwd = stack.get_env_var(engine_state, "OLDPWD");
if let Some(oldpwd) = oldpwd {
let path = oldpwd.as_path()?;
let path = match nu_path::canonicalize_with(path, &cwd) {
Ok(p) => p,
Err(e) => {
return Err(ShellError::DirectoryNotFoundHelp(
*span,
format!("IO Error: {:?}", e),
))
}
};
(path.to_string_lossy().to_string(), *span)
} else {
(cwd.to_string_lossy().to_string(), *span)
}
}
_ => match path_val {
Some(v) => { Some(v) => {
let path = v.as_path()?; let path = v.as_path()?;
let path = match nu_path::canonicalize_with(path, &cwd) { let path = match nu_path::canonicalize_with(path, &cwd) {
@ -49,6 +75,12 @@ impl Command for Cd {
let path = nu_path::expand_tilde("~"); let path = nu_path::expand_tilde("~");
(path.to_string_lossy().to_string(), call.head) (path.to_string_lossy().to_string(), call.head)
} }
},
},
None => {
let path = nu_path::expand_tilde("~");
(path.to_string_lossy().to_string(), call.head)
}
}; };
let path_value = Value::String { val: path, span }; let path_value = Value::String { val: path, span };
@ -90,8 +122,13 @@ impl Command for Cd {
}, },
); );
if let Some(oldpwd) = stack.get_env_var(engine_state, "PWD") {
stack.add_env_var("OLDPWD".into(), oldpwd)
}
//FIXME: this only changes the current scope, but instead this environment variable //FIXME: this only changes the current scope, but instead this environment variable
//should probably be a block that loads the information from the state in the overlay //should probably be a block that loads the information from the state in the overlay
stack.add_env_var("PWD".into(), path_value); stack.add_env_var("PWD".into(), path_value);
Ok(PipelineData::new(call.head)) Ok(PipelineData::new(call.head))
} }