extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-06-30 06:30:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for arbitrarily nested subcommands (#3688)

Browse Source
This commit is contained in:
JT
2021-06-26 09:09:06 +12:00
committed by GitHub
parent 6cdd8a2b07
commit b1970f79ee
2 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1841,21 +1841,25 @@ fn parse_call(
error = error.or(err);
return (Some(ClassifiedCommand::Expr(Box::new(expr))), error);
} else if lite_cmd.parts.len() > 1 {
// Check if it's a sub-command
if let Some(signature) = scope.get_signature(&format!(
"{} {}",
lite_cmd.parts[0].item, lite_cmd.parts[1].item
)) {
let (mut internal_command, err) =
parse_internal_command(&lite_cmd, scope, &signature, 1);
// FIXME: only build up valid subcommands instead of all arguments
// by checking each part to see if it's a valid identifier name
let mut parts: Vec<_> = lite_cmd.parts.clone().into_iter().map(|x| x.item).collect();
error = error.or(err);
internal_command.args.external_redirection = if end_of_pipeline {
ExternalRedirection::None
} else {
ExternalRedirection::Stdout
};
return (Some(ClassifiedCommand::Internal(internal_command)), error);
while parts.len() > 1 {
// Check if it's a sub-command
if let Some(signature) = scope.get_signature(&parts.join(" ")) {
let (mut internal_command, err) =
parse_internal_command(&lite_cmd, scope, &signature, parts.len() - 1);
error = error.or(err);
internal_command.args.external_redirection = if end_of_pipeline {
ExternalRedirection::None
} else {
ExternalRedirection::Stdout
};
return (Some(ClassifiedCommand::Internal(internal_command)), error);
}
parts.pop();
}
}
// Check if it's an internal command