extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-23 06:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow equals to sep long flag and arg (#858)

Browse Source
This commit is contained in:
JT 2022-01-26 20:20:12 -05:00 committed by GitHub
parent 6f4b7efd3e
commit 04395ee05c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,7 +253,11 @@ fn parse_long_flag(
spans: &[Span], spans: &[Span],
spans_idx: &mut usize, spans_idx: &mut usize,
sig: &Signature, sig: &Signature,
) -> (Option<String>, Option<Expression>, Option<ParseError>) { ) -> (
Option<Spanned<String>>,
Option<Expression>,
Option<ParseError>,
) {
let arg_span = spans[*spans_idx]; let arg_span = spans[*spans_idx];
let arg_contents = working_set.get_span_contents(arg_span); let arg_contents = working_set.get_span_contents(arg_span);
@ -267,19 +271,41 @@ fn parse_long_flag(
if let Some(arg_shape) = &flag.arg { if let Some(arg_shape) = &flag.arg {
if split.len() > 1 { if split.len() > 1 {
// and we also have the argument // and we also have the argument
let long_name_len = long_name.len();
let mut span = arg_span; let mut span = arg_span;
span.start += long_name.len() + 1; //offset by long flag and '=' span.start += long_name_len + 3; //offset by long flag and '='
let (arg, err) = parse_value(working_set, span, arg_shape); let (arg, err) = parse_value(working_set, span, arg_shape);
(Some(long_name), Some(arg), err) (
Some(Spanned {
item: long_name,
span: Span {
start: arg_span.start,
end: arg_span.start + long_name_len + 2,
},
}),
Some(arg),
err,
)
} else if let Some(arg) = spans.get(*spans_idx + 1) { } else if let Some(arg) = spans.get(*spans_idx + 1) {
let (arg, err) = parse_value(working_set, *arg, arg_shape); let (arg, err) = parse_value(working_set, *arg, arg_shape);
*spans_idx += 1; *spans_idx += 1;
(Some(long_name), Some(arg), err) (
Some(Spanned {
item: long_name,
span: arg_span,
}),
Some(arg),
err,
)
} else { } else {
( (
Some(long_name), Some(Spanned {
item: long_name,
span: arg_span,
}),
None, None,
Some(ParseError::MissingFlagParam( Some(ParseError::MissingFlagParam(
arg_shape.to_string(), arg_shape.to_string(),
@ -289,11 +315,21 @@ fn parse_long_flag(
} }
} else { } else {
// A flag with no argument // A flag with no argument
(Some(long_name), None, None) (
Some(Spanned {
item: long_name,
span: arg_span,
}),
None,
None,
)
} }
} else { } else {
( (
Some(long_name.clone()), Some(Spanned {
item: long_name.clone(),
span: arg_span,
}),
None, None,
Some(ParseError::UnknownFlag( Some(ParseError::UnknownFlag(
sig.name.clone(), sig.name.clone(),
@ -303,7 +339,14 @@ fn parse_long_flag(
) )
} }
} else { } else {
(Some("--".into()), None, Some(ParseError::NonUtf8(arg_span))) (
Some(Spanned {
item: "--".into(),
span: arg_span,
}),
None,
Some(ParseError::NonUtf8(arg_span)),
)
} }
} else { } else {
(None, None, None) (None, None, None)
@ -625,13 +668,7 @@ pub fn parse_internal_call(
if let Some(long_name) = long_name { if let Some(long_name) = long_name {
// We found a long flag, like --bar // We found a long flag, like --bar
error = error.or(err); error = error.or(err);
call.named.push(( call.named.push((long_name, arg));
Spanned {
item: long_name,
span: arg_span,
},
arg,
));
spans_idx += 1; spans_idx += 1;
continue; continue;
} }

5
src/tests/test_parser.rs
View File

@ -184,3 +184,8 @@ fn commands_have_usage() -> TestResult {
"cool usage", "cool usage",
) )
} }
#[test]
fn equals_separates_long_flag() -> TestResult {
run_test(r#"seq 1 4 --separator='+'"#, "1+2+3+4")
}