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

Pass command's span correctly when reporting unexpected flags. (#3478)

Browse Source 
Not all lite command's first part denotes a real command (for cases like sub commands that it's second lite part accounts for the command name). This is important so that we can refer to it's span correctly. Here we fix to include the command's name span correctly whether it's a command or sub command when reporting missing flag errors.
This commit is contained in:
Andrés N. Robalino 2021-05-23 19:30:30 -05:00 committed by GitHub
parent 6165b6ae77
commit 3bcc2aad80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/nu-parser/src/parse.rs
View File

@ -1111,7 +1111,7 @@ fn parse_arg(
/// This also allows users to provide a group of shorthand flags (-la) that correspond to multiple shorthand flags at once.
fn get_flags_from_flag(
signature: &nu_protocol::Signature,
cmd: &Spanned<String>,
cmd: &InternalCommand,
arg: &Spanned<String>,
) -> (Vec<(String, NamedType)>, Option<ParseError>) {
if arg.item.starts_with('-') {
@ -1128,7 +1128,7 @@ fn get_flags_from_flag(
output.push((remainder.clone(), named_type.clone()));
} else {
error = Some(ParseError::argument_error(
cmd.clone(),
cmd.name.to_string().spanned(cmd.name_span),
ArgumentError::UnexpectedFlag(arg.clone()),
));
}
@ -1147,7 +1147,7 @@ fn get_flags_from_flag(
if !found {
error = Some(ParseError::argument_error(
cmd.clone(),
cmd.name.to_string().spanned(cmd.name_span),
ArgumentError::UnexpectedFlag(
arg.item
.clone()
@ -1484,7 +1484,7 @@ fn parse_internal_command(
while idx < lite_cmd.parts.len() {
if lite_cmd.parts[idx].item.starts_with('-') && lite_cmd.parts[idx].item.len() > 1 {
let (named_types, err) =
get_flags_from_flag(&signature, &lite_cmd.parts[0], &lite_cmd.parts[idx]);
get_flags_from_flag(&signature, &internal_command, &lite_cmd.parts[idx]);
if err.is_none() {
for (full_name, named_type) in &named_types {