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

Fix single quote external interpolation (#4867)

Browse Source
This commit is contained in:
JT 2022-03-18 19:59:28 +13:00 committed by GitHub
parent d0cbb2d12c
commit 7773c4cd4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-parser/src/parser.rs
View File

@ -263,7 +263,11 @@ pub fn parse_external_call(
let contents = working_set.get_span_contents(*span); let contents = working_set.get_span_contents(*span);
if contents.starts_with(b"$") || contents.starts_with(b"(") { if contents.starts_with(b"$") || contents.starts_with(b"(") {
let (arg, err) = parse_expression(working_set, &[*span], true); let (arg, err) = parse_dollar_expr(working_set, *span);
error = error.or(err);
args.push(arg);
} else if contents.starts_with(b"(") {
let (arg, err) = parse_full_cell_path(working_set, None, *span);
error = error.or(err); error = error.or(err);
args.push(arg); args.push(arg);
} else { } else {

9
tests/shell/pipeline/commands/external.rs
View File

@ -83,8 +83,13 @@ fn execute_binary_in_string() {
assert_eq!(actual.out, "$0"); assert_eq!(actual.out, "$0");
} }
//FIXME: jt - this is blocked on https://github.com/nushell/engine-q/issues/875 #[test]
#[ignore] fn single_quote_dollar_external() {
let actual = nu!(cwd: ".", r#"let author = 'JT'; ^echo $'foo=($author)'"#);
assert_eq!(actual.out, "foo=JT");
}
#[test] #[test]
fn redirects_custom_command_external() { fn redirects_custom_command_external() {
let actual = nu!(cwd: ".", r#"def foo [] { nu --testbin cococo foo bar }; foo | str length"#); let actual = nu!(cwd: ".", r#"def foo [] { nu --testbin cococo foo bar }; foo | str length"#);