extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-29 11:54:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes the panic when using externs + string interpolation (#4799)

Browse Source
This commit is contained in:
JT 2022-03-09 13:01:23 -05:00 committed by GitHub
parent be43b3c5fc
commit 3bdd924349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/nu-parser/src/known_external.rs
View File

@ -36,6 +36,11 @@ impl Command for KnownExternal {
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
// FIXME: This is a bit of a hack, and it'd be nice for the parser/AST to be able to handle the original // FIXME: This is a bit of a hack, and it'd be nice for the parser/AST to be able to handle the original
// order of the parameters. Until then, we need to recover the original order. // order of the parameters. Until then, we need to recover the original order.
// FIXME: This is going to be a bit expensive, but we need to do it to ensure any new block/subexpression
// we find when parsing the external call is handled properly.
let mut engine_state = engine_state.clone();
let call_span = call.span(); let call_span = call.span();
let contents = engine_state.get_span_contents(&call_span); let contents = engine_state.get_span_contents(&call_span);
@ -45,8 +50,10 @@ impl Command for KnownExternal {
let (lexed, _) = crate::lex(contents, call_span.start, &[], &[], true); let (lexed, _) = crate::lex(contents, call_span.start, &[], &[], true);
let spans: Vec<_> = lexed.into_iter().map(|x| x.span).collect(); let spans: Vec<_> = lexed.into_iter().map(|x| x.span).collect();
let mut working_set = StateWorkingSet::new(engine_state); let mut working_set = StateWorkingSet::new(&engine_state);
let (external_call, _) = crate::parse_external_call(&mut working_set, &spans); let (external_call, _) = crate::parse_external_call(&mut working_set, &spans);
let delta = working_set.render();
engine_state.merge_delta(delta, None, ".")?;
match external_call.expr { match external_call.expr {
Expr::ExternalCall(head, args) => { Expr::ExternalCall(head, args) => {
@ -84,7 +91,7 @@ impl Command for KnownExternal {
)) ))
} }
command.run(engine_state, stack, &call, input) command.run(&engine_state, stack, &call, input)
} }
x => { x => {
println!("{:?}", x); println!("{:?}", x);