holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

throw parser error when multiple short flags are defined without whitespace (#6000)

Browse Source 
* throw error when multiple short flags are defined without whitespace

* add tests
This commit is contained in:
pwygab 2022-07-10 16:32:52 +08:00 committed by GitHub
parent 121e8678b6
commit f85a1d003c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crates/nu-command/tests/commands/def.rs
View File

@ -1,5 +1,5 @@
use nu_test_support::nu;
use nu_test_support::playground::Playground; use nu_test_support::playground::Playground;
use nu_test_support::{nu, pipeline};
use std::fs; use std::fs;
#[test] #[test]
@ -18,3 +18,15 @@ def e [arg] {echo $arg}
assert!(actual.out.contains("My echo\\n\\n")); assert!(actual.out.contains("My echo\\n\\n"));
}); });
} }
#[test]
fn def_errors_with_multiple_short_flags() {
let actual = nu!(
cwd: ".", pipeline(
r#"
def test-command [ --long(-l)(-o) ] {}
"#
));
assert!(actual.err.contains("expected one short flag"));
}

4
crates/nu-parser/src/parser.rs
View File

@ -3126,6 +3126,10 @@ pub fn parse_signature_helper(
var_id: Some(var_id), var_id: Some(var_id),
default_value: None, default_value: None,
})); }));
} else if flags.len() >= 3 {
error = error.or_else(|| {
Some(ParseError::Expected("one short flag".into(), span))
});
} else { } else {
let short_flag = &flags[1]; let short_flag = &flags[1];
let short_flag = if !short_flag.starts_with(b"-") let short_flag = if !short_flag.starts_with(b"-")