forked from extern/nushell
# Description Fixes: #11455 ### For arguments which is annotated with `:path/:directory/:glob` To fix the issue, we need to have a way to know if a path is originally quoted during runtime. So the information needed to be added at several levels: * parse time (from user input to expression) We need to add quoted information into `Expr::Filepath`, `Expr::Directory`, `Expr::GlobPattern` * eval time When convert from `Expr::Filepath`, `Expr::Directory`, `Expr::GlobPattern` to `Value::String` during runtime, we won't auto expanded the path if it's quoted ### For `ls` It's really special, because it accepts a `String` as a pattern, and it generates `glob` expression inside the command itself. So the idea behind the change is introducing a special SyntaxShape to ls: `SyntaxShape::LsGlobPattern`. So we can track if the pattern is originally quoted easier, and we don't auto expand the path either. Then when constructing a glob pattern inside ls, we check if input pattern is quoted, if so: we escape the input pattern, so we can run `ls a[123]b`, because it's already escaped. Finally, to accomplish the checking process, we also need to introduce a new value type called `Value::QuotedString` to differ from `Value::String`, it's used to generate an enum called `NuPath`, which is finally used in `ls` function. `ls` learned from `NuPath` to know if user input is quoted. # User-Facing Changes Actually it contains several changes ### For arguments which is annotated with `:path/:directory/:glob` #### Before ```nushell > def foo [p: path] { echo $p }; print (foo "~/a"); print (foo '~/a') /home/windsoilder/a /home/windsoilder/a > def foo [p: directory] { echo $p }; print (foo "~/a"); print (foo '~/a') /home/windsoilder/a /home/windsoilder/a > def foo [p: glob] { echo $p }; print (foo "~/a"); print (foo '~/a') /home/windsoilder/a /home/windsoilder/a ``` #### After ```nushell > def foo [p: path] { echo $p }; print (foo "~/a"); print (foo '~/a') ~/a ~/a > def foo [p: directory] { echo $p }; print (foo "~/a"); print (foo '~/a') ~/a ~/a > def foo [p: glob] { echo $p }; print (foo "~/a"); print (foo '~/a') ~/a ~/a ``` ### For ls command `touch '[uwu]'` #### Before ``` ❯ ls -D "[uwu]" Error: × No matches found for [uwu] ╭─[entry #6:1:1] 1 │ ls -D "[uwu]" · ───┬─── · ╰── Pattern, file or folder not found ╰──── help: no matches found ``` #### After ``` ❯ ls -D "[uwu]" ╭───┬───────┬──────┬──────┬──────────╮ │ # │ name │ type │ size │ modified │ ├───┼───────┼──────┼──────┼──────────┤ │ 0 │ [uwu] │ file │ 0 B │ now │ ╰───┴───────┴──────┴──────┴──────────╯ ``` # Tests + Formatting Done # After Submitting NaN
407 lines
12 KiB
Rust
407 lines
12 KiB
Rust
use crate::{
|
|
ast::{Assignment, Block, Call, Expr, Expression, ExternalArgument, PipelineElement},
|
|
engine::{EngineState, StateWorkingSet},
|
|
eval_base::Eval,
|
|
record, HistoryFileFormat, PipelineData, Record, ShellError, Span, Value, VarId,
|
|
};
|
|
use nu_system::os_info::{get_kernel_version, get_os_arch, get_os_family, get_os_name};
|
|
use std::path::{Path, PathBuf};
|
|
|
|
pub fn create_nu_constant(engine_state: &EngineState, span: Span) -> Result<Value, ShellError> {
|
|
fn canonicalize_path(engine_state: &EngineState, path: &Path) -> PathBuf {
|
|
let cwd = engine_state.current_work_dir();
|
|
|
|
if path.exists() {
|
|
match nu_path::canonicalize_with(path, cwd) {
|
|
Ok(canon_path) => canon_path,
|
|
Err(_) => path.to_owned(),
|
|
}
|
|
} else {
|
|
path.to_owned()
|
|
}
|
|
}
|
|
|
|
let mut record = Record::new();
|
|
|
|
record.push(
|
|
"default-config-dir",
|
|
if let Some(mut path) = nu_path::config_dir() {
|
|
path.push("nushell");
|
|
Value::string(path.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not get config directory".into(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
|
|
record.push(
|
|
"config-path",
|
|
if let Some(path) = engine_state.get_config_path("config-path") {
|
|
let canon_config_path = canonicalize_path(engine_state, path);
|
|
Value::string(canon_config_path.to_string_lossy(), span)
|
|
} else if let Some(mut path) = nu_path::config_dir() {
|
|
path.push("nushell");
|
|
path.push("config.nu");
|
|
Value::string(path.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not get config directory".into(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
|
|
record.push(
|
|
"env-path",
|
|
if let Some(path) = engine_state.get_config_path("env-path") {
|
|
let canon_env_path = canonicalize_path(engine_state, path);
|
|
Value::string(canon_env_path.to_string_lossy(), span)
|
|
} else if let Some(mut path) = nu_path::config_dir() {
|
|
path.push("nushell");
|
|
path.push("env.nu");
|
|
Value::string(path.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not find environment path".into(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
|
|
record.push(
|
|
"history-path",
|
|
if let Some(mut path) = nu_path::config_dir() {
|
|
path.push("nushell");
|
|
match engine_state.config.history.file_format {
|
|
HistoryFileFormat::Sqlite => {
|
|
path.push("history.sqlite3");
|
|
}
|
|
HistoryFileFormat::PlainText => {
|
|
path.push("history.txt");
|
|
}
|
|
}
|
|
let canon_hist_path = canonicalize_path(engine_state, &path);
|
|
Value::string(canon_hist_path.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not find history path".into(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
|
|
record.push(
|
|
"loginshell-path",
|
|
if let Some(mut path) = nu_path::config_dir() {
|
|
path.push("nushell");
|
|
path.push("login.nu");
|
|
let canon_login_path = canonicalize_path(engine_state, &path);
|
|
Value::string(canon_login_path.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not find login shell path".into(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
|
|
#[cfg(feature = "plugin")]
|
|
{
|
|
record.push(
|
|
"plugin-path",
|
|
if let Some(path) = &engine_state.plugin_signatures {
|
|
let canon_plugin_path = canonicalize_path(engine_state, path);
|
|
Value::string(canon_plugin_path.to_string_lossy(), span)
|
|
} else if let Some(mut plugin_path) = nu_path::config_dir() {
|
|
// If there are no signatures, we should still populate the plugin path
|
|
plugin_path.push("nushell");
|
|
plugin_path.push("plugin.nu");
|
|
Value::string(plugin_path.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not get plugin signature location".into(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
}
|
|
|
|
record.push(
|
|
"home-path",
|
|
if let Some(path) = nu_path::home_dir() {
|
|
let canon_home_path = canonicalize_path(engine_state, &path);
|
|
Value::string(canon_home_path.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not get home path".into(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
|
|
record.push("temp-path", {
|
|
let canon_temp_path = canonicalize_path(engine_state, &std::env::temp_dir());
|
|
Value::string(canon_temp_path.to_string_lossy(), span)
|
|
});
|
|
|
|
record.push("pid", Value::int(std::process::id().into(), span));
|
|
|
|
record.push("os-info", {
|
|
let ver = get_kernel_version();
|
|
Value::record(
|
|
record! {
|
|
"name" => Value::string(get_os_name(), span),
|
|
"arch" => Value::string(get_os_arch(), span),
|
|
"family" => Value::string(get_os_family(), span),
|
|
"kernel_version" => Value::string(ver, span),
|
|
},
|
|
span,
|
|
)
|
|
});
|
|
|
|
record.push(
|
|
"startup-time",
|
|
Value::duration(engine_state.get_startup_time(), span),
|
|
);
|
|
|
|
record.push(
|
|
"is-interactive",
|
|
Value::bool(engine_state.is_interactive, span),
|
|
);
|
|
|
|
record.push("is-login", Value::bool(engine_state.is_login, span));
|
|
|
|
record.push(
|
|
"history-enabled",
|
|
Value::bool(engine_state.history_enabled, span),
|
|
);
|
|
|
|
record.push(
|
|
"current-exe",
|
|
if let Ok(current_exe) = std::env::current_exe() {
|
|
Value::string(current_exe.to_string_lossy(), span)
|
|
} else {
|
|
Value::error(
|
|
ShellError::IOError {
|
|
msg: "Could not get current executable path".to_string(),
|
|
},
|
|
span,
|
|
)
|
|
},
|
|
);
|
|
|
|
Ok(Value::record(record, span))
|
|
}
|
|
|
|
fn eval_const_call(
|
|
working_set: &StateWorkingSet,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let decl = working_set.get_decl(call.decl_id);
|
|
|
|
if !decl.is_const() {
|
|
return Err(ShellError::NotAConstCommand { span: call.head });
|
|
}
|
|
|
|
if !decl.is_known_external() && call.named_iter().any(|(flag, _, _)| flag.item == "help") {
|
|
// It would require re-implementing get_full_help() for const evaluation. Assuming that
|
|
// getting help messages at parse-time is rare enough, we can simply disallow it.
|
|
return Err(ShellError::NotAConstHelp { span: call.head });
|
|
}
|
|
|
|
decl.run_const(working_set, call, input)
|
|
}
|
|
|
|
pub fn eval_const_subexpression(
|
|
working_set: &StateWorkingSet,
|
|
block: &Block,
|
|
mut input: PipelineData,
|
|
span: Span,
|
|
) -> Result<PipelineData, ShellError> {
|
|
for pipeline in block.pipelines.iter() {
|
|
for element in pipeline.elements.iter() {
|
|
let PipelineElement::Expression(_, expr) = element else {
|
|
return Err(ShellError::NotAConstant { span });
|
|
};
|
|
|
|
input = eval_constant_with_input(working_set, expr, input)?
|
|
}
|
|
}
|
|
|
|
Ok(input)
|
|
}
|
|
|
|
pub fn eval_constant_with_input(
|
|
working_set: &StateWorkingSet,
|
|
expr: &Expression,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
match &expr.expr {
|
|
Expr::Call(call) => eval_const_call(working_set, call, input),
|
|
Expr::Subexpression(block_id) => {
|
|
let block = working_set.get_block(*block_id);
|
|
eval_const_subexpression(working_set, block, input, expr.span)
|
|
}
|
|
_ => eval_constant(working_set, expr).map(|v| PipelineData::Value(v, None)),
|
|
}
|
|
}
|
|
|
|
/// Evaluate a constant value at parse time
|
|
pub fn eval_constant(
|
|
working_set: &StateWorkingSet,
|
|
expr: &Expression,
|
|
) -> Result<Value, ShellError> {
|
|
<EvalConst as Eval>::eval(working_set, &mut (), expr)
|
|
}
|
|
|
|
struct EvalConst;
|
|
|
|
impl Eval for EvalConst {
|
|
type State<'a> = &'a StateWorkingSet<'a>;
|
|
|
|
type MutState = ();
|
|
|
|
fn eval_filepath(
|
|
_: &StateWorkingSet,
|
|
_: &mut (),
|
|
path: String,
|
|
_: bool,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
Ok(Value::string(path, span))
|
|
}
|
|
|
|
fn eval_directory(
|
|
_: &StateWorkingSet,
|
|
_: &mut (),
|
|
_: String,
|
|
_: bool,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span })
|
|
}
|
|
|
|
fn eval_var(
|
|
working_set: &StateWorkingSet,
|
|
_: &mut (),
|
|
var_id: VarId,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
match working_set.get_variable(var_id).const_val.as_ref() {
|
|
Some(val) => Ok(val.clone()),
|
|
None => Err(ShellError::NotAConstant { span }),
|
|
}
|
|
}
|
|
|
|
fn eval_call(
|
|
working_set: &StateWorkingSet,
|
|
_: &mut (),
|
|
call: &Call,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
// TODO: eval.rs uses call.head for the span rather than expr.span
|
|
Ok(eval_const_call(working_set, call, PipelineData::empty())?.into_value(span))
|
|
}
|
|
|
|
fn eval_external_call(
|
|
_: &StateWorkingSet,
|
|
_: &mut (),
|
|
_: &Expression,
|
|
_: &[ExternalArgument],
|
|
_: bool,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
// TODO: It may be more helpful to give not_a_const_command error
|
|
Err(ShellError::NotAConstant { span })
|
|
}
|
|
|
|
fn eval_subexpression(
|
|
working_set: &StateWorkingSet,
|
|
_: &mut (),
|
|
block_id: usize,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
let block = working_set.get_block(block_id);
|
|
Ok(
|
|
eval_const_subexpression(working_set, block, PipelineData::empty(), span)?
|
|
.into_value(span),
|
|
)
|
|
}
|
|
|
|
fn regex_match(
|
|
_: &StateWorkingSet,
|
|
_op_span: Span,
|
|
_: &Value,
|
|
_: &Value,
|
|
_: bool,
|
|
expr_span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span: expr_span })
|
|
}
|
|
|
|
fn eval_assignment(
|
|
_: &StateWorkingSet,
|
|
_: &mut (),
|
|
_: &Expression,
|
|
_: &Expression,
|
|
_: Assignment,
|
|
_op_span: Span,
|
|
expr_span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span: expr_span })
|
|
}
|
|
|
|
fn eval_row_condition_or_closure(
|
|
_: &StateWorkingSet,
|
|
_: &mut (),
|
|
_: usize,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span })
|
|
}
|
|
|
|
fn eval_string_interpolation(
|
|
_: &StateWorkingSet,
|
|
_: &mut (),
|
|
_: &[Expression],
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span })
|
|
}
|
|
|
|
fn eval_overlay(_: &StateWorkingSet, span: Span) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span })
|
|
}
|
|
|
|
fn eval_glob_pattern(
|
|
_: &StateWorkingSet,
|
|
_: &mut (),
|
|
_: String,
|
|
_: bool,
|
|
span: Span,
|
|
) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span })
|
|
}
|
|
|
|
fn unreachable(expr: &Expression) -> Result<Value, ShellError> {
|
|
Err(ShellError::NotAConstant { span: expr.span })
|
|
}
|
|
}
|