From 8a7e6e752e745409181b490cf40fad3adb645b04 Mon Sep 17 00:00:00 2001 From: JT Date: Wed, 9 Mar 2022 12:28:09 -0500 Subject: [PATCH] Fixes the panic when using externs + string interpolation --- crates/nu-parser/src/known_external.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/crates/nu-parser/src/known_external.rs b/crates/nu-parser/src/known_external.rs index 358a2958360a..fc77a1ece587 100644 --- a/crates/nu-parser/src/known_external.rs +++ b/crates/nu-parser/src/known_external.rs @@ -36,6 +36,11 @@ impl Command for KnownExternal { ) -> Result { // 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. + + // 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 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 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 delta = working_set.render(); + engine_state.merge_delta(delta, None, ".")?; match external_call.expr { 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 => { println!("{:?}", x);