mirror of
https://github.com/nushell/nushell.git
synced 2024-11-29 11:54:02 +01:00
1d68c48a92
# Description _Fixes #5923_ Currently `nushell` doesn't allow short flag batches to contain arguments, despite this being a common pattern in commands like `git commit -am 'My commit message'`. This PR relaxes this so that the last flag in the batch can take an argument. # User-Facing Changes - `nu::parser::short_flag_arg_cant_take_arg` has been replaced by `nu::parser::only_last_flag_in_batch_can_take_arg` and is displayed when a flag other then the last in a short flag batch takes an argument. # Tests + Formatting - Both [`test_parser.rs`](48af0ebc3c/crates/nu-parser/tests/test_parser.rs (L640-L704)) and [`test_known_external.rs`](48af0ebc3c/src/tests/test_known_external.rs (L42-L61)) have been updated to test the new allowed and disallowed scenarios. --------- Co-authored-by: sholderbach <sholderbach@users.noreply.github.com>
123 lines
2.8 KiB
Rust
123 lines
2.8 KiB
Rust
use crate::tests::{fail_test, run_test, run_test_contains, TestResult};
|
|
|
|
// cargo version prints a string of the form:
|
|
// cargo 1.60.0 (d1fd9fe2c 2022-03-01)
|
|
|
|
#[test]
|
|
fn known_external_runs() -> TestResult {
|
|
run_test_contains(r#"extern "cargo version" []; cargo version"#, "cargo")
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_unknown_flag() -> TestResult {
|
|
run_test_contains(r#"extern "cargo" []; cargo --version"#, "cargo")
|
|
}
|
|
|
|
/// GitHub issues #5179, #4618
|
|
#[test]
|
|
fn known_external_alias() -> TestResult {
|
|
run_test_contains(
|
|
r#"extern "cargo version" []; alias cv = cargo version; cv"#,
|
|
"cargo",
|
|
)
|
|
}
|
|
|
|
/// GitHub issues #5179, #4618
|
|
#[test]
|
|
fn known_external_subcommand_alias() -> TestResult {
|
|
run_test_contains(
|
|
r#"extern "cargo version" []; alias c = cargo; c version"#,
|
|
"cargo",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_complex_unknown_args() -> TestResult {
|
|
run_test_contains(
|
|
"extern echo []; echo foo -b -as -9 --abc -- -Dxmy=AKOO - bar",
|
|
"foo -b -as -9 --abc -- -Dxmy=AKOO - bar",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_short_flag_batch_arg_allowed() -> TestResult {
|
|
run_test_contains("extern echo [-a, -b: int]; echo -ab 10", "-b 10")
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_short_flag_batch_arg_disallowed() -> TestResult {
|
|
fail_test(
|
|
"extern echo [-a: int, -b]; echo -ab 10",
|
|
"last flag can take args",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_short_flag_batch_multiple_args() -> TestResult {
|
|
fail_test(
|
|
"extern echo [-a: int, -b: int]; echo -ab 10 20",
|
|
"last flag can take args",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_missing_positional() -> TestResult {
|
|
fail_test("extern echo [a]; echo", "missing_positional")
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_type_mismatch() -> TestResult {
|
|
fail_test("extern echo [a: int]; echo 1.234", "mismatch")
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_missing_flag_param() -> TestResult {
|
|
fail_test(
|
|
"extern echo [--foo: string]; echo --foo",
|
|
"missing_flag_param",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn known_external_misc_values() -> TestResult {
|
|
run_test(
|
|
r#"
|
|
let x = 'abc'
|
|
extern echo []
|
|
echo $x [ a b c ]
|
|
"#,
|
|
"abc a b c",
|
|
)
|
|
}
|
|
|
|
/// GitHub issue #7822
|
|
#[test]
|
|
fn known_external_subcommand_from_module() -> TestResult {
|
|
run_test_contains(
|
|
r#"
|
|
module cargo {
|
|
export extern check []
|
|
};
|
|
use cargo;
|
|
cargo check -h
|
|
"#,
|
|
"cargo check",
|
|
)
|
|
}
|
|
|
|
/// GitHub issue #7822
|
|
#[test]
|
|
fn known_external_aliased_subcommand_from_module() -> TestResult {
|
|
run_test_contains(
|
|
r#"
|
|
module cargo {
|
|
export extern check []
|
|
};
|
|
use cargo;
|
|
alias cc = cargo check;
|
|
cc -h
|
|
"#,
|
|
"cargo check",
|
|
)
|
|
}
|