extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-21 19:58:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix string interp/shorthand overlap (#3412)

Browse Source
This commit is contained in:
JT 2021-05-12 16:20:29 +12:00 committed by GitHub
parent 2bb23c57df
commit efac712f62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1738,9 +1738,9 @@ fn expand_shorthand_forms(
lite_pipeline: &LitePipeline, lite_pipeline: &LitePipeline,
) -> (LitePipeline, Option<SpannedKeyValue>, Option<ParseError>) { ) -> (LitePipeline, Option<SpannedKeyValue>, Option<ParseError>) {
if !lite_pipeline.commands.is_empty() { if !lite_pipeline.commands.is_empty() {
if lite_pipeline.commands[0].parts[0].item == "=" { if lite_pipeline.commands[0].parts[0].contains('=')
(lite_pipeline.clone(), None, None) && !lite_pipeline.commands[0].parts[0].starts_with('$')
} else if lite_pipeline.commands[0].parts[0].contains('=') { {
let assignment: Vec<_> = lite_pipeline.commands[0].parts[0].split('=').collect(); let assignment: Vec<_> = lite_pipeline.commands[0].parts[0].split('=').collect();
if assignment.len() != 2 { if assignment.len() != 2 {
( (

12
tests/shell/pipeline/commands/internal.rs
View File

@ -137,6 +137,18 @@ fn string_interpolation_with_it_column_path() {
assert_eq!(actual.out, "sammie"); assert_eq!(actual.out, "sammie");
} }
#[test]
fn string_interpolation_shorthand_overlap() {
let actual = nu!(
cwd: ".",
r#"
$"3 + 4 = {3 + 4}"
"#
);
assert_eq!(actual.out, "3 + 4 = 7");
}
#[test] #[test]
fn bignum_large_integer() { fn bignum_large_integer() {
let actual = nu!( let actual = nu!(