Leon dd7b7311b3
Standardise the use of ShellError::UnsupportedInput and ShellError::TypeMismatch and add spans to every instance of the former (#7217)
# 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.
2022-12-23 01:48:53 -05:00

378 lines
11 KiB
Rust

use crate::input_handler::{operate, CmdArgument};
use nu_engine::CallExt;
use nu_protocol::ast::Call;
use nu_protocol::ast::CellPath;
use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::Category;
use nu_protocol::Spanned;
use nu_protocol::{Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value};
struct Arguments {
end: bool,
substring: String,
range: Option<Value>,
cell_paths: Option<Vec<CellPath>>,
}
impl CmdArgument for Arguments {
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
self.cell_paths.take()
}
}
#[derive(Clone)]
pub struct SubCommand;
#[derive(Clone)]
pub struct IndexOfOptionalBounds(i32, i32);
impl Command for SubCommand {
fn name(&self) -> &str {
"str index-of"
}
fn signature(&self) -> Signature {
Signature::build("str index-of")
.input_output_types(vec![(Type::String, Type::Int)])
.vectorizes_over_list(true) // TODO: no test coverage
.required("string", SyntaxShape::String, "the string to find index of")
.rest(
"rest",
SyntaxShape::CellPath,
"For a data structure input, search strings at the given cell paths, and replace with result",
)
.named(
"range",
SyntaxShape::Any,
"optional start and/or end index",
Some('r'),
)
.switch("end", "search from the end of the input", Some('e'))
.category(Category::Strings)
}
fn usage(&self) -> &str {
"Returns start index of first occurrence of string in input, or -1 if no match"
}
fn search_terms(&self) -> Vec<&str> {
vec!["match", "find", "search"]
}
fn run(
&self,
engine_state: &EngineState,
stack: &mut Stack,
call: &Call,
input: PipelineData,
) -> Result<PipelineData, ShellError> {
let substring: Spanned<String> = call.req(engine_state, stack, 0)?;
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 1)?;
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
let args = Arguments {
substring: substring.item,
range: call.get_flag(engine_state, stack, "range")?,
end: call.has_flag("end"),
cell_paths,
};
operate(action, args, input, call.head, engine_state.ctrlc.clone())
}
fn examples(&self) -> Vec<Example> {
vec![
Example {
description: "Returns index of string in input",
example: " 'my_library.rb' | str index-of '.rb'",
result: Some(Value::test_int(10)),
},
Example {
description: "Returns index of string in input with start index",
example: " '.rb.rb' | str index-of '.rb' -r '1,'",
result: Some(Value::test_int(3)),
},
Example {
description: "Returns index of string in input with end index",
example: " '123456' | str index-of '6' -r ',4'",
result: Some(Value::test_int(-1)),
},
Example {
description: "Returns index of string in input with start and end index",
example: " '123456' | str index-of '3' -r '1,4'",
result: Some(Value::test_int(2)),
},
Example {
description: "Alternatively you can use this form",
example: " '123456' | str index-of '3' -r [1 4]",
result: Some(Value::test_int(2)),
},
Example {
description: "Returns index of string in input",
example: " '/this/is/some/path/file.txt' | str index-of '/' -e",
result: Some(Value::test_int(18)),
},
]
}
}
fn action(
input: &Value,
Arguments {
ref substring,
range,
end,
..
}: &Arguments,
head: Span,
) -> Value {
let range = match range {
Some(range) => range.clone(),
None => Value::string("", head),
};
let r = process_range(input, &range, head);
match input {
Value::String { val: s, .. } => {
let (start_index, end_index) = match r {
Ok(r) => (r.0 as usize, r.1 as usize),
Err(e) => return Value::Error { error: e },
};
if *end {
if let Some(result) = s[start_index..end_index].rfind(&**substring) {
Value::int(result as i64 + start_index as i64, head)
} else {
Value::int(-1, head)
}
} else if let Some(result) = s[start_index..end_index].find(&**substring) {
Value::int(result as i64 + start_index as i64, head)
} else {
Value::int(-1, head)
}
}
Value::Error { .. } => input.clone(),
_ => Value::Error {
error: ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
),
},
}
}
fn process_range(
input: &Value,
range: &Value,
head: Span,
) -> Result<IndexOfOptionalBounds, ShellError> {
let input_len = match input {
Value::String { val: s, .. } => s.len(),
_ => 0,
};
let min_index_str = String::from("0");
let max_index_str = input_len.to_string();
let r = match range {
Value::String { val: s, .. } => {
let indexes: Vec<&str> = s.split(',').collect();
let start_index = indexes.first().unwrap_or(&&min_index_str[..]).to_string();
let end_index = indexes.get(1).unwrap_or(&&max_index_str[..]).to_string();
Ok((start_index, end_index))
}
Value::List { vals, .. } => {
if vals.len() > 2 {
Err(ShellError::TypeMismatch(
String::from("there shouldn't be more than two indexes"),
head,
))
} else {
let idx: Vec<String> = vals
.iter()
.map(|v| v.as_string().unwrap_or_else(|_| String::from("")))
.collect();
let start_index = idx.get(0).unwrap_or(&min_index_str).to_string();
let end_index = idx.get(1).unwrap_or(&max_index_str).to_string();
Ok((start_index, end_index))
}
}
Value::Error { error } => Err(error.clone()),
_ => Err(ShellError::OnlySupportsThisInputType(
"string".into(),
input.get_type().to_string(),
head,
input.expect_span(),
)),
}?;
let start_index = r.0.parse::<i32>().unwrap_or(0);
let end_index = r.1.parse::<i32>().unwrap_or(input_len as i32);
if start_index < 0 || start_index > end_index {
return Err(ShellError::TypeMismatch(
String::from("start index can't be negative or greater than end index"),
head,
));
}
if end_index < 0 || end_index < start_index || end_index > input_len as i32 {
return Err(ShellError::TypeMismatch(
String::from(
"end index can't be negative, smaller than start index or greater than input length"),
head,
));
}
Ok(IndexOfOptionalBounds(start_index, end_index))
}
#[cfg(test)]
mod tests {
use super::*;
use super::{action, Arguments, SubCommand};
#[test]
fn test_examples() {
use crate::test_examples;
test_examples(SubCommand {})
}
#[test]
fn returns_index_of_substring() {
let word = Value::String {
val: String::from("Cargo.tomL"),
span: Span::test_data(),
};
let options = Arguments {
substring: String::from(".tomL"),
range: Some(Value::String {
val: String::from(""),
span: Span::test_data(),
}),
cell_paths: None,
end: false,
};
let actual = action(&word, &options, Span::test_data());
assert_eq!(actual, Value::test_int(5));
}
#[test]
fn index_of_does_not_exist_in_string() {
let word = Value::String {
val: String::from("Cargo.tomL"),
span: Span::test_data(),
};
let options = Arguments {
substring: String::from("Lm"),
range: Some(Value::String {
val: String::from(""),
span: Span::test_data(),
}),
cell_paths: None,
end: false,
};
let actual = action(&word, &options, Span::test_data());
assert_eq!(actual, Value::test_int(-1));
}
#[test]
fn returns_index_of_next_substring() {
let word = Value::String {
val: String::from("Cargo.Cargo"),
span: Span::test_data(),
};
let options = Arguments {
substring: String::from("Cargo"),
range: Some(Value::String {
val: String::from("1"),
span: Span::test_data(),
}),
cell_paths: None,
end: false,
};
let actual = action(&word, &options, Span::test_data());
assert_eq!(actual, Value::test_int(6));
}
#[test]
fn index_does_not_exist_due_to_end_index() {
let word = Value::String {
val: String::from("Cargo.Banana"),
span: Span::test_data(),
};
let options = Arguments {
substring: String::from("Banana"),
range: Some(Value::String {
val: String::from(",5"),
span: Span::test_data(),
}),
cell_paths: None,
end: false,
};
let actual = action(&word, &options, Span::test_data());
assert_eq!(actual, Value::test_int(-1));
}
#[test]
fn returns_index_of_nums_in_middle_due_to_index_limit_from_both_ends() {
let word = Value::String {
val: String::from("123123123"),
span: Span::test_data(),
};
let options = Arguments {
substring: String::from("123"),
range: Some(Value::String {
val: String::from("2,6"),
span: Span::test_data(),
}),
cell_paths: None,
end: false,
};
let actual = action(&word, &options, Span::test_data());
assert_eq!(actual, Value::test_int(3));
}
#[test]
fn index_does_not_exists_due_to_strict_bounds() {
let word = Value::String {
val: String::from("123456"),
span: Span::test_data(),
};
let options = Arguments {
substring: String::from("1"),
range: Some(Value::String {
val: String::from("2,4"),
span: Span::test_data(),
}),
cell_paths: None,
end: false,
};
let actual = action(&word, &options, Span::test_data());
assert_eq!(actual, Value::test_int(-1));
}
}