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

Merge pull request #263 from jonathandturner/defer-evaluation

Browse Source 
get tests passing by fixing classifying external
This commit is contained in:
Jonathan Turner 2019-08-08 17:10:32 +12:00 committed by GitHub
commit f17c6a5a37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/cli.rs
View File

@ -478,30 +478,28 @@ fn classify_command(
args, args,
})) }))
} }
false => match context.get_command(name).as_ref() { false => {
Command::Static(_command) => { let arg_list_strings: Vec<Spanned<String>> = match call.children() {
let arg_list_strings: Vec<Spanned<String>> = match call.children() { //Some(args) => args.iter().map(|i| i.as_external_arg(source)).collect(),
//Some(args) => args.iter().map(|i| i.as_external_arg(source)).collect(), Some(args) => args
Some(args) => args .iter()
.iter() .filter_map(|i| match i {
.filter_map(|i| match i { TokenNode::Whitespace(_) => None,
TokenNode::Whitespace(_) => None, other => Some(Spanned::from_item(
other => Some(Spanned::from_item( other.as_external_arg(source),
other.as_external_arg(source), other.span(),
other.span(), )),
)), })
}) .collect(),
.collect(), None => vec![],
None => vec![], };
};
Ok(ClassifiedCommand::External(ExternalCommand { Ok(ClassifiedCommand::External(ExternalCommand {
name: name.to_string(), name: name.to_string(),
name_span: Some(head.span().clone()), name_span: Some(head.span().clone()),
args: arg_list_strings, args: arg_list_strings,
})) }))
} }
},
} }
} }