forked from extern/nushell
# Description
Possible fix of #11456
This PR fixes a bug where builtin commands did not respect the logic of
dynamically passed boolean flags. The reason is
[has_flag](6f59abaf43/crates/nu-protocol/src/ast/call.rs (L204C5-L212C6)
)
method did not evaluate and take into consideration expression used with
flag.
To address this issue a solution is proposed:
1. `has_flag` method is moved to `CallExt` and new logic to evaluate
expression and check if it is a boolean value is added
2. `has_flag_const` method is added to `CallExt` which is a constant
version of `has_flag`
3. `has_named` method is added to `Call` which is basically the old
logic of `has_flag`
4. All usages of `has_flag` in code are updated, mostly to pass
`engine_state` and `stack` to new `has_flag`. In `run_const` commands it
is replaced with `has_flag_const`. And in a few select places: parser,
`to nuon` and `into string` old logic via `has_named` is used.
# User-Facing Changes
Explicit values of boolean flags are now respected in builtin commands.
Before:

After:

Another example:
Before:

After:

# Tests + Formatting
Added test reproducing some variants of original issue.
195 lines
6.0 KiB
Rust
195 lines
6.0 KiB
Rust
use std::path::Path;
|
|
|
|
use nu_engine::env::{current_dir_str, current_dir_str_const};
|
|
use nu_engine::CallExt;
|
|
use nu_path::{canonicalize_with, expand_path_with};
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
|
|
use nu_protocol::{
|
|
engine::Command, Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
|
|
};
|
|
|
|
use super::PathSubcommandArguments;
|
|
|
|
struct Arguments {
|
|
strict: bool,
|
|
cwd: String,
|
|
not_follow_symlink: bool,
|
|
}
|
|
|
|
impl PathSubcommandArguments for Arguments {}
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"path expand"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("path expand")
|
|
.input_output_types(vec![
|
|
(Type::String, Type::String),
|
|
(
|
|
Type::List(Box::new(Type::String)),
|
|
Type::List(Box::new(Type::String)),
|
|
),
|
|
])
|
|
.switch(
|
|
"strict",
|
|
"Throw an error if the path could not be expanded",
|
|
Some('s'),
|
|
)
|
|
.switch("no-symlink", "Do not resolve symbolic links", Some('n'))
|
|
.category(Category::Path)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Try to expand a path to its absolute form."
|
|
}
|
|
|
|
fn is_const(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let args = Arguments {
|
|
strict: call.has_flag(engine_state, stack, "strict")?,
|
|
cwd: current_dir_str(engine_state, stack)?,
|
|
not_follow_symlink: call.has_flag(engine_state, stack, "no-symlink")?,
|
|
};
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty { dst_span: head });
|
|
}
|
|
input.map(
|
|
move |value| super::operate(&expand, &args, value, head),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
fn run_const(
|
|
&self,
|
|
working_set: &StateWorkingSet,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let head = call.head;
|
|
let args = Arguments {
|
|
strict: call.has_flag_const(working_set, "strict")?,
|
|
cwd: current_dir_str_const(working_set)?,
|
|
not_follow_symlink: call.has_flag_const(working_set, "no-symlink")?,
|
|
};
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty { dst_span: head });
|
|
}
|
|
input.map(
|
|
move |value| super::operate(&expand, &args, value, head),
|
|
working_set.permanent().ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Expand an absolute path",
|
|
example: r"'C:\Users\joe\foo\..\bar' | path expand",
|
|
result: Some(Value::test_string(r"C:\Users\joe\bar")),
|
|
},
|
|
Example {
|
|
description: "Expand a relative path",
|
|
example: r"'foo\..\bar' | path expand",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Expand a list of paths",
|
|
example: r"[ C:\foo\..\bar, C:\foo\..\baz ] | path expand",
|
|
result: Some(Value::test_list(vec![
|
|
Value::test_string(r"C:\bar"),
|
|
Value::test_string(r"C:\baz"),
|
|
])),
|
|
},
|
|
]
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Expand an absolute path",
|
|
example: "'/home/joe/foo/../bar' | path expand",
|
|
result: Some(Value::test_string("/home/joe/bar")),
|
|
},
|
|
Example {
|
|
description: "Expand a relative path",
|
|
example: "'foo/../bar' | path expand",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Expand a list of paths",
|
|
example: "[ /foo/../bar, /foo/../baz ] | path expand",
|
|
result: Some(Value::test_list(vec![
|
|
Value::test_string("/bar"),
|
|
Value::test_string("/baz"),
|
|
])),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn expand(path: &Path, span: Span, args: &Arguments) -> Value {
|
|
if args.strict {
|
|
match canonicalize_with(path, &args.cwd) {
|
|
Ok(p) => {
|
|
if args.not_follow_symlink {
|
|
Value::string(expand_path_with(path, &args.cwd).to_string_lossy(), span)
|
|
} else {
|
|
Value::string(p.to_string_lossy(), span)
|
|
}
|
|
}
|
|
Err(_) => Value::error(
|
|
ShellError::GenericError {
|
|
error: "Could not expand path".into(),
|
|
msg: "could not be expanded (path might not exist, non-final \
|
|
component is not a directory, or other cause)"
|
|
.into(),
|
|
span: Some(span),
|
|
help: None,
|
|
inner: vec![],
|
|
},
|
|
span,
|
|
),
|
|
}
|
|
} else if args.not_follow_symlink {
|
|
Value::string(expand_path_with(path, &args.cwd).to_string_lossy(), span)
|
|
} else {
|
|
canonicalize_with(path, &args.cwd)
|
|
.map(|p| Value::string(p.to_string_lossy(), span))
|
|
.unwrap_or_else(|_| {
|
|
Value::string(expand_path_with(path, &args.cwd).to_string_lossy(), span)
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|