Merge #11632

11632: Bring back syntax highlighting in test data r=matklad a=matklad

cc #11597

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

Author: bors[bot]

crates/parser/src/tests.rs

@@ -16,15 +16,15 @@ use crate::{LexedStr, TopEntryPoint};
 fn lex_ok() {
     for case in TestCase::list("lexer/ok") {
         let actual = lex(&case.text);
-        expect_file![case.txt].assert_eq(&actual)
+        expect_file![case.rast].assert_eq(&actual)
     }
 }
 
 #[test]
 fn lex_err() {
     for case in TestCase::list("lexer/err") {
         let actual = lex(&case.text);
-        expect_file![case.txt].assert_eq(&actual)
+        expect_file![case.rast].assert_eq(&actual)
     }
 }
 
@@ -48,7 +48,7 @@ fn parse_ok() {
     for case in TestCase::list("parser/ok") {
         let (actual, errors) = parse(TopEntryPoint::SourceFile, &case.text);
         assert!(!errors, "errors in an OK file {}:\n{}", case.rs.display(), actual);
-        expect_file![case.txt].assert_eq(&actual);
+        expect_file![case.rast].assert_eq(&actual);
     }
 }
 
@@ -57,7 +57,7 @@ fn parse_inline_ok() {
     for case in TestCase::list("parser/inline/ok") {
         let (actual, errors) = parse(TopEntryPoint::SourceFile, &case.text);
         assert!(!errors, "errors in an OK file {}:\n{}", case.rs.display(), actual);
-        expect_file![case.txt].assert_eq(&actual);
+        expect_file![case.rast].assert_eq(&actual);
     }
 }
 
@@ -66,7 +66,7 @@ fn parse_err() {
     for case in TestCase::list("parser/err") {
         let (actual, errors) = parse(TopEntryPoint::SourceFile, &case.text);
         assert!(errors, "no errors in an ERR file {}:\n{}", case.rs.display(), actual);
-        expect_file![case.txt].assert_eq(&actual)
+        expect_file![case.rast].assert_eq(&actual)
     }
 }
 
@@ -75,7 +75,7 @@ fn parse_inline_err() {
     for case in TestCase::list("parser/inline/err") {
         let (actual, errors) = parse(TopEntryPoint::SourceFile, &case.text);
         assert!(errors, "no errors in an ERR file {}:\n{}", case.rs.display(), actual);
-        expect_file![case.txt].assert_eq(&actual)
+        expect_file![case.rast].assert_eq(&actual)
     }
 }
 
@@ -137,7 +137,7 @@ fn parse(entry: TopEntryPoint, text: &str) -> (String, bool) {
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 struct TestCase {
     rs: PathBuf,
-    txt: PathBuf,
+    rast: PathBuf,
     text: String,
 }
 
@@ -155,9 +155,9 @@ impl TestCase {
             let path = file.path();
             if path.extension().unwrap_or_default() == "rs" {
                 let rs = path;
-                let txt = rs.with_extension("txt");
+                let rast = rs.with_extension("rast");
                 let text = fs::read_to_string(&rs).unwrap();
-                res.push(TestCase { rs, txt, text });
+                res.push(TestCase { rs, rast, text });
             }
         }
         res.sort();

crates/parser/test_data/lexer/err/empty_exponent.rast

@@ -0,0 +1,48 @@
+FLOAT_NUMBER "0e" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "0E" error: Missing digits after the exponent symbol
+WHITESPACE "\n\n"
+FLOAT_NUMBER "42e+" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42e-" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42E+" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42E-" error: Missing digits after the exponent symbol
+WHITESPACE "\n\n"
+INT_NUMBER "42"
+DOT "."
+IDENT "e"
+PLUS "+"
+WHITESPACE "\n"
+INT_NUMBER "42"
+DOT "."
+IDENT "e"
+MINUS "-"
+WHITESPACE "\n"
+INT_NUMBER "42"
+DOT "."
+IDENT "E"
+PLUS "+"
+WHITESPACE "\n"
+INT_NUMBER "42"
+DOT "."
+IDENT "E"
+MINUS "-"
+WHITESPACE "\n\n"
+FLOAT_NUMBER "42.2e+" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42.2e-" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42.2E+" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42.2E-" error: Missing digits after the exponent symbol
+WHITESPACE "\n\n"
+FLOAT_NUMBER "42.2e+f32" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42.2e-f32" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42.2E+f32" error: Missing digits after the exponent symbol
+WHITESPACE "\n"
+FLOAT_NUMBER "42.2E-f32" error: Missing digits after the exponent symbol
+WHITESPACE "\n"

crates/parser/test_data/lexer/err/empty_int.rast

@@ -0,0 +1,26 @@
+INT_NUMBER "0b" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0o" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0x" error: Missing digits after the integer base prefix
+WHITESPACE "\n\n"
+INT_NUMBER "0b_" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0o_" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0x_" error: Missing digits after the integer base prefix
+WHITESPACE "\n\n"
+INT_NUMBER "0bnoDigit" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0onoDigit" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0xnoDigit" error: Missing digits after the integer base prefix
+WHITESPACE "\n\n"
+INT_NUMBER "0xG" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0xg" error: Missing digits after the integer base prefix
+WHITESPACE "\n\n"
+INT_NUMBER "0x_g" error: Missing digits after the integer base prefix
+WHITESPACE "\n"
+INT_NUMBER "0x_G" error: Missing digits after the integer base prefix
+WHITESPACE "\n"

crates/parser/test_data/lexer/err/lifetime_starts_with_a_number.rast

@@ -0,0 +1,4 @@
+LIFETIME_IDENT "'1" error: Lifetime name cannot start with a number
+WHITESPACE "\n"
+LIFETIME_IDENT "'1lifetime" error: Lifetime name cannot start with a number
+WHITESPACE "\n"

crates/parser/test_data/lexer/err/unclosed_block_comment_at_eof.rast

@@ -0,0 +1 @@
+COMMENT "/*" error: Missing trailing `*/` symbols to terminate the block comment

crates/parser/test_data/lexer/err/unclosed_block_comment_with_content.rast

@@ -0,0 +1 @@
+COMMENT "/* comment\n" error: Missing trailing `*/` symbols to terminate the block comment

crates/parser/test_data/lexer/err/unclosed_byte_at_eof.rast

@@ -0,0 +1 @@
+BYTE "b'" error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_byte_string_at_eof.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\"" error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_string_with_ascii_escape.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\"\\x7f" error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_string_with_ferris.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\"🦀" error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_string_with_slash.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\"\\" error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_string_with_slash_double_quote.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\"\\\"" error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_string_with_slash_n.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\"\\n" error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_string_with_space.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\" " error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_string_with_unicode_escape.rast

@@ -0,0 +1 @@
+BYTE_STRING "b\"\\u{20AA}" error: Missing trailing `"` symbol to terminate the byte string literal

crates/parser/test_data/lexer/err/unclosed_byte_with_ascii_escape.rast

@@ -0,0 +1 @@
+BYTE "b'\\x7f" error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_byte_with_ferris.rast

@@ -0,0 +1 @@
+BYTE "b'🦀" error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_byte_with_slash.rast

@@ -0,0 +1 @@
+BYTE "b'\\" error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_byte_with_slash_n.rast

@@ -0,0 +1 @@
+BYTE "b'\\n" error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_byte_with_slash_single_quote.rast

@@ -0,0 +1 @@
+BYTE "b'\\'" error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_byte_with_space.rast

@@ -0,0 +1 @@
+BYTE "b' " error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_byte_with_unicode_escape.rast

@@ -0,0 +1 @@
+BYTE "b'\\u{20AA}" error: Missing trailing `'` symbol to terminate the byte literal

crates/parser/test_data/lexer/err/unclosed_char_at_eof.rast

@@ -0,0 +1 @@
+CHAR "'" error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_char_with_ascii_escape.rast

@@ -0,0 +1 @@
+CHAR "'\\x7f" error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_char_with_ferris.rast

@@ -0,0 +1 @@
+CHAR "'🦀" error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_char_with_slash.rast

@@ -0,0 +1 @@
+CHAR "'\\" error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_char_with_slash_n.rast

@@ -0,0 +1 @@
+CHAR "'\\n" error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_char_with_slash_single_quote.rast

@@ -0,0 +1 @@
+CHAR "'\\'" error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_char_with_space.rast

@@ -0,0 +1 @@
+CHAR "' " error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_char_with_unicode_escape.rast

@@ -0,0 +1 @@
+CHAR "'\\u{20AA}" error: Missing trailing `'` symbol to terminate the character literal

crates/parser/test_data/lexer/err/unclosed_nested_block_comment_entirely.rast

@@ -0,0 +1 @@
+COMMENT "/* /* /*\n" error: Missing trailing `*/` symbols to terminate the block comment

crates/parser/test_data/lexer/err/unclosed_nested_block_comment_partially.rast

@@ -0,0 +1 @@
+COMMENT "/** /*! /* comment */ */\n" error: Missing trailing `*/` symbols to terminate the block comment

crates/parser/test_data/lexer/err/unclosed_raw_byte_string_at_eof.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##\"" error: Missing trailing `"` with `#` symbols to terminate the raw byte string literal

crates/parser/test_data/lexer/err/unclosed_raw_byte_string_with_ascii_escape.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##\"\\x7f" error: Missing trailing `"` with `#` symbols to terminate the raw byte string literal

crates/parser/test_data/lexer/err/unclosed_raw_byte_string_with_ferris.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##\"🦀" error: Missing trailing `"` with `#` symbols to terminate the raw byte string literal

crates/parser/test_data/lexer/err/unclosed_raw_byte_string_with_slash.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##\"\\" error: Missing trailing `"` with `#` symbols to terminate the raw byte string literal

crates/parser/test_data/lexer/err/unclosed_raw_byte_string_with_slash_n.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##\"\\n" error: Missing trailing `"` with `#` symbols to terminate the raw byte string literal

crates/parser/test_data/lexer/err/unclosed_raw_byte_string_with_space.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##\" " error: Missing trailing `"` with `#` symbols to terminate the raw byte string literal

crates/parser/test_data/lexer/err/unclosed_raw_byte_string_with_unicode_escape.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##\"\\u{20AA}" error: Missing trailing `"` with `#` symbols to terminate the raw byte string literal

crates/parser/test_data/lexer/err/unclosed_raw_string_at_eof.rast

@@ -0,0 +1 @@
+STRING "r##\"" error: Missing trailing `"` with `#` symbols to terminate the raw string literal

crates/parser/test_data/lexer/err/unclosed_raw_string_with_ascii_escape.rast

@@ -0,0 +1 @@
+STRING "r##\"\\x7f" error: Missing trailing `"` with `#` symbols to terminate the raw string literal

crates/parser/test_data/lexer/err/unclosed_raw_string_with_ferris.rast

@@ -0,0 +1 @@
+STRING "r##\"🦀" error: Missing trailing `"` with `#` symbols to terminate the raw string literal

crates/parser/test_data/lexer/err/unclosed_raw_string_with_slash.rast

@@ -0,0 +1 @@
+STRING "r##\"\\" error: Missing trailing `"` with `#` symbols to terminate the raw string literal

crates/parser/test_data/lexer/err/unclosed_raw_string_with_slash_n.rast

@@ -0,0 +1 @@
+STRING "r##\"\\n" error: Missing trailing `"` with `#` symbols to terminate the raw string literal

crates/parser/test_data/lexer/err/unclosed_raw_string_with_space.rast

@@ -0,0 +1 @@
+STRING "r##\" " error: Missing trailing `"` with `#` symbols to terminate the raw string literal

crates/parser/test_data/lexer/err/unclosed_raw_string_with_unicode_escape.rast

@@ -0,0 +1 @@
+STRING "r##\"\\u{20AA}" error: Missing trailing `"` with `#` symbols to terminate the raw string literal

crates/parser/test_data/lexer/err/unclosed_string_at_eof.rast

@@ -0,0 +1 @@
+STRING "\"" error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unclosed_string_with_ascii_escape.rast

@@ -0,0 +1 @@
+STRING "\"\\x7f" error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unclosed_string_with_ferris.rast

@@ -0,0 +1 @@
+STRING "\"🦀" error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unclosed_string_with_slash.rast

@@ -0,0 +1 @@
+STRING "\"\\" error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unclosed_string_with_slash_double_quote.rast

@@ -0,0 +1 @@
+STRING "\"\\\"" error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unclosed_string_with_slash_n.rast

@@ -0,0 +1 @@
+STRING "\"\\n" error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unclosed_string_with_space.rast

@@ -0,0 +1 @@
+STRING "\" " error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unclosed_string_with_unicode_escape.rast

@@ -0,0 +1 @@
+STRING "\"\\u{20AA}" error: Missing trailing `"` symbol to terminate the string literal

crates/parser/test_data/lexer/err/unstarted_raw_byte_string_at_eof.rast

@@ -0,0 +1 @@
+BYTE_STRING "br##" error: Missing `"` symbol after `#` symbols to begin the raw byte string literal

crates/parser/test_data/lexer/err/unstarted_raw_byte_string_with_ascii.rast

@@ -0,0 +1,9 @@
+BYTE_STRING "br## " error: Missing `"` symbol after `#` symbols to begin the raw byte string literal
+IDENT "I"
+WHITESPACE " "
+IDENT "lack"
+WHITESPACE " "
+IDENT "a"
+WHITESPACE " "
+IDENT "quote"
+BANG "!"

crates/parser/test_data/lexer/err/unstarted_raw_string_at_eof.rast

@@ -0,0 +1 @@
+STRING "r##" error: Missing `"` symbol after `#` symbols to begin the raw string literal

crates/parser/test_data/lexer/err/unstarted_raw_string_with_ascii.rast

@@ -0,0 +1,9 @@
+STRING "r## " error: Missing `"` symbol after `#` symbols to begin the raw string literal
+IDENT "I"
+WHITESPACE " "
+IDENT "lack"
+WHITESPACE " "
+IDENT "a"
+WHITESPACE " "
+IDENT "quote"
+BANG "!"

crates/parser/test_data/lexer/ok/block_comment.rast

@@ -0,0 +1,6 @@
+COMMENT "/* */"
+WHITESPACE "\n"
+COMMENT "/**/"
+WHITESPACE "\n"
+COMMENT "/* /* */ */"
+WHITESPACE "\n"

crates/parser/test_data/lexer/ok/byte_strings.rast

@@ -0,0 +1,22 @@
+BYTE "b''"
+WHITESPACE " "
+BYTE "b'x'"
+WHITESPACE " "
+BYTE_STRING "b\"foo\""
+WHITESPACE " "
+BYTE_STRING "br\"\""
+WHITESPACE "\n"
+BYTE "b''suf"
+WHITESPACE " "
+BYTE_STRING "b\"\"ix"
+WHITESPACE " "
+BYTE_STRING "br\"\"br"
+WHITESPACE "\n"
+BYTE "b'\\n'"
+WHITESPACE " "
+BYTE "b'\\\\'"
+WHITESPACE " "
+BYTE "b'\\''"
+WHITESPACE " "
+BYTE "b'hello'"
+WHITESPACE "\n"

crates/parser/test_data/lexer/ok/chars.rast

@@ -0,0 +1,16 @@
+CHAR "'x'"
+WHITESPACE " "
+CHAR "' '"
+WHITESPACE " "
+CHAR "'0'"
+WHITESPACE " "
+CHAR "'hello'"
+WHITESPACE " "
+CHAR "'\\x7f'"
+WHITESPACE " "
+CHAR "'\\n'"
+WHITESPACE " "
+CHAR "'\\\\'"
+WHITESPACE " "
+CHAR "'\\''"
+WHITESPACE "\n"

crates/parser/test_data/lexer/ok/hello.rast

@@ -0,0 +1,3 @@
+IDENT "hello"
+WHITESPACE " "
+IDENT "world"

crates/parser/test_data/lexer/ok/ident.rast

@@ -0,0 +1,14 @@
+IDENT "foo"
+WHITESPACE " "
+IDENT "foo_"
+WHITESPACE " "
+IDENT "_foo"
+WHITESPACE " "
+UNDERSCORE "_"
+WHITESPACE " "
+IDENT "__"
+WHITESPACE " "
+IDENT "x"
+WHITESPACE " "
+IDENT "привет"
+WHITESPACE "\n"