mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 08:23:24 +01:00
155934f783
# Description Fixes: #12795 The issue is caused by an empty position of `ParseError::UnexpectedEof`. So no detailed message is displayed. To fix the issue, I adjust the start of span to `span.end - 1`. In this way, we can make sure that it never points to an empty position. After lexing item, I also reorder the unclosed character checking . Now it will be checking unclosed opening delimiters first. # User-Facing Changes After this pr, it outputs detailed error message for incomplete string when running scripts. ## Before ``` ❯ nu -c "'ab" Error: nu::parser::unexpected_eof × Unexpected end of code. ╭─[source:1:4] 1 │ 'ab ╰──── > ./target/debug/nu -c "r#'ab" Error: nu::parser::unexpected_eof × Unexpected end of code. ╭─[source:1:6] 1 │ r#'ab ╰──── ``` ## After ``` > nu -c "'ab" Error: nu::parser::unexpected_eof × Unexpected end of code. ╭─[source:1:3] 1 │ 'ab · ┬ · ╰── expected closing ' ╰──── > ./target/debug/nu -c "r#'ab" Error: nu::parser::unexpected_eof × Unexpected end of code. ╭─[source:1:5] 1 │ r#'ab · ┬ · ╰── expected closing '# ╰──── ``` # Tests + Formatting Added some tests for incomplete string. --------- Co-authored-by: Ian Manske <ian.manske@pm.me>
172 lines
4.6 KiB
Rust
172 lines
4.6 KiB
Rust
use crate::repl::tests::{fail_test, run_test, TestResult};
|
|
|
|
#[test]
|
|
fn cjk_in_substrings() -> TestResult {
|
|
run_test(
|
|
r#"let s = '[Rust 程序设计语言](title-page.md)'; let start = ($s | str index-of '('); let end = ($s | str index-of ')'); $s | str substring ($start + 1)..($end)"#,
|
|
"title-page.md",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn string_not_in_string() -> TestResult {
|
|
run_test(r#"'d' not-in 'abc'"#, "true")
|
|
}
|
|
|
|
#[test]
|
|
fn string_in_string() -> TestResult {
|
|
run_test(r#"'z' in 'abc'"#, "false")
|
|
}
|
|
|
|
#[test]
|
|
fn non_string_in_string() -> TestResult {
|
|
fail_test(r#"42 in 'abc'"#, "is not supported")
|
|
}
|
|
|
|
#[test]
|
|
fn string_in_record() -> TestResult {
|
|
run_test(r#""a" in ('{ "a": 13, "b": 14 }' | from json)"#, "true")
|
|
}
|
|
|
|
#[test]
|
|
fn non_string_in_record() -> TestResult {
|
|
fail_test(
|
|
r#"4 in ('{ "a": 13, "b": 14 }' | from json)"#,
|
|
"mismatch during operation",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn string_in_valuestream() -> TestResult {
|
|
run_test(
|
|
r#"
|
|
'Hello' in ("Hello
|
|
World" | lines)"#,
|
|
"true",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn single_tick_interpolation() -> TestResult {
|
|
run_test(r#"$'(3 + 4)'"#, "7")
|
|
}
|
|
|
|
#[test]
|
|
fn detect_newlines() -> TestResult {
|
|
run_test("'hello\r\nworld' | lines | get 0 | str length", "5")
|
|
}
|
|
|
|
#[test]
|
|
fn case_insensitive_sort() -> TestResult {
|
|
run_test(
|
|
r#"[a, B, d, C, f] | sort -i | to json --raw"#,
|
|
"[\"a\",\"B\",\"C\",\"d\",\"f\"]",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn case_insensitive_sort_columns() -> TestResult {
|
|
run_test(
|
|
r#"[[version, package]; ["two", "Abc"], ["three", "abc"], ["four", "abc"]] | sort-by -i package version | to json --raw"#,
|
|
r#"[{"version":"four","package":"abc"},{"version":"three","package":"abc"},{"version":"two","package":"Abc"}]"#,
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn raw_string() -> TestResult {
|
|
run_test(r#"r#'abcde""fghi"''''jkl'#"#, r#"abcde""fghi"''''jkl"#)?;
|
|
run_test(r#"r##'abcde""fghi"''''#jkl'##"#, r#"abcde""fghi"''''#jkl"#)?;
|
|
run_test(
|
|
r#"r###'abcde""fghi"'''##'#jkl'###"#,
|
|
r#"abcde""fghi"'''##'#jkl"#,
|
|
)?;
|
|
run_test("r#''#", "")?;
|
|
run_test(
|
|
r#"r#'a string with sharp inside # and ends with #'#"#,
|
|
"a string with sharp inside # and ends with #",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn raw_string_inside_parentheses() -> TestResult {
|
|
let (left, right) = ('(', ')');
|
|
run_test(
|
|
&format!(r#"{left}r#'abcde""fghi"''''jkl'#{right}"#),
|
|
r#"abcde""fghi"''''jkl"#,
|
|
)?;
|
|
run_test(
|
|
&format!(r#"{left}r##'abcde""fghi"''''#jkl'##{right}"#),
|
|
r#"abcde""fghi"''''#jkl"#,
|
|
)?;
|
|
run_test(
|
|
&format!(r#"{left}r###'abcde""fghi"'''##'#jkl'###{right}"#),
|
|
r#"abcde""fghi"'''##'#jkl"#,
|
|
)?;
|
|
run_test(&format!("{left}r#''#{right}"), "")?;
|
|
run_test(
|
|
&format!(r#"{left}r#'a string with sharp inside # and ends with #'#{right}"#),
|
|
"a string with sharp inside # and ends with #",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn raw_string_inside_list() -> TestResult {
|
|
let (left, right) = ('[', ']');
|
|
run_test(
|
|
&format!(r#"{left}r#'abcde""fghi"''''jkl'#{right} | get 0"#),
|
|
r#"abcde""fghi"''''jkl"#,
|
|
)?;
|
|
run_test(
|
|
&format!(r#"{left}r##'abcde""fghi"''''#jkl'##{right} | get 0"#),
|
|
r#"abcde""fghi"''''#jkl"#,
|
|
)?;
|
|
run_test(
|
|
&format!(r#"{left}r###'abcde""fghi"'''##'#jkl'###{right} | get 0"#),
|
|
r#"abcde""fghi"'''##'#jkl"#,
|
|
)?;
|
|
run_test(&format!("{left}r#''#{right} | get 0"), "")?;
|
|
run_test(
|
|
&format!(r#"{left}r#'a string with sharp inside # and ends with #'#{right} | get 0"#),
|
|
"a string with sharp inside # and ends with #",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn raw_string_inside_closure() -> TestResult {
|
|
let (left, right) = ('{', '}');
|
|
run_test(
|
|
&format!(r#"do {left}r#'abcde""fghi"''''jkl'#{right}"#),
|
|
r#"abcde""fghi"''''jkl"#,
|
|
)?;
|
|
run_test(
|
|
&format!(r#"do {left}r##'abcde""fghi"''''#jkl'##{right}"#),
|
|
r#"abcde""fghi"''''#jkl"#,
|
|
)?;
|
|
run_test(
|
|
&format!(r#"do {left}r###'abcde""fghi"'''##'#jkl'###{right}"#),
|
|
r#"abcde""fghi"'''##'#jkl"#,
|
|
)?;
|
|
run_test(&format!("do {left}r#''#{right}"), "")?;
|
|
run_test(
|
|
&format!(r#"do {left}r#'a string with sharp inside # and ends with #'#{right}"#),
|
|
"a string with sharp inside # and ends with #",
|
|
)
|
|
}
|
|
|
|
#[test]
|
|
fn incomplete_string() -> TestResult {
|
|
fail_test("r#abc", "expected '")?;
|
|
fail_test("r#'bc", "expected closing '#")?;
|
|
fail_test("'ab\"", "expected closing '")?;
|
|
fail_test("\"ab'", "expected closing \"")?;
|
|
fail_test(
|
|
r#"def func [] {
|
|
{
|
|
"A": ""B" # <- the quote is bad
|
|
}
|
|
}
|
|
"#,
|
|
"expected closing \"",
|
|
)
|
|
}
|