mirror of
https://github.com/nushell/nushell
synced 2025-01-09 03:39:03 +00:00
dd7b7311b3
# Description * I was dismayed to discover recently that UnsupportedInput and TypeMismatch are used *extremely* inconsistently across the codebase. UnsupportedInput is sometimes used for input type-checks (as per the name!!), but *also* used for argument type-checks. TypeMismatch is also used for both. I thus devised the following standard: input type-checking *only* uses UnsupportedInput, and argument type-checking *only* uses TypeMismatch. Moreover, to differentiate them, UnsupportedInput now has *two* error arrows (spans), one pointing at the command and the other at the input origin, while TypeMismatch only has the one (because the command should always be nearby) * In order to apply that standard, a very large number of UnsupportedInput uses were changed so that the input's span could be retrieved and delivered to it. * Additionally, I noticed many places where **errors are not propagated correctly**: there are lots of `match` sites which take a Value::Error, then throw it away and replace it with a new Value::Error with less/misleading information (such as reporting the error as an "incorrect type"). I believe that the earliest errors are the most important, and should always be propagated where possible. * Also, to standardise one broad subset of UnsupportedInput error messages, who all used slightly different wordings of "expected `<type>`, got `<type>`", I created OnlySupportsThisInputType as a variant of it. * Finally, a bunch of error sites that had "repeated spans" - i.e. where an error expected two spans, but `call.head` was given for both - were fixed to use different spans. # Example BEFORE ``` 〉20b | str starts-with 'a' Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #31:1:1] 1 │ 20b | str starts-with 'a' · ┬ · ╰── Input's type is filesize. This command only works with strings. ╰──── 〉'a' | math cos Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #33:1:1] 1 │ 'a' | math cos · ─┬─ · ╰── Only numerical values are supported, input type: String ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #38:1:1] 1 │ 0x[12] | encode utf8 · ───┬── · ╰── non-string input ╰──── ``` AFTER ``` 〉20b | str starts-with 'a' Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #1:1:1] 1 │ 20b | str starts-with 'a' · ┬ ───────┬─────── · │ ╰── only string input data is supported · ╰── input type: filesize ╰──── 〉'a' | math cos Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #2:1:1] 1 │ 'a' | math cos · ─┬─ ────┬─── · │ ╰── only numeric input data is supported · ╰── input type: string ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #3:1:1] 1 │ 0x[12] | encode utf8 · ───┬── ───┬── · │ ╰── only string input data is supported · ╰── input type: binary ╰──── ``` # User-Facing Changes Various error messages suddenly make more sense (i.e. have two arrows instead of one). # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
176 lines
5.4 KiB
Rust
176 lines
5.4 KiB
Rust
use std::path::Path;
|
|
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::{
|
|
engine::Command, Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape,
|
|
Type, Value,
|
|
};
|
|
|
|
use super::PathSubcommandArguments;
|
|
|
|
struct Arguments {
|
|
columns: Option<Vec<String>>,
|
|
replace: Option<Spanned<String>>,
|
|
num_levels: Option<i64>,
|
|
}
|
|
|
|
impl PathSubcommandArguments for Arguments {
|
|
fn get_columns(&self) -> Option<Vec<String>> {
|
|
self.columns.clone()
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"path dirname"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("path dirname")
|
|
.input_output_types(vec![(Type::String, Type::String)])
|
|
.named(
|
|
"columns",
|
|
SyntaxShape::Table,
|
|
"For a record or table input, convert strings at the given columns to their dirname",
|
|
Some('c'),
|
|
)
|
|
.named(
|
|
"replace",
|
|
SyntaxShape::String,
|
|
"Return original path with dirname replaced by this string",
|
|
Some('r'),
|
|
)
|
|
.named(
|
|
"num-levels",
|
|
SyntaxShape::Int,
|
|
"Number of directories to walk up",
|
|
Some('n'),
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Get the parent directory of a path"
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &nu_protocol::engine::EngineState,
|
|
stack: &mut nu_protocol::engine::Stack,
|
|
call: &nu_protocol::ast::Call,
|
|
input: nu_protocol::PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let head = call.head;
|
|
let args = Arguments {
|
|
columns: call.get_flag(engine_state, stack, "columns")?,
|
|
replace: call.get_flag(engine_state, stack, "replace")?,
|
|
num_levels: call.get_flag(engine_state, stack, "num-levels")?,
|
|
};
|
|
|
|
// This doesn't match explicit nulls
|
|
if matches!(input, PipelineData::Empty) {
|
|
return Err(ShellError::PipelineEmpty(head));
|
|
}
|
|
input.map(
|
|
move |value| super::operate(&get_dirname, &args, value, head),
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
|
|
#[cfg(windows)]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Get dirname of a path",
|
|
example: "'C:\\Users\\joe\\code\\test.txt' | path dirname",
|
|
result: Some(Value::test_string("C:\\Users\\joe\\code")),
|
|
},
|
|
Example {
|
|
description: "Get dirname of a path in a column",
|
|
example: "ls ('.' | path expand) | path dirname -c [ name ]",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Walk up two levels",
|
|
example: "'C:\\Users\\joe\\code\\test.txt' | path dirname -n 2",
|
|
result: Some(Value::test_string("C:\\Users\\joe")),
|
|
},
|
|
Example {
|
|
description: "Replace the part that would be returned with a custom path",
|
|
example:
|
|
"'C:\\Users\\joe\\code\\test.txt' | path dirname -n 2 -r C:\\Users\\viking",
|
|
result: Some(Value::test_string("C:\\Users\\viking\\code\\test.txt")),
|
|
},
|
|
]
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Get dirname of a path",
|
|
example: "'/home/joe/code/test.txt' | path dirname",
|
|
result: Some(Value::test_string("/home/joe/code")),
|
|
},
|
|
Example {
|
|
description: "Get dirname of a path in a column",
|
|
example: "ls ('.' | path expand) | path dirname -c [ name ]",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Walk up two levels",
|
|
example: "'/home/joe/code/test.txt' | path dirname -n 2",
|
|
result: Some(Value::test_string("/home/joe")),
|
|
},
|
|
Example {
|
|
description: "Replace the part that would be returned with a custom path",
|
|
example: "'/home/joe/code/test.txt' | path dirname -n 2 -r /home/viking",
|
|
result: Some(Value::test_string("/home/viking/code/test.txt")),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
fn get_dirname(path: &Path, span: Span, args: &Arguments) -> Value {
|
|
let num_levels = args.num_levels.as_ref().map_or(1, |val| *val);
|
|
|
|
let mut dirname = path;
|
|
let mut reached_top = false;
|
|
for _ in 0..num_levels {
|
|
dirname = dirname.parent().unwrap_or_else(|| {
|
|
reached_top = true;
|
|
dirname
|
|
});
|
|
if reached_top {
|
|
break;
|
|
}
|
|
}
|
|
|
|
let path = match args.replace {
|
|
Some(ref newdir) => {
|
|
let remainder = path.strip_prefix(dirname).unwrap_or(dirname);
|
|
if !remainder.as_os_str().is_empty() {
|
|
Path::new(&newdir.item).join(remainder)
|
|
} else {
|
|
Path::new(&newdir.item).to_path_buf()
|
|
}
|
|
}
|
|
None => dirname.to_path_buf(),
|
|
};
|
|
|
|
Value::string(path.to_string_lossy(), span)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
}
|