fix unknown_command when parsing certain strings with equal signs (#14053)

# Description

Prevents errors when `=` is used before the end of:

- strings in lists/records (with a symbol adjacent to the quotes)
- raw strings

```
> ["=a"]
Error: nu::parser::unknown_command

  × Unknown command.
   ╭─[entry #9:1:1]
 1 │ ["=a"]
   · ───┬──
   ·    ╰── unknown command
   ╰────
```

```
> r#'=a'#
Error: nu::parser::unknown_command

  × Unknown command.
   ╭─[entry #5:1:1]
 1 │ r#'=a'#
   · ───┬───
   ·    ╰── unknown command
   ╰────
```

Closes #13902, closes #13901, closes #9879, closes #6401, closes #5806

# User-Facing Changes

Variable names in environment shorthand assignments must satisfy
`is_identifier`.
This commit is contained in:
Solomon 2024-10-11 12:53:39 +00:00 committed by GitHub
parent bcb7ef48b6
commit df0a174802
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 46 additions and 5 deletions

View File

@ -2943,6 +2943,10 @@ pub fn parse_string_strict(working_set: &mut StateWorkingSet, span: Span) -> Exp
working_set.error(ParseError::Unclosed("\'".into(), span)); working_set.error(ParseError::Unclosed("\'".into(), span));
return garbage(working_set, span); return garbage(working_set, span);
} }
if bytes.starts_with(b"r#") && (bytes.len() == 1 || !bytes.ends_with(b"#")) {
working_set.error(ParseError::Unclosed("r#".into(), span));
return garbage(working_set, span);
}
} }
let (bytes, quoted) = if (bytes.starts_with(b"\"") && bytes.ends_with(b"\"") && bytes.len() > 1) let (bytes, quoted) = if (bytes.starts_with(b"\"") && bytes.ends_with(b"\"") && bytes.len() > 1)
@ -5396,10 +5400,12 @@ pub fn parse_expression(working_set: &mut StateWorkingSet, spans: &[Span]) -> Ex
let starting_error_count = working_set.parse_errors.len(); let starting_error_count = working_set.parse_errors.len();
let lhs = parse_string_strict( let lhs_span = Span::new(spans[pos].start, spans[pos].start + point - 1);
working_set, if !is_identifier(working_set.get_span_contents(lhs_span)) {
Span::new(spans[pos].start, spans[pos].start + point - 1), break;
); }
let lhs = parse_string_strict(working_set, lhs_span);
let rhs = if spans[pos].start + point < spans[pos].end { let rhs = if spans[pos].start + point < spans[pos].end {
let rhs_span = Span::new(spans[pos].start + point, spans[pos].end); let rhs_span = Span::new(spans[pos].start + point, spans[pos].end);

View File

@ -176,7 +176,14 @@ fn bad_var_name() -> TestResult {
#[test] #[test]
fn bad_var_name2() -> TestResult { fn bad_var_name2() -> TestResult {
fail_test(r#"let $foo-bar = 4"#, "valid variable") fail_test(r#"let $foo-bar = 4"#, "valid variable")?;
fail_test(r#"foo-bar=4 true"#, "Command `foo-bar=4` not found")
}
#[test]
fn bad_var_name3() -> TestResult {
fail_test(r#"let $=foo = 4"#, "valid variable")?;
fail_test(r#"=foo=4 true"#, "Command `=foo=4` not found")
} }
#[test] #[test]
@ -267,6 +274,34 @@ fn string_interp_with_equals() -> TestResult {
) )
} }
#[test]
fn raw_string_with_equals() -> TestResult {
run_test(
r#"let query_prefix = r#'https://api.github.com/search/issues?q=repo:nushell/'#; $query_prefix"#,
"https://api.github.com/search/issues?q=repo:nushell/",
)
}
#[test]
fn list_quotes_with_equals() -> TestResult {
run_test(
r#"["https://api.github.com/search/issues?q=repo:nushell/"] | get 0"#,
"https://api.github.com/search/issues?q=repo:nushell/",
)
}
#[test]
fn record_quotes_with_equals() -> TestResult {
run_test(r#"{"a=":b} | get a="#, "b")?;
run_test(r#"{"=a":b} | get =a"#, "b")?;
run_test(r#"{a:"=b"} | get a"#, "=b")?;
run_test(r#"{a:"b="} | get a"#, "b=")?;
run_test(r#"{a:b,"=c":d} | get =c"#, "d")?;
run_test(r#"{a:b,"c=":d} | get c="#, "d")
}
#[test] #[test]
fn recursive_parse() -> TestResult { fn recursive_parse() -> TestResult {
run_test(r#"def c [] { c }; echo done"#, "done") run_test(r#"def c [] { c }; echo done"#, "done")