forked from extern/nushell
# 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.
1002 lines
31 KiB
Rust
1002 lines
31 KiB
Rust
use crate::input_handler::{operate, CmdArgument};
|
|
use fancy_regex::Regex;
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::{
|
|
ast::{Call, CellPath},
|
|
engine::{Command, EngineState, Stack},
|
|
Example, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct SubCommand;
|
|
|
|
struct Arguments {
|
|
to_trim: Option<char>,
|
|
closure_flags: ClosureFlags,
|
|
cell_paths: Option<Vec<CellPath>>,
|
|
mode: ActionMode,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
#[derive(Default, Debug, Copy, Clone)]
|
|
pub struct ClosureFlags {
|
|
all_flag: bool,
|
|
left_trim: bool,
|
|
right_trim: bool,
|
|
format_flag: bool,
|
|
both_flag: bool,
|
|
}
|
|
|
|
impl Command for SubCommand {
|
|
fn name(&self) -> &str {
|
|
"str trim"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("str trim")
|
|
.input_output_types(vec![(Type::String, Type::String)])
|
|
.vectorizes_over_list(true)
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
"For a data structure input, trim strings at the given cell paths", )
|
|
.named(
|
|
"char",
|
|
SyntaxShape::String,
|
|
"character to trim (default: whitespace)",
|
|
Some('c'),
|
|
)
|
|
.switch(
|
|
"left",
|
|
"trims characters only from the beginning of the string (default: whitespace)",
|
|
Some('l'),
|
|
)
|
|
.switch(
|
|
"right",
|
|
"trims characters only from the end of the string (default: whitespace)",
|
|
Some('r'),
|
|
)
|
|
.switch(
|
|
"all",
|
|
"trims all characters from both sides of the string *and* in the middle (default: whitespace)",
|
|
Some('a'),
|
|
)
|
|
.switch("both", "trims all characters from left and right side of the string (default: whitespace)", Some('b'))
|
|
.switch("format", "trims spaces replacing multiple characters with singles in the middle (default: whitespace)", Some('f'))
|
|
}
|
|
fn usage(&self) -> &str {
|
|
"Trim whitespace or specific character"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["whitespace", "strip", "lstrip", "rstrip"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let character = call.get_flag::<Spanned<String>>(engine_state, stack, "char")?;
|
|
let to_trim = match character.as_ref() {
|
|
Some(v) => {
|
|
if v.item.chars().count() > 1 {
|
|
return Err(ShellError::GenericError(
|
|
"Trim only works with single character".into(),
|
|
"needs single character".into(),
|
|
Some(v.span),
|
|
None,
|
|
Vec::new(),
|
|
));
|
|
}
|
|
v.item.chars().next()
|
|
}
|
|
None => None,
|
|
};
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
|
let mode = match cell_paths {
|
|
None => ActionMode::Global,
|
|
Some(_) => ActionMode::Local,
|
|
};
|
|
let args = Arguments {
|
|
to_trim,
|
|
closure_flags: ClosureFlags {
|
|
all_flag: call.has_flag("all"),
|
|
left_trim: call.has_flag("left"),
|
|
right_trim: call.has_flag("right"),
|
|
format_flag: call.has_flag("format"),
|
|
both_flag: call.has_flag("both")
|
|
|| (!call.has_flag("all")
|
|
&& !call.has_flag("left")
|
|
&& !call.has_flag("right")
|
|
&& !call.has_flag("format")), // this is the case if no flags are provided
|
|
},
|
|
cell_paths,
|
|
mode,
|
|
};
|
|
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Trim whitespace",
|
|
example: "'Nu shell ' | str trim",
|
|
result: Some(Value::test_string("Nu shell")),
|
|
},
|
|
Example {
|
|
description: "Trim a specific character",
|
|
example: "'=== Nu shell ===' | str trim -c '=' | str trim",
|
|
result: Some(Value::test_string("Nu shell")),
|
|
},
|
|
Example {
|
|
description: "Trim all characters",
|
|
example: "' Nu shell ' | str trim -a",
|
|
result: Some(Value::test_string("Nushell")),
|
|
},
|
|
Example {
|
|
description: "Trim whitespace from the beginning of string",
|
|
example: "' Nu shell ' | str trim -l",
|
|
result: Some(Value::test_string("Nu shell ")),
|
|
},
|
|
Example {
|
|
description: "Trim a specific character",
|
|
example: "'=== Nu shell ===' | str trim -c '='",
|
|
result: Some(Value::test_string(" Nu shell ")),
|
|
},
|
|
Example {
|
|
description: "Trim whitespace from the end of string",
|
|
example: "' Nu shell ' | str trim -r",
|
|
result: Some(Value::test_string(" Nu shell")),
|
|
},
|
|
Example {
|
|
description: "Trim a specific character",
|
|
example: "'=== Nu shell ===' | str trim -r -c '='",
|
|
result: Some(Value::test_string("=== Nu shell ")),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub enum ActionMode {
|
|
Local,
|
|
Global,
|
|
}
|
|
|
|
fn action(input: &Value, arg: &Arguments, head: Span) -> Value {
|
|
let char_ = arg.to_trim;
|
|
let closure_flags = &arg.closure_flags;
|
|
let mode = &arg.mode;
|
|
match input {
|
|
Value::String { val: s, .. } => Value::String {
|
|
val: trim(s, char_, closure_flags),
|
|
span: head,
|
|
},
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => input.clone(),
|
|
other => match mode {
|
|
ActionMode::Global => match other {
|
|
Value::Record { cols, vals, span } => {
|
|
let new_vals = vals.iter().map(|v| action(v, arg, head)).collect();
|
|
|
|
Value::Record {
|
|
cols: cols.to_vec(),
|
|
vals: new_vals,
|
|
span: *span,
|
|
}
|
|
}
|
|
Value::List { vals, span } => {
|
|
let new_vals = vals.iter().map(|v| action(v, arg, head)).collect();
|
|
|
|
Value::List {
|
|
vals: new_vals,
|
|
span: *span,
|
|
}
|
|
}
|
|
_ => input.clone(),
|
|
},
|
|
ActionMode::Local => {
|
|
Value::Error {
|
|
error: ShellError::UnsupportedInput(
|
|
"Only string values are supported".into(),
|
|
format!("input type: {:?}", other.get_type()),
|
|
head,
|
|
// This line requires the Value::Error match above.
|
|
other.expect_span(),
|
|
),
|
|
}
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
fn trim(s: &str, char_: Option<char>, closure_flags: &ClosureFlags) -> String {
|
|
let ClosureFlags {
|
|
left_trim,
|
|
right_trim,
|
|
all_flag,
|
|
both_flag,
|
|
format_flag,
|
|
} = closure_flags;
|
|
let delimiters = match char_ {
|
|
Some(c) => vec![c],
|
|
// Trying to make this trim work like rust default trim()
|
|
// which uses is_whitespace() as a default
|
|
None => vec![
|
|
' ', // space
|
|
'\x09', // horizontal tab
|
|
'\x0A', // new line, line feed
|
|
'\x0B', // vertical tab
|
|
'\x0C', // form feed, new page
|
|
'\x0D', // carriage return
|
|
], //whitespace
|
|
};
|
|
|
|
if *left_trim {
|
|
s.trim_start_matches(&delimiters[..]).to_string()
|
|
} else if *right_trim {
|
|
s.trim_end_matches(&delimiters[..]).to_string()
|
|
} else if *all_flag {
|
|
s.split(&delimiters[..])
|
|
.filter(|s| !s.is_empty())
|
|
.collect::<String>()
|
|
} else if *both_flag {
|
|
s.trim_matches(&delimiters[..]).to_string()
|
|
} else if *format_flag {
|
|
// The idea here is to use regex to go through these delimiters and
|
|
// where there are multiple, replace them with singles
|
|
|
|
// create our return string which is a copy of the original string
|
|
let mut return_string = String::from(s);
|
|
// Iterate through the delimiters replacing them with regex friendly names
|
|
for r in &delimiters {
|
|
let reg = match r {
|
|
' ' => r"\s".to_string(),
|
|
'\x09' => r"\t".to_string(),
|
|
'\x0A' => r"\n".to_string(),
|
|
'\x0B' => r"\v".to_string(),
|
|
'\x0C' => r"\f".to_string(),
|
|
'\x0D' => r"\r".to_string(),
|
|
_ => format!(r"\{}", r),
|
|
};
|
|
// create a regex string that looks for 2 or more of each of these characters
|
|
let re_str = format!("{}{{2,}}", reg);
|
|
// create the regex
|
|
let re = Regex::new(&re_str).expect("Error creating regular expression");
|
|
// replace all mutliple occurances with single occurences represented by r
|
|
let new_str = re.replace_all(&return_string, r.to_string());
|
|
// update the return string so the next loop has the latest changes
|
|
return_string = new_str.to_string();
|
|
}
|
|
// for good measure, trim_matches, which gets the start and end
|
|
// theoretically we shouldn't have to do this but from my testing, we do.
|
|
return_string.trim_matches(&delimiters[..]).to_string()
|
|
} else {
|
|
s.trim().to_string()
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::strings::str_::trim::trim_::*;
|
|
use nu_protocol::{Span, Value};
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(SubCommand {})
|
|
}
|
|
|
|
fn make_record(cols: Vec<&str>, vals: Vec<&str>) -> Value {
|
|
Value::Record {
|
|
cols: cols.iter().map(|x| x.to_string()).collect(),
|
|
vals: vals
|
|
.iter()
|
|
.map(|x| Value::string(x.to_string(), Span::test_data()))
|
|
.collect(),
|
|
span: Span::test_data(),
|
|
}
|
|
}
|
|
|
|
fn make_list(vals: Vec<&str>) -> Value {
|
|
Value::List {
|
|
vals: vals
|
|
.iter()
|
|
.map(|x| Value::string(x.to_string(), Span::test_data()))
|
|
.collect(),
|
|
span: Span::test_data(),
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn trims() {
|
|
let word = Value::test_string("andres ");
|
|
let expected = Value::test_string("andres");
|
|
let closure_flags = ClosureFlags {
|
|
both_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_global() {
|
|
let word = Value::test_string(" global ");
|
|
let expected = Value::test_string("global");
|
|
let closure_flags = ClosureFlags {
|
|
both_flag: true,
|
|
..Default::default()
|
|
};
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_ignores_numbers() {
|
|
let number = Value::test_int(2020);
|
|
let expected = Value::test_int(2020);
|
|
let closure_flags = ClosureFlags {
|
|
both_flag: true,
|
|
..Default::default()
|
|
};
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
|
|
let actual = action(&number, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_row() {
|
|
let row = make_record(vec!["a", "b"], vec![" c ", " d "]);
|
|
// ["a".to_string() => string(" c "), " b ".to_string() => string(" d ")];
|
|
let expected = make_record(vec!["a", "b"], vec!["c", "d"]);
|
|
let closure_flags = ClosureFlags {
|
|
both_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_table() {
|
|
let row = make_list(vec![" a ", "d"]);
|
|
let expected = make_list(vec!["a", "d"]);
|
|
let closure_flags = ClosureFlags {
|
|
both_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_custom_character_both_ends() {
|
|
let word = Value::test_string("!#andres#!");
|
|
let expected = Value::test_string("#andres#");
|
|
let closure_flags = ClosureFlags {
|
|
both_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some('!'),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
#[test]
|
|
fn trims_all_white_space() {
|
|
let word = Value::test_string(" Value1 a lot of spaces ");
|
|
let expected = Value::test_string("Value1alotofspaces");
|
|
let closure_flags = ClosureFlags {
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some(' '),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trims_row_all_white_space() {
|
|
let row = make_record(
|
|
vec!["a", "b"],
|
|
vec![" nu shell ", " b c d e "],
|
|
);
|
|
let expected = make_record(vec!["a", "b"], vec!["nushell", "bcde"]);
|
|
|
|
let closure_flags = ClosureFlags {
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trims_table_all_white_space() {
|
|
let row = Value::List {
|
|
vals: vec![
|
|
Value::string(" nu shell ", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string(" d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
let expected = Value::List {
|
|
vals: vec![
|
|
Value::string("nushell", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string("d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
let closure_flags = ClosureFlags {
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_all_custom_character() {
|
|
let word = Value::test_string(".Value1.a.lot..of...dots.");
|
|
let expected = Value::test_string("Value1alotofdots");
|
|
let closure_flags = ClosureFlags {
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some('.'),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trims_row_all_custom_character() {
|
|
let row = make_record(vec!["a", "b"], vec!["!!!!nu!!shell!!!", "!!b!c!!d!e!!"]);
|
|
let expected = make_record(vec!["a", "b"], vec!["nushell", "bcde"]);
|
|
let closure_flags = ClosureFlags {
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some('!'),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trims_table_all_custom_character() {
|
|
let row = Value::List {
|
|
vals: vec![
|
|
Value::string("##nu####shell##", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string("#d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
let expected = Value::List {
|
|
vals: vec![
|
|
Value::string("nushell", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string("d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
let closure_flags = ClosureFlags {
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some('#'),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_whitespace_from_left() {
|
|
let word = Value::test_string(" andres ");
|
|
let expected = Value::test_string("andres ");
|
|
let closure_flags = ClosureFlags {
|
|
left_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_left_ignores_numbers() {
|
|
let number = Value::test_int(2020);
|
|
let expected = Value::test_int(2020);
|
|
let closure_flags = ClosureFlags {
|
|
left_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&number, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_left_global() {
|
|
let word = Value::test_string(" global ");
|
|
let expected = Value::test_string("global ");
|
|
let closure_flags = ClosureFlags {
|
|
left_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_left_row() {
|
|
let row = make_record(vec!["a", "b"], vec![" c ", " d "]);
|
|
let expected = make_record(vec!["a", "b"], vec!["c ", "d "]);
|
|
let closure_flags = ClosureFlags {
|
|
left_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_left_table() {
|
|
let row = Value::List {
|
|
vals: vec![
|
|
Value::string(" a ", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string(" d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
let expected = Value::List {
|
|
vals: vec![
|
|
Value::string("a ", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string("d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
let closure_flags = ClosureFlags {
|
|
left_trim: true,
|
|
..Default::default()
|
|
};
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_custom_chars_from_left() {
|
|
let word = Value::test_string("!!! andres !!!");
|
|
let expected = Value::test_string(" andres !!!");
|
|
let closure_flags = ClosureFlags {
|
|
left_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some('!'),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
#[test]
|
|
fn trims_whitespace_from_right() {
|
|
let word = Value::test_string(" andres ");
|
|
let expected = Value::test_string(" andres");
|
|
let closure_flags = ClosureFlags {
|
|
right_trim: true,
|
|
..Default::default()
|
|
};
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_right_global() {
|
|
let word = Value::test_string(" global ");
|
|
let expected = Value::test_string(" global");
|
|
let closure_flags = ClosureFlags {
|
|
right_trim: true,
|
|
..Default::default()
|
|
};
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_right_ignores_numbers() {
|
|
let number = Value::test_int(2020);
|
|
let expected = Value::test_int(2020);
|
|
let closure_flags = ClosureFlags {
|
|
right_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&number, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_right_row() {
|
|
let row = make_record(vec!["a", "b"], vec![" c ", " d "]);
|
|
let expected = make_record(vec!["a", "b"], vec![" c", " d"]);
|
|
let closure_flags = ClosureFlags {
|
|
right_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_right_table() {
|
|
let row = Value::List {
|
|
vals: vec![
|
|
Value::string(" a ", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string(" d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
let expected = Value::List {
|
|
vals: vec![
|
|
Value::string(" a", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string(" d", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
let closure_flags = ClosureFlags {
|
|
right_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_custom_chars_from_right() {
|
|
let word = Value::test_string("#@! andres !@#");
|
|
let expected = Value::test_string("#@! andres !@");
|
|
let closure_flags = ClosureFlags {
|
|
right_trim: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some('#'),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_whitespace_format_flag() {
|
|
let word = Value::test_string(" nushell is great ");
|
|
let expected = Value::test_string("nushell is great");
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some(' '),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_format_flag_global() {
|
|
let word = Value::test_string("global ");
|
|
let expected = Value::test_string("global");
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
..Default::default()
|
|
};
|
|
let args = Arguments {
|
|
to_trim: Some(' '),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
#[test]
|
|
fn global_trim_format_flag_ignores_numbers() {
|
|
let number = Value::test_int(2020);
|
|
let expected = Value::test_int(2020);
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&number, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_format_flag_row() {
|
|
let row = make_record(vec!["a", "b"], vec![" c ", " b c d e "]);
|
|
let expected = make_record(vec!["a", "b"], vec!["c", "b c d e"]);
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn global_trim_format_flag_table() {
|
|
let row = Value::List {
|
|
vals: vec![
|
|
Value::string(" a b c d ", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string(" b c d e f", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
let expected = Value::List {
|
|
vals: vec![
|
|
Value::string("a b c d", Span::test_data()),
|
|
Value::int(65, Span::test_data()),
|
|
Value::string("b c d e f", Span::test_data()),
|
|
],
|
|
span: Span::test_data(),
|
|
};
|
|
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: None,
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&row, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_custom_chars_format_flag() {
|
|
let word = Value::test_string(".Value1.a..lot...of....dots.");
|
|
let expected = Value::test_string("Value1.a.lot.of.dots");
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some('.'),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_all_format_flag_whitespace() {
|
|
let word = Value::test_string(" nushell is great ");
|
|
let expected = Value::test_string("nushellisgreat");
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some(' '),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Local,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn trims_all_format_flag_global() {
|
|
let word = Value::test_string(" nushell is great ");
|
|
let expected = Value::test_string("nushellisgreat");
|
|
let closure_flags = ClosureFlags {
|
|
format_flag: true,
|
|
all_flag: true,
|
|
..Default::default()
|
|
};
|
|
|
|
let args = Arguments {
|
|
to_trim: Some(' '),
|
|
closure_flags,
|
|
cell_paths: None,
|
|
mode: ActionMode::Global,
|
|
};
|
|
let actual = action(&word, &args, Span::test_data());
|
|
assert_eq!(actual, expected);
|
|
}
|
|
}
|