diff options
author | Benjamin Coenen <[email protected]> | 2020-04-11 21:54:22 +0100 |
---|---|---|
committer | Benjamin Coenen <[email protected]> | 2020-04-11 22:45:09 +0100 |
commit | 93bfc2d05d36a47dc05a1799210327473d702dbc (patch) | |
tree | dee25e78b24b5d1b23d73ae1009bddbd060927cf /crates/ra_syntax/test_data/parser/err | |
parent | d42346fed61f706d68fe888631a41ea5f2752d7f (diff) | |
parent | fd06fe7b13045185ab4e630b0044aa9d8bbcdf8a (diff) |
Improve autocompletion by looking on the type and name
Signed-off-by: Benjamin Coenen <[email protected]>
Diffstat (limited to 'crates/ra_syntax/test_data/parser/err')
26 files changed, 96 insertions, 96 deletions
diff --git a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast index 002680583..831bbf83f 100644 --- a/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast +++ b/crates/ra_syntax/test_data/parser/err/0002_duplicate_shebang.rast | |||
@@ -3,7 +3,7 @@ SOURCE_FILE@[0; 42) | |||
3 | WHITESPACE@[20; 21) "\n" | 3 | WHITESPACE@[20; 21) "\n" |
4 | ATTR@[21; 23) | 4 | ATTR@[21; 23) |
5 | POUND@[21; 22) "#" | 5 | POUND@[21; 22) "#" |
6 | EXCL@[22; 23) "!" | 6 | BANG@[22; 23) "!" |
7 | ERROR@[23; 24) | 7 | ERROR@[23; 24) |
8 | SLASH@[23; 24) "/" | 8 | SLASH@[23; 24) "/" |
9 | USE_ITEM@[24; 28) | 9 | USE_ITEM@[24; 28) |
@@ -29,11 +29,11 @@ SOURCE_FILE@[0; 42) | |||
29 | error [23; 23): expected `[` | 29 | error [23; 23): expected `[` |
30 | error [23; 23): expected an item | 30 | error [23; 23): expected an item |
31 | error [27; 27): expected one of `*`, `::`, `{`, `self`, `super` or an identifier | 31 | error [27; 27): expected one of `*`, `::`, `{`, `self`, `super` or an identifier |
32 | error [28; 28): expected SEMI | 32 | error [28; 28): expected SEMICOLON |
33 | error [31; 31): expected EXCL | 33 | error [31; 31): expected BANG |
34 | error [31; 31): expected `{`, `[`, `(` | 34 | error [31; 31): expected `{`, `[`, `(` |
35 | error [31; 31): expected SEMI | 35 | error [31; 31): expected SEMICOLON |
36 | error [31; 31): expected an item | 36 | error [31; 31): expected an item |
37 | error [35; 35): expected EXCL | 37 | error [35; 35): expected BANG |
38 | error [41; 41): expected `{`, `[`, `(` | 38 | error [41; 41): expected `{`, `[`, `(` |
39 | error [41; 41): expected SEMI | 39 | error [41; 41): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast index 8039a8913..6b89e7572 100644 --- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast +++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.rast | |||
@@ -34,6 +34,6 @@ SOURCE_FILE@[0; 40) | |||
34 | WHITESPACE@[37; 38) "\n" | 34 | WHITESPACE@[37; 38) "\n" |
35 | R_CURLY@[38; 39) "}" | 35 | R_CURLY@[38; 39) "}" |
36 | ERROR@[39; 40) | 36 | ERROR@[39; 40) |
37 | SEMI@[39; 40) ";" | 37 | SEMICOLON@[39; 40) ";" |
38 | error [39; 39): expected item, found `;` | 38 | error [39; 39): expected item, found `;` |
39 | consider removing this semicolon | 39 | consider removing this semicolon |
diff --git a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast index 5f6e10986..1d27d4cd6 100644 --- a/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast +++ b/crates/ra_syntax/test_data/parser/err/0004_use_path_bad_segment.rast | |||
@@ -8,9 +8,9 @@ SOURCE_FILE@[0; 12) | |||
8 | PATH_SEGMENT@[4; 7) | 8 | PATH_SEGMENT@[4; 7) |
9 | NAME_REF@[4; 7) | 9 | NAME_REF@[4; 7) |
10 | IDENT@[4; 7) "foo" | 10 | IDENT@[4; 7) "foo" |
11 | COLONCOLON@[7; 9) "::" | 11 | COLON2@[7; 9) "::" |
12 | PATH_SEGMENT@[9; 11) | 12 | PATH_SEGMENT@[9; 11) |
13 | ERROR@[9; 11) | 13 | ERROR@[9; 11) |
14 | INT_NUMBER@[9; 11) "92" | 14 | INT_NUMBER@[9; 11) "92" |
15 | SEMI@[11; 12) ";" | 15 | SEMICOLON@[11; 12) ";" |
16 | error [9; 9): expected identifier | 16 | error [9; 9): expected identifier |
diff --git a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast index 1978f30fa..c24e478f3 100644 --- a/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast +++ b/crates/ra_syntax/test_data/parser/err/0007_stray_curly_in_file.rast | |||
@@ -7,7 +7,7 @@ SOURCE_FILE@[0; 31) | |||
7 | WHITESPACE@[9; 10) " " | 7 | WHITESPACE@[9; 10) " " |
8 | NAME@[10; 11) | 8 | NAME@[10; 11) |
9 | IDENT@[10; 11) "S" | 9 | IDENT@[10; 11) "S" |
10 | SEMI@[11; 12) ";" | 10 | SEMICOLON@[11; 12) ";" |
11 | WHITESPACE@[12; 14) "\n\n" | 11 | WHITESPACE@[12; 14) "\n\n" |
12 | ERROR@[14; 15) | 12 | ERROR@[14; 15) |
13 | R_CURLY@[14; 15) "}" | 13 | R_CURLY@[14; 15) "}" |
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast index 98248227d..9f5041ae4 100644 --- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.rast | |||
@@ -76,6 +76,6 @@ SOURCE_FILE@[0; 95) | |||
76 | WHITESPACE@[92; 93) "\n" | 76 | WHITESPACE@[92; 93) "\n" |
77 | R_CURLY@[93; 94) "}" | 77 | R_CURLY@[93; 94) "}" |
78 | WHITESPACE@[94; 95) "\n" | 78 | WHITESPACE@[94; 95) "\n" |
79 | error [17; 17): expected EXCL | 79 | error [17; 17): expected BANG |
80 | error [19; 19): expected SEMI | 80 | error [19; 19): expected SEMICOLON |
81 | error [20; 20): expected an item | 81 | error [20; 20): expected an item |
diff --git a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast index ca508ac7c..7ed80477d 100644 --- a/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast +++ b/crates/ra_syntax/test_data/parser/err/0009_broken_struct_type_parameter.rast | |||
@@ -43,7 +43,7 @@ SOURCE_FILE@[0; 43) | |||
43 | WHITESPACE@[39; 40) " " | 43 | WHITESPACE@[39; 40) " " |
44 | NAME@[40; 41) | 44 | NAME@[40; 41) |
45 | IDENT@[40; 41) "T" | 45 | IDENT@[40; 41) "T" |
46 | SEMI@[41; 42) ";" | 46 | SEMICOLON@[41; 42) ";" |
47 | WHITESPACE@[42; 43) "\n" | 47 | WHITESPACE@[42; 43) "\n" |
48 | error [9; 9): expected type parameter | 48 | error [9; 9): expected type parameter |
49 | error [11; 11): expected COMMA | 49 | error [11; 11): expected COMMA |
@@ -53,6 +53,6 @@ error [12; 12): expected an item | |||
53 | error [14; 14): expected an item | 53 | error [14; 14): expected an item |
54 | error [15; 15): expected an item | 54 | error [15; 15): expected an item |
55 | error [17; 17): expected an item | 55 | error [17; 17): expected an item |
56 | error [24; 24): expected SEMI | 56 | error [24; 24): expected SEMICOLON |
57 | error [24; 24): expected expression | 57 | error [24; 24): expected expression |
58 | error [25; 25): expected SEMI | 58 | error [25; 25): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast index 0ffbd25aa..5559c3297 100644 --- a/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast +++ b/crates/ra_syntax/test_data/parser/err/0010_unsafe_lambda_block.rast | |||
@@ -37,9 +37,9 @@ SOURCE_FILE@[0; 42) | |||
37 | R_PAREN@[35; 36) ")" | 37 | R_PAREN@[35; 36) ")" |
38 | WHITESPACE@[36; 37) " " | 38 | WHITESPACE@[36; 37) " " |
39 | R_CURLY@[37; 38) "}" | 39 | R_CURLY@[37; 38) "}" |
40 | SEMI@[38; 39) ";" | 40 | SEMICOLON@[38; 39) ";" |
41 | WHITESPACE@[39; 40) "\n" | 41 | WHITESPACE@[39; 40) "\n" |
42 | R_CURLY@[40; 41) "}" | 42 | R_CURLY@[40; 41) "}" |
43 | WHITESPACE@[41; 42) "\n" | 43 | WHITESPACE@[41; 42) "\n" |
44 | error [24; 24): expected `{` | 44 | error [24; 24): expected `{` |
45 | error [24; 24): expected SEMI | 45 | error [24; 24): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast index 900894dcf..99c212fd6 100644 --- a/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast +++ b/crates/ra_syntax/test_data/parser/err/0011_extern_struct.rast | |||
@@ -8,6 +8,6 @@ SOURCE_FILE@[0; 19) | |||
8 | WHITESPACE@[13; 14) " " | 8 | WHITESPACE@[13; 14) " " |
9 | NAME@[14; 17) | 9 | NAME@[14; 17) |
10 | IDENT@[14; 17) "Foo" | 10 | IDENT@[14; 17) "Foo" |
11 | SEMI@[17; 18) ";" | 11 | SEMICOLON@[17; 18) ";" |
12 | WHITESPACE@[18; 19) "\n" | 12 | WHITESPACE@[18; 19) "\n" |
13 | error [6; 6): expected existential, fn, trait or impl | 13 | error [6; 6): expected existential, fn, trait or impl |
diff --git a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast index 12ebc2a3a..0a3c0313d 100644 --- a/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast +++ b/crates/ra_syntax/test_data/parser/err/0012_broken_lambda.rast | |||
@@ -106,7 +106,7 @@ SOURCE_FILE@[0; 389) | |||
106 | WHITESPACE@[122; 123) | 106 | WHITESPACE@[122; 123) |
107 | LITERAL@[123; 124) | 107 | LITERAL@[123; 124) |
108 | INT_NUMBER@[123; 124) "0" | 108 | INT_NUMBER@[123; 124) "0" |
109 | SEMI@[124; 125) | 109 | SEMICOLON@[124; 125) |
110 | WHITESPACE@[125; 130) | 110 | WHITESPACE@[125; 130) |
111 | LET_STMT@[130; 389) | 111 | LET_STMT@[130; 389) |
112 | LET_KW@[130; 133) | 112 | LET_KW@[130; 133) |
@@ -226,7 +226,7 @@ SOURCE_FILE@[0; 389) | |||
226 | err: `expected pattern` | 226 | err: `expected pattern` |
227 | PARAM@[236; 237) | 227 | PARAM@[236; 237) |
228 | ERROR@[236; 237) | 228 | ERROR@[236; 237) |
229 | EXCL@[236; 237) | 229 | BANG@[236; 237) |
230 | err: `expected COMMA` | 230 | err: `expected COMMA` |
231 | PARAM@[237; 242) | 231 | PARAM@[237; 242) |
232 | BIND_PAT@[237; 242) | 232 | BIND_PAT@[237; 242) |
@@ -272,7 +272,7 @@ SOURCE_FILE@[0; 389) | |||
272 | err: `expected pattern` | 272 | err: `expected pattern` |
273 | PARAM@[283; 284) | 273 | PARAM@[283; 284) |
274 | ERROR@[283; 284) | 274 | ERROR@[283; 284) |
275 | SEMI@[283; 284) | 275 | SEMICOLON@[283; 284) |
276 | err: `expected COMMA` | 276 | err: `expected COMMA` |
277 | WHITESPACE@[284; 297) | 277 | WHITESPACE@[284; 297) |
278 | err: `expected pattern` | 278 | err: `expected pattern` |
@@ -327,7 +327,7 @@ SOURCE_FILE@[0; 389) | |||
327 | err: `expected pattern` | 327 | err: `expected pattern` |
328 | PARAM@[346; 347) | 328 | PARAM@[346; 347) |
329 | ERROR@[346; 347) | 329 | ERROR@[346; 347) |
330 | SEMI@[346; 347) | 330 | SEMICOLON@[346; 347) |
331 | err: `expected COMMA` | 331 | err: `expected COMMA` |
332 | WHITESPACE@[347; 360) | 332 | WHITESPACE@[347; 360) |
333 | err: `expected pattern` | 333 | err: `expected pattern` |
@@ -371,7 +371,7 @@ SOURCE_FILE@[0; 389) | |||
371 | err: `expected pattern` | 371 | err: `expected pattern` |
372 | PARAM@[385; 386) | 372 | PARAM@[385; 386) |
373 | ERROR@[385; 386) | 373 | ERROR@[385; 386) |
374 | SEMI@[385; 386) | 374 | SEMICOLON@[385; 386) |
375 | err: `expected COMMA` | 375 | err: `expected COMMA` |
376 | WHITESPACE@[386; 387) | 376 | WHITESPACE@[386; 387) |
377 | err: `expected pattern` | 377 | err: `expected pattern` |
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast index 7a934cf66..cb570dc1c 100644 --- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast +++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.rast | |||
@@ -67,7 +67,7 @@ SOURCE_FILE@[0; 86) | |||
67 | ERROR@[82; 83) | 67 | ERROR@[82; 83) |
68 | R_PAREN@[82; 83) ")" | 68 | R_PAREN@[82; 83) ")" |
69 | ERROR@[83; 84) | 69 | ERROR@[83; 84) |
70 | SEMI@[83; 84) ";" | 70 | SEMICOLON@[83; 84) ";" |
71 | WHITESPACE@[84; 86) "\n\n" | 71 | WHITESPACE@[84; 86) "\n\n" |
72 | error [67; 67): expected type | 72 | error [67; 67): expected type |
73 | error [68; 68): expected COMMA | 73 | error [68; 68): expected COMMA |
@@ -80,7 +80,7 @@ error [68; 68): expected COMMA | |||
80 | error [72; 72): expected COMMA | 80 | error [72; 72): expected COMMA |
81 | error [72; 72): expected a type | 81 | error [72; 72): expected a type |
82 | error [72; 72): expected R_PAREN | 82 | error [72; 72): expected R_PAREN |
83 | error [72; 72): expected SEMI | 83 | error [72; 72): expected SEMICOLON |
84 | error [72; 72): expected an item | 84 | error [72; 72): expected an item |
85 | error [73; 73): expected an item | 85 | error [73; 73): expected an item |
86 | error [79; 79): expected an item | 86 | error [79; 79): expected an item |
diff --git a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast index 6343580e0..aca5a3ada 100644 --- a/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast +++ b/crates/ra_syntax/test_data/parser/err/0016_missing_semi.rast | |||
@@ -37,8 +37,8 @@ SOURCE_FILE@[0; 56) | |||
37 | WHITESPACE@[49; 50) " " | 37 | WHITESPACE@[49; 50) " " |
38 | LITERAL@[50; 52) | 38 | LITERAL@[50; 52) |
39 | INT_NUMBER@[50; 52) "92" | 39 | INT_NUMBER@[50; 52) "92" |
40 | SEMI@[52; 53) ";" | 40 | SEMICOLON@[52; 53) ";" |
41 | WHITESPACE@[53; 54) "\n" | 41 | WHITESPACE@[53; 54) "\n" |
42 | R_CURLY@[54; 55) "}" | 42 | R_CURLY@[54; 55) "}" |
43 | WHITESPACE@[55; 56) "\n" | 43 | WHITESPACE@[55; 56) "\n" |
44 | error [38; 38): expected SEMI | 44 | error [38; 38): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast index 59480e999..f9f4b9bc2 100644 --- a/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast +++ b/crates/ra_syntax/test_data/parser/err/0017_incomplete_binexpr.rast | |||
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 47) | |||
34 | WHITESPACE@[32; 33) " " | 34 | WHITESPACE@[32; 33) " " |
35 | LITERAL@[33; 35) | 35 | LITERAL@[33; 35) |
36 | INT_NUMBER@[33; 35) "92" | 36 | INT_NUMBER@[33; 35) "92" |
37 | SEMI@[35; 36) ";" | 37 | SEMICOLON@[35; 36) ";" |
38 | WHITESPACE@[36; 41) "\n " | 38 | WHITESPACE@[36; 41) "\n " |
39 | BIN_EXPR@[41; 44) | 39 | BIN_EXPR@[41; 44) |
40 | LITERAL@[41; 42) | 40 | LITERAL@[41; 42) |
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index 4b13a7236..9a8f76673 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast | |||
@@ -60,7 +60,7 @@ SOURCE_FILE@[0; 183) | |||
60 | ARG_LIST@[82; 84) | 60 | ARG_LIST@[82; 84) |
61 | L_PAREN@[82; 83) "(" | 61 | L_PAREN@[82; 83) "(" |
62 | R_PAREN@[83; 84) ")" | 62 | R_PAREN@[83; 84) ")" |
63 | SEMI@[84; 85) ";" | 63 | SEMICOLON@[84; 85) ";" |
64 | WHITESPACE@[85; 94) "\n " | 64 | WHITESPACE@[85; 94) "\n " |
65 | METHOD_CALL_EXPR@[94; 155) | 65 | METHOD_CALL_EXPR@[94; 155) |
66 | FIELD_EXPR@[94; 105) | 66 | FIELD_EXPR@[94; 105) |
@@ -107,7 +107,7 @@ SOURCE_FILE@[0; 183) | |||
107 | PATH_SEGMENT@[146; 149) | 107 | PATH_SEGMENT@[146; 149) |
108 | NAME_REF@[146; 149) | 108 | NAME_REF@[146; 149) |
109 | IDENT@[146; 149) "vec" | 109 | IDENT@[146; 149) "vec" |
110 | EXCL@[149; 150) "!" | 110 | BANG@[149; 150) "!" |
111 | TOKEN_TREE@[150; 152) | 111 | TOKEN_TREE@[150; 152) |
112 | L_BRACK@[150; 151) "[" | 112 | L_BRACK@[150; 151) "[" |
113 | R_BRACK@[151; 152) "]" | 113 | R_BRACK@[151; 152) "]" |
diff --git a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast index 97e91a94f..e283091e1 100644 --- a/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0019_let_recover.rast | |||
@@ -32,7 +32,7 @@ SOURCE_FILE@[0; 139) | |||
32 | WHITESPACE@[38; 39) " " | 32 | WHITESPACE@[38; 39) " " |
33 | LITERAL@[39; 40) | 33 | LITERAL@[39; 40) |
34 | INT_NUMBER@[39; 40) "1" | 34 | INT_NUMBER@[39; 40) "1" |
35 | SEMI@[40; 41) ";" | 35 | SEMICOLON@[40; 41) ";" |
36 | WHITESPACE@[41; 46) "\n " | 36 | WHITESPACE@[41; 46) "\n " |
37 | LET_STMT@[46; 49) | 37 | LET_STMT@[46; 49) |
38 | LET_KW@[46; 49) "let" | 38 | LET_KW@[46; 49) "let" |
@@ -48,7 +48,7 @@ SOURCE_FILE@[0; 139) | |||
48 | WHITESPACE@[63; 64) " " | 48 | WHITESPACE@[63; 64) " " |
49 | LITERAL@[64; 66) | 49 | LITERAL@[64; 66) |
50 | INT_NUMBER@[64; 66) "92" | 50 | INT_NUMBER@[64; 66) "92" |
51 | SEMI@[66; 67) ";" | 51 | SEMICOLON@[66; 67) ";" |
52 | WHITESPACE@[67; 72) "\n " | 52 | WHITESPACE@[67; 72) "\n " |
53 | LET_STMT@[72; 75) | 53 | LET_STMT@[72; 75) |
54 | LET_KW@[72; 75) "let" | 54 | LET_KW@[72; 75) "let" |
@@ -96,12 +96,12 @@ SOURCE_FILE@[0; 139) | |||
96 | R_CURLY@[137; 138) "}" | 96 | R_CURLY@[137; 138) "}" |
97 | WHITESPACE@[138; 139) "\n" | 97 | WHITESPACE@[138; 139) "\n" |
98 | error [24; 24): expected expression | 98 | error [24; 24): expected expression |
99 | error [24; 24): expected SEMI | 99 | error [24; 24): expected SEMICOLON |
100 | error [49; 49): expected pattern | 100 | error [49; 49): expected pattern |
101 | error [49; 49): expected SEMI | 101 | error [49; 49): expected SEMICOLON |
102 | error [75; 75): expected pattern | 102 | error [75; 75): expected pattern |
103 | error [75; 75): expected SEMI | 103 | error [75; 75): expected SEMICOLON |
104 | error [98; 98): expected pattern | 104 | error [98; 98): expected pattern |
105 | error [98; 98): expected SEMI | 105 | error [98; 98): expected SEMICOLON |
106 | error [124; 124): expected pattern | 106 | error [124; 124): expected pattern |
107 | error [124; 124): expected SEMI | 107 | error [124; 124): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast index 9f50c85e5..465749f95 100644 --- a/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast +++ b/crates/ra_syntax/test_data/parser/err/0022_bad_exprs.rast | |||
@@ -150,34 +150,34 @@ SOURCE_FILE@[0; 112) | |||
150 | WHITESPACE@[111; 112) "\n" | 150 | WHITESPACE@[111; 112) "\n" |
151 | error [16; 16): expected expression | 151 | error [16; 16): expected expression |
152 | error [17; 17): expected R_BRACK | 152 | error [17; 17): expected R_BRACK |
153 | error [17; 17): expected SEMI | 153 | error [17; 17): expected SEMICOLON |
154 | error [17; 17): expected expression | 154 | error [17; 17): expected expression |
155 | error [18; 18): expected SEMI | 155 | error [18; 18): expected SEMICOLON |
156 | error [25; 25): expected a name | 156 | error [25; 25): expected a name |
157 | error [26; 26): expected `;`, `{`, or `(` | 157 | error [26; 26): expected `;`, `{`, or `(` |
158 | error [30; 30): expected pattern | 158 | error [30; 30): expected pattern |
159 | error [31; 31): expected SEMI | 159 | error [31; 31): expected SEMICOLON |
160 | error [53; 53): expected expression | 160 | error [53; 53): expected expression |
161 | error [54; 54): expected SEMI | 161 | error [54; 54): expected SEMICOLON |
162 | error [54; 54): expected expression | 162 | error [54; 54): expected expression |
163 | error [55; 55): expected SEMI | 163 | error [55; 55): expected SEMICOLON |
164 | error [60; 60): expected type | 164 | error [60; 60): expected type |
165 | error [60; 60): expected `{` | 165 | error [60; 60): expected `{` |
166 | error [60; 60): expected expression | 166 | error [60; 60): expected expression |
167 | error [61; 61): expected SEMI | 167 | error [61; 61): expected SEMICOLON |
168 | error [65; 65): expected pattern | 168 | error [65; 65): expected pattern |
169 | error [65; 65): expected SEMI | 169 | error [65; 65): expected SEMICOLON |
170 | error [65; 65): expected expression | 170 | error [65; 65): expected expression |
171 | error [92; 92): expected expression | 171 | error [92; 92): expected expression |
172 | error [93; 93): expected SEMI | 172 | error [93; 93): expected SEMICOLON |
173 | error [93; 93): expected expression | 173 | error [93; 93): expected expression |
174 | error [94; 94): expected SEMI | 174 | error [94; 94): expected SEMICOLON |
175 | error [95; 95): expected expression | 175 | error [95; 95): expected expression |
176 | error [96; 96): expected SEMI | 176 | error [96; 96): expected SEMICOLON |
177 | error [96; 96): expected expression | 177 | error [96; 96): expected expression |
178 | error [97; 97): expected SEMI | 178 | error [97; 97): expected SEMICOLON |
179 | error [103; 103): expected a name | 179 | error [103; 103): expected a name |
180 | error [104; 104): expected `{` | 180 | error [104; 104): expected `{` |
181 | error [108; 108): expected pattern | 181 | error [108; 108): expected pattern |
182 | error [108; 108): expected SEMI | 182 | error [108; 108): expected SEMICOLON |
183 | error [108; 108): expected expression | 183 | error [108; 108): expected expression |
diff --git a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast index 775e4b0da..97abe9510 100644 --- a/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast +++ b/crates/ra_syntax/test_data/parser/err/0023_mismatched_paren.rast | |||
@@ -17,7 +17,7 @@ SOURCE_FILE@[0; 94) | |||
17 | PATH_SEGMENT@[16; 19) | 17 | PATH_SEGMENT@[16; 19) |
18 | NAME_REF@[16; 19) | 18 | NAME_REF@[16; 19) |
19 | IDENT@[16; 19) "foo" | 19 | IDENT@[16; 19) "foo" |
20 | EXCL@[19; 20) "!" | 20 | BANG@[19; 20) "!" |
21 | WHITESPACE@[20; 21) " " | 21 | WHITESPACE@[20; 21) " " |
22 | TOKEN_TREE@[21; 49) | 22 | TOKEN_TREE@[21; 49) |
23 | L_PAREN@[21; 22) "(" | 23 | L_PAREN@[21; 22) "(" |
diff --git a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast index c5c8a29ba..a3cf3e60a 100644 --- a/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast +++ b/crates/ra_syntax/test_data/parser/err/0024_many_type_parens.rast | |||
@@ -144,7 +144,7 @@ SOURCE_FILE@[0; 240) | |||
144 | EXPR_STMT@[121; 123) | 144 | EXPR_STMT@[121; 123) |
145 | ERROR@[121; 122) | 145 | ERROR@[121; 122) |
146 | R_ANGLE@[121; 122) ">" | 146 | R_ANGLE@[121; 122) ">" |
147 | SEMI@[122; 123) ";" | 147 | SEMICOLON@[122; 123) ";" |
148 | WHITESPACE@[123; 128) "\n " | 148 | WHITESPACE@[123; 128) "\n " |
149 | LET_STMT@[128; 141) | 149 | LET_STMT@[128; 141) |
150 | LET_KW@[128; 131) "let" | 150 | LET_KW@[128; 131) "let" |
@@ -219,7 +219,7 @@ SOURCE_FILE@[0; 240) | |||
219 | R_PAREN@[177; 178) ")" | 219 | R_PAREN@[177; 178) ")" |
220 | R_ANGLE@[178; 179) ">" | 220 | R_ANGLE@[178; 179) ">" |
221 | ERROR@[179; 180) | 221 | ERROR@[179; 180) |
222 | SEMI@[179; 180) ";" | 222 | SEMICOLON@[179; 180) ";" |
223 | WHITESPACE@[180; 185) "\n " | 223 | WHITESPACE@[180; 185) "\n " |
224 | LET_STMT@[185; 235) | 224 | LET_STMT@[185; 235) |
225 | LET_KW@[185; 188) "let" | 225 | LET_KW@[185; 188) "let" |
@@ -286,24 +286,24 @@ SOURCE_FILE@[0; 240) | |||
286 | EXPR_STMT@[235; 237) | 286 | EXPR_STMT@[235; 237) |
287 | ERROR@[235; 236) | 287 | ERROR@[235; 236) |
288 | R_ANGLE@[235; 236) ">" | 288 | R_ANGLE@[235; 236) ">" |
289 | SEMI@[236; 237) ";" | 289 | SEMICOLON@[236; 237) ";" |
290 | WHITESPACE@[237; 238) "\n" | 290 | WHITESPACE@[237; 238) "\n" |
291 | R_CURLY@[238; 239) "}" | 291 | R_CURLY@[238; 239) "}" |
292 | WHITESPACE@[239; 240) "\n" | 292 | WHITESPACE@[239; 240) "\n" |
293 | error [88; 88): expected COMMA | 293 | error [88; 88): expected COMMA |
294 | error [88; 88): expected R_ANGLE | 294 | error [88; 88): expected R_ANGLE |
295 | error [121; 121): expected SEMI | 295 | error [121; 121): expected SEMICOLON |
296 | error [121; 121): expected expression | 296 | error [121; 121): expected expression |
297 | error [140; 140): expected type | 297 | error [140; 140): expected type |
298 | error [141; 141): expected R_PAREN | 298 | error [141; 141): expected R_PAREN |
299 | error [141; 141): expected COMMA | 299 | error [141; 141): expected COMMA |
300 | error [141; 141): expected R_ANGLE | 300 | error [141; 141): expected R_ANGLE |
301 | error [141; 141): expected SEMI | 301 | error [141; 141): expected SEMICOLON |
302 | error [146; 146): expected SEMI | 302 | error [146; 146): expected SEMICOLON |
303 | error [146; 146): expected expression | 303 | error [146; 146): expected expression |
304 | error [147; 147): expected SEMI | 304 | error [147; 147): expected SEMICOLON |
305 | error [148; 148): expected expression | 305 | error [148; 148): expected expression |
306 | error [149; 149): expected SEMI | 306 | error [149; 149): expected SEMICOLON |
307 | error [154; 154): expected pattern | 307 | error [154; 154): expected pattern |
308 | error [155; 155): expected IN_KW | 308 | error [155; 155): expected IN_KW |
309 | error [155; 155): expected expression | 309 | error [155; 155): expected expression |
@@ -314,8 +314,8 @@ error [179; 179): expected expression | |||
314 | error [180; 180): expected COMMA | 314 | error [180; 180): expected COMMA |
315 | error [180; 180): expected expression | 315 | error [180; 180): expected expression |
316 | error [180; 180): expected R_PAREN | 316 | error [180; 180): expected R_PAREN |
317 | error [180; 180): expected SEMI | 317 | error [180; 180): expected SEMICOLON |
318 | error [215; 215): expected COMMA | 318 | error [215; 215): expected COMMA |
319 | error [215; 215): expected R_ANGLE | 319 | error [215; 215): expected R_ANGLE |
320 | error [235; 235): expected SEMI | 320 | error [235; 235): expected SEMICOLON |
321 | error [235; 235): expected expression | 321 | error [235; 235): expected expression |
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.rast b/crates/ra_syntax/test_data/parser/err/0025_nope.rast index ca7f2d255..2b37ce94d 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.rast +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.rast | |||
@@ -78,7 +78,7 @@ SOURCE_FILE@[0; 575) | |||
78 | WHITESPACE@[183; 184) " " | 78 | WHITESPACE@[183; 184) " " |
79 | LITERAL@[184; 185) | 79 | LITERAL@[184; 185) |
80 | INT_NUMBER@[184; 185) "1" | 80 | INT_NUMBER@[184; 185) "1" |
81 | SEMI@[185; 186) ";" | 81 | SEMICOLON@[185; 186) ";" |
82 | WHITESPACE@[186; 191) "\n " | 82 | WHITESPACE@[186; 191) "\n " |
83 | ENUM_DEF@[191; 223) | 83 | ENUM_DEF@[191; 223) |
84 | ENUM_KW@[191; 195) "enum" | 84 | ENUM_KW@[191; 195) "enum" |
@@ -185,7 +185,7 @@ SOURCE_FILE@[0; 575) | |||
185 | WHITESPACE@[507; 508) " " | 185 | WHITESPACE@[507; 508) " " |
186 | ERROR@[508; 509) | 186 | ERROR@[508; 509) |
187 | UNDERSCORE@[508; 509) "_" | 187 | UNDERSCORE@[508; 509) "_" |
188 | SEMI@[509; 510) ";" | 188 | SEMICOLON@[509; 510) ";" |
189 | WHITESPACE@[510; 511) " " | 189 | WHITESPACE@[510; 511) " " |
190 | COMMENT@[511; 572) "//~ ERROR: expected e ..." | 190 | COMMENT@[511; 572) "//~ ERROR: expected e ..." |
191 | WHITESPACE@[572; 573) "\n" | 191 | WHITESPACE@[572; 573) "\n" |
diff --git a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast index 522a0d0e0..00d9fd511 100644 --- a/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0031_block_inner_attrs.rast | |||
@@ -27,7 +27,7 @@ SOURCE_FILE@[0; 350) | |||
27 | WHITESPACE@[30; 39) "\n " | 27 | WHITESPACE@[30; 39) "\n " |
28 | ATTR@[39; 83) | 28 | ATTR@[39; 83) |
29 | POUND@[39; 40) "#" | 29 | POUND@[39; 40) "#" |
30 | EXCL@[40; 41) "!" | 30 | BANG@[40; 41) "!" |
31 | L_BRACK@[41; 42) "[" | 31 | L_BRACK@[41; 42) "[" |
32 | PATH@[42; 45) | 32 | PATH@[42; 45) |
33 | PATH_SEGMENT@[42; 45) | 33 | PATH_SEGMENT@[42; 45) |
@@ -42,7 +42,7 @@ SOURCE_FILE@[0; 350) | |||
42 | COMMENT@[92; 122) "//! Nor are ModuleDoc ..." | 42 | COMMENT@[92; 122) "//! Nor are ModuleDoc ..." |
43 | WHITESPACE@[122; 127) "\n " | 43 | WHITESPACE@[122; 127) "\n " |
44 | R_CURLY@[127; 128) "}" | 44 | R_CURLY@[127; 128) "}" |
45 | SEMI@[128; 129) ";" | 45 | SEMICOLON@[128; 129) ";" |
46 | WHITESPACE@[129; 134) "\n " | 46 | WHITESPACE@[129; 134) "\n " |
47 | EXPR_STMT@[134; 257) | 47 | EXPR_STMT@[134; 257) |
48 | IF_EXPR@[134; 257) | 48 | IF_EXPR@[134; 257) |
@@ -58,7 +58,7 @@ SOURCE_FILE@[0; 350) | |||
58 | WHITESPACE@[143; 152) "\n " | 58 | WHITESPACE@[143; 152) "\n " |
59 | ATTR@[152; 171) | 59 | ATTR@[152; 171) |
60 | POUND@[152; 153) "#" | 60 | POUND@[152; 153) "#" |
61 | EXCL@[153; 154) "!" | 61 | BANG@[153; 154) "!" |
62 | L_BRACK@[154; 155) "[" | 62 | L_BRACK@[154; 155) "[" |
63 | PATH@[155; 158) | 63 | PATH@[155; 158) |
64 | PATH_SEGMENT@[155; 158) | 64 | PATH_SEGMENT@[155; 158) |
@@ -72,7 +72,7 @@ SOURCE_FILE@[0; 350) | |||
72 | WHITESPACE@[171; 180) "\n " | 72 | WHITESPACE@[171; 180) "\n " |
73 | ATTR@[180; 212) | 73 | ATTR@[180; 212) |
74 | POUND@[180; 181) "#" | 74 | POUND@[180; 181) "#" |
75 | EXCL@[181; 182) "!" | 75 | BANG@[181; 182) "!" |
76 | L_BRACK@[182; 183) "[" | 76 | L_BRACK@[182; 183) "[" |
77 | PATH@[183; 186) | 77 | PATH@[183; 186) |
78 | PATH_SEGMENT@[183; 186) | 78 | PATH_SEGMENT@[183; 186) |
@@ -101,7 +101,7 @@ SOURCE_FILE@[0; 350) | |||
101 | WHITESPACE@[274; 283) "\n " | 101 | WHITESPACE@[274; 283) "\n " |
102 | ATTR@[283; 302) | 102 | ATTR@[283; 302) |
103 | POUND@[283; 284) "#" | 103 | POUND@[283; 284) "#" |
104 | EXCL@[284; 285) "!" | 104 | BANG@[284; 285) "!" |
105 | L_BRACK@[285; 286) "[" | 105 | L_BRACK@[285; 286) "[" |
106 | PATH@[286; 289) | 106 | PATH@[286; 289) |
107 | PATH_SEGMENT@[286; 289) | 107 | PATH_SEGMENT@[286; 289) |
diff --git a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast index c36e2f770..b80101e60 100644 --- a/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast +++ b/crates/ra_syntax/test_data/parser/err/0032_match_arms_inner_attrs.rast | |||
@@ -38,7 +38,7 @@ SOURCE_FILE@[0; 293) | |||
38 | ATTR@[51; 52) | 38 | ATTR@[51; 52) |
39 | POUND@[51; 52) "#" | 39 | POUND@[51; 52) "#" |
40 | ERROR@[52; 53) | 40 | ERROR@[52; 53) |
41 | EXCL@[52; 53) "!" | 41 | BANG@[52; 53) "!" |
42 | ARRAY_EXPR@[53; 78) | 42 | ARRAY_EXPR@[53; 78) |
43 | L_BRACK@[53; 54) "[" | 43 | L_BRACK@[53; 54) "[" |
44 | CALL_EXPR@[54; 77) | 44 | CALL_EXPR@[54; 77) |
@@ -104,7 +104,7 @@ SOURCE_FILE@[0; 293) | |||
104 | ATTR@[160; 161) | 104 | ATTR@[160; 161) |
105 | POUND@[160; 161) "#" | 105 | POUND@[160; 161) "#" |
106 | ERROR@[161; 162) | 106 | ERROR@[161; 162) |
107 | EXCL@[161; 162) "!" | 107 | BANG@[161; 162) "!" |
108 | ARRAY_EXPR@[162; 179) | 108 | ARRAY_EXPR@[162; 179) |
109 | L_BRACK@[162; 163) "[" | 109 | L_BRACK@[162; 163) "[" |
110 | CALL_EXPR@[163; 178) | 110 | CALL_EXPR@[163; 178) |
@@ -149,7 +149,7 @@ SOURCE_FILE@[0; 293) | |||
149 | ATTR@[231; 232) | 149 | ATTR@[231; 232) |
150 | POUND@[231; 232) "#" | 150 | POUND@[231; 232) "#" |
151 | ERROR@[232; 233) | 151 | ERROR@[232; 233) |
152 | EXCL@[232; 233) "!" | 152 | BANG@[232; 233) "!" |
153 | ARRAY_EXPR@[233; 250) | 153 | ARRAY_EXPR@[233; 250) |
154 | L_BRACK@[233; 234) "[" | 154 | L_BRACK@[233; 234) "[" |
155 | CALL_EXPR@[234; 249) | 155 | CALL_EXPR@[234; 249) |
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast index 2c91b6841..2ab9ee56f 100644 --- a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast +++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rast | |||
@@ -34,7 +34,7 @@ SOURCE_FILE@[0; 91) | |||
34 | TUPLE_EXPR@[32; 34) | 34 | TUPLE_EXPR@[32; 34) |
35 | L_PAREN@[32; 33) "(" | 35 | L_PAREN@[32; 33) "(" |
36 | R_PAREN@[33; 34) ")" | 36 | R_PAREN@[33; 34) ")" |
37 | SEMI@[34; 35) ";" | 37 | SEMICOLON@[34; 35) ";" |
38 | WHITESPACE@[35; 40) "\n " | 38 | WHITESPACE@[35; 40) "\n " |
39 | LET_STMT@[40; 51) | 39 | LET_STMT@[40; 51) |
40 | LET_KW@[40; 43) "let" | 40 | LET_KW@[40; 43) "let" |
@@ -58,7 +58,7 @@ SOURCE_FILE@[0; 91) | |||
58 | TUPLE_EXPR@[56; 58) | 58 | TUPLE_EXPR@[56; 58) |
59 | L_PAREN@[56; 57) "(" | 59 | L_PAREN@[56; 57) "(" |
60 | R_PAREN@[57; 58) ")" | 60 | R_PAREN@[57; 58) ")" |
61 | SEMI@[58; 59) ";" | 61 | SEMICOLON@[58; 59) ";" |
62 | WHITESPACE@[59; 64) "\n " | 62 | WHITESPACE@[59; 64) "\n " |
63 | LET_STMT@[64; 79) | 63 | LET_STMT@[64; 79) |
64 | LET_KW@[64; 67) "let" | 64 | LET_KW@[64; 67) "let" |
@@ -84,13 +84,13 @@ SOURCE_FILE@[0; 91) | |||
84 | TUPLE_EXPR@[84; 86) | 84 | TUPLE_EXPR@[84; 86) |
85 | L_PAREN@[84; 85) "(" | 85 | L_PAREN@[84; 85) "(" |
86 | R_PAREN@[85; 86) ")" | 86 | R_PAREN@[85; 86) ")" |
87 | SEMI@[86; 87) ";" | 87 | SEMICOLON@[86; 87) ";" |
88 | WHITESPACE@[87; 88) "\n" | 88 | WHITESPACE@[87; 88) "\n" |
89 | R_CURLY@[88; 89) "}" | 89 | R_CURLY@[88; 89) "}" |
90 | WHITESPACE@[89; 91) "\n\n" | 90 | WHITESPACE@[89; 91) "\n\n" |
91 | error [24; 24): expected a name | 91 | error [24; 24): expected a name |
92 | error [27; 27): expected SEMI | 92 | error [27; 27): expected SEMICOLON |
93 | error [48; 48): expected a name | 93 | error [48; 48): expected a name |
94 | error [51; 51): expected SEMI | 94 | error [51; 51): expected SEMICOLON |
95 | error [76; 76): expected a name | 95 | error [76; 76): expected a name |
96 | error [79; 79): expected SEMI | 96 | error [79; 79): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast index 8cb4ea796..f255b0a6b 100644 --- a/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast +++ b/crates/ra_syntax/test_data/parser/err/0035_use_recover.rast | |||
@@ -8,11 +8,11 @@ SOURCE_FILE@[0; 48) | |||
8 | PATH_SEGMENT@[4; 7) | 8 | PATH_SEGMENT@[4; 7) |
9 | NAME_REF@[4; 7) | 9 | NAME_REF@[4; 7) |
10 | IDENT@[4; 7) "foo" | 10 | IDENT@[4; 7) "foo" |
11 | COLONCOLON@[7; 9) "::" | 11 | COLON2@[7; 9) "::" |
12 | PATH_SEGMENT@[9; 12) | 12 | PATH_SEGMENT@[9; 12) |
13 | NAME_REF@[9; 12) | 13 | NAME_REF@[9; 12) |
14 | IDENT@[9; 12) "bar" | 14 | IDENT@[9; 12) "bar" |
15 | SEMI@[12; 13) ";" | 15 | SEMICOLON@[12; 13) ";" |
16 | WHITESPACE@[13; 14) "\n" | 16 | WHITESPACE@[13; 14) "\n" |
17 | USE_ITEM@[14; 17) | 17 | USE_ITEM@[14; 17) |
18 | USE_KW@[14; 17) "use" | 18 | USE_KW@[14; 17) "use" |
@@ -25,11 +25,11 @@ SOURCE_FILE@[0; 48) | |||
25 | PATH@[22; 27) | 25 | PATH@[22; 27) |
26 | PATH_SEGMENT@[22; 27) | 26 | PATH_SEGMENT@[22; 27) |
27 | CRATE_KW@[22; 27) "crate" | 27 | CRATE_KW@[22; 27) "crate" |
28 | COLONCOLON@[27; 29) "::" | 28 | COLON2@[27; 29) "::" |
29 | PATH_SEGMENT@[29; 32) | 29 | PATH_SEGMENT@[29; 32) |
30 | NAME_REF@[29; 32) | 30 | NAME_REF@[29; 32) |
31 | IDENT@[29; 32) "baz" | 31 | IDENT@[29; 32) "baz" |
32 | SEMI@[32; 33) ";" | 32 | SEMICOLON@[32; 33) ";" |
33 | WHITESPACE@[33; 34) "\n" | 33 | WHITESPACE@[33; 34) "\n" |
34 | USE_ITEM@[34; 37) | 34 | USE_ITEM@[34; 37) |
35 | USE_KW@[34; 37) "use" | 35 | USE_KW@[34; 37) "use" |
@@ -49,6 +49,6 @@ SOURCE_FILE@[0; 48) | |||
49 | R_CURLY@[46; 47) "}" | 49 | R_CURLY@[46; 47) "}" |
50 | WHITESPACE@[47; 48) "\n" | 50 | WHITESPACE@[47; 48) "\n" |
51 | error [17; 17): expected one of `*`, `::`, `{`, `self`, `super` or an identifier | 51 | error [17; 17): expected one of `*`, `::`, `{`, `self`, `super` or an identifier |
52 | error [17; 17): expected SEMI | 52 | error [17; 17): expected SEMICOLON |
53 | error [37; 37): expected one of `*`, `::`, `{`, `self`, `super` or an identifier | 53 | error [37; 37): expected one of `*`, `::`, `{`, `self`, `super` or an identifier |
54 | error [37; 37): expected SEMI | 54 | error [37; 37): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast index f5490fbe8..1f2b4f6d9 100644 --- a/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast +++ b/crates/ra_syntax/test_data/parser/err/0036_partial_use.rast | |||
@@ -7,7 +7,7 @@ SOURCE_FILE@[0; 37) | |||
7 | PATH_SEGMENT@[4; 7) | 7 | PATH_SEGMENT@[4; 7) |
8 | NAME_REF@[4; 7) | 8 | NAME_REF@[4; 7) |
9 | IDENT@[4; 7) "std" | 9 | IDENT@[4; 7) "std" |
10 | COLONCOLON@[7; 9) "::" | 10 | COLON2@[7; 9) "::" |
11 | USE_TREE_LIST@[9; 36) | 11 | USE_TREE_LIST@[9; 36) |
12 | L_CURLY@[9; 10) "{" | 12 | L_CURLY@[9; 10) "{" |
13 | USE_TREE@[10; 22) | 13 | USE_TREE@[10; 22) |
@@ -16,12 +16,12 @@ SOURCE_FILE@[0; 37) | |||
16 | PATH_SEGMENT@[10; 15) | 16 | PATH_SEGMENT@[10; 15) |
17 | NAME_REF@[10; 15) | 17 | NAME_REF@[10; 15) |
18 | IDENT@[10; 15) "error" | 18 | IDENT@[10; 15) "error" |
19 | COLONCOLON@[15; 17) "::" | 19 | COLON2@[15; 17) "::" |
20 | PATH_SEGMENT@[17; 22) | 20 | PATH_SEGMENT@[17; 22) |
21 | NAME_REF@[17; 22) | 21 | NAME_REF@[17; 22) |
22 | IDENT@[17; 22) "Error" | 22 | IDENT@[17; 22) "Error" |
23 | ERROR@[22; 23) | 23 | ERROR@[22; 23) |
24 | SEMI@[22; 23) ";" | 24 | SEMICOLON@[22; 23) ";" |
25 | WHITESPACE@[23; 24) "\n" | 25 | WHITESPACE@[23; 24) "\n" |
26 | ERROR@[24; 27) | 26 | ERROR@[24; 27) |
27 | USE_KW@[24; 27) "use" | 27 | USE_KW@[24; 27) "use" |
@@ -32,12 +32,12 @@ SOURCE_FILE@[0; 37) | |||
32 | PATH_SEGMENT@[28; 31) | 32 | PATH_SEGMENT@[28; 31) |
33 | NAME_REF@[28; 31) | 33 | NAME_REF@[28; 31) |
34 | IDENT@[28; 31) "std" | 34 | IDENT@[28; 31) "std" |
35 | COLONCOLON@[31; 33) "::" | 35 | COLON2@[31; 33) "::" |
36 | PATH_SEGMENT@[33; 35) | 36 | PATH_SEGMENT@[33; 35) |
37 | NAME_REF@[33; 35) | 37 | NAME_REF@[33; 35) |
38 | IDENT@[33; 35) "io" | 38 | IDENT@[33; 35) "io" |
39 | ERROR@[35; 36) | 39 | ERROR@[35; 36) |
40 | SEMI@[35; 36) ";" | 40 | SEMICOLON@[35; 36) ";" |
41 | WHITESPACE@[36; 37) "\n" | 41 | WHITESPACE@[36; 37) "\n" |
42 | error [22; 22): expected COMMA | 42 | error [22; 22): expected COMMA |
43 | error [22; 22): expected one of `*`, `::`, `{`, `self`, `super` or an identifier | 43 | error [22; 22): expected one of `*`, `::`, `{`, `self`, `super` or an identifier |
@@ -48,4 +48,4 @@ error [35; 35): expected COMMA | |||
48 | error [35; 35): expected one of `*`, `::`, `{`, `self`, `super` or an identifier | 48 | error [35; 35): expected one of `*`, `::`, `{`, `self`, `super` or an identifier |
49 | error [36; 36): expected COMMA | 49 | error [36; 36): expected COMMA |
50 | error [36; 36): expected R_CURLY | 50 | error [36; 36): expected R_CURLY |
51 | error [36; 36): expected SEMI | 51 | error [36; 36): expected SEMICOLON |
diff --git a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast index d8622d45f..5319bf936 100644 --- a/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast +++ b/crates/ra_syntax/test_data/parser/err/0037_visibility_in_traits.rast | |||
@@ -65,7 +65,7 @@ SOURCE_FILE@[0; 118) | |||
65 | TUPLE_TYPE@[78; 80) | 65 | TUPLE_TYPE@[78; 80) |
66 | L_PAREN@[78; 79) "(" | 66 | L_PAREN@[78; 79) "(" |
67 | R_PAREN@[79; 80) ")" | 67 | R_PAREN@[79; 80) ")" |
68 | SEMI@[80; 81) ";" | 68 | SEMICOLON@[80; 81) ";" |
69 | WHITESPACE@[81; 86) "\n " | 69 | WHITESPACE@[81; 86) "\n " |
70 | CONST_DEF@[86; 115) | 70 | CONST_DEF@[86; 115) |
71 | VISIBILITY@[86; 96) | 71 | VISIBILITY@[86; 96) |
@@ -90,7 +90,7 @@ SOURCE_FILE@[0; 118) | |||
90 | WHITESPACE@[111; 112) " " | 90 | WHITESPACE@[111; 112) " " |
91 | LITERAL@[112; 114) | 91 | LITERAL@[112; 114) |
92 | INT_NUMBER@[112; 114) "92" | 92 | INT_NUMBER@[112; 114) "92" |
93 | SEMI@[114; 115) ";" | 93 | SEMICOLON@[114; 115) ";" |
94 | WHITESPACE@[115; 116) "\n" | 94 | WHITESPACE@[115; 116) "\n" |
95 | R_CURLY@[116; 117) "}" | 95 | R_CURLY@[116; 117) "}" |
96 | WHITESPACE@[117; 118) "\n" | 96 | WHITESPACE@[117; 118) "\n" |
diff --git a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast index 3810b9680..9efdf7ef4 100644 --- a/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast +++ b/crates/ra_syntax/test_data/parser/err/0038_endless_inclusive_range.rast | |||
@@ -16,13 +16,13 @@ SOURCE_FILE@[0; 33) | |||
16 | RANGE_EXPR@[16; 20) | 16 | RANGE_EXPR@[16; 20) |
17 | LITERAL@[16; 17) | 17 | LITERAL@[16; 17) |
18 | INT_NUMBER@[16; 17) "0" | 18 | INT_NUMBER@[16; 17) "0" |
19 | DOTDOTEQ@[17; 20) "..=" | 19 | DOT2EQ@[17; 20) "..=" |
20 | SEMI@[20; 21) ";" | 20 | SEMICOLON@[20; 21) ";" |
21 | WHITESPACE@[21; 26) "\n " | 21 | WHITESPACE@[21; 26) "\n " |
22 | EXPR_STMT@[26; 30) | 22 | EXPR_STMT@[26; 30) |
23 | RANGE_EXPR@[26; 29) | 23 | RANGE_EXPR@[26; 29) |
24 | DOTDOTEQ@[26; 29) "..=" | 24 | DOT2EQ@[26; 29) "..=" |
25 | SEMI@[29; 30) ";" | 25 | SEMICOLON@[29; 30) ";" |
26 | WHITESPACE@[30; 31) "\n" | 26 | WHITESPACE@[30; 31) "\n" |
27 | R_CURLY@[31; 32) "}" | 27 | R_CURLY@[31; 32) "}" |
28 | WHITESPACE@[32; 33) "\n" | 28 | WHITESPACE@[32; 33) "\n" |
diff --git a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast index 4a2f0a696..edf9c3247 100644 --- a/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast +++ b/crates/ra_syntax/test_data/parser/err/0039_lambda_recovery.rast | |||
@@ -64,7 +64,7 @@ SOURCE_FILE@[0; 83) | |||
64 | NAME_REF@[67; 70) | 64 | NAME_REF@[67; 70) |
65 | IDENT@[67; 70) "max" | 65 | IDENT@[67; 70) "max" |
66 | TYPE_ARG_LIST@[70; 77) | 66 | TYPE_ARG_LIST@[70; 77) |
67 | COLONCOLON@[70; 72) "::" | 67 | COLON2@[70; 72) "::" |
68 | L_ANGLE@[72; 73) "<" | 68 | L_ANGLE@[72; 73) "<" |
69 | TYPE_ARG@[73; 76) | 69 | TYPE_ARG@[73; 76) |
70 | PATH_TYPE@[73; 76) | 70 | PATH_TYPE@[73; 76) |
@@ -76,7 +76,7 @@ SOURCE_FILE@[0; 83) | |||
76 | ARG_LIST@[77; 79) | 76 | ARG_LIST@[77; 79) |
77 | L_PAREN@[77; 78) "(" | 77 | L_PAREN@[77; 78) "(" |
78 | R_PAREN@[78; 79) ")" | 78 | R_PAREN@[78; 79) ")" |
79 | SEMI@[79; 80) ";" | 79 | SEMICOLON@[79; 80) ";" |
80 | WHITESPACE@[80; 81) "\n" | 80 | WHITESPACE@[80; 81) "\n" |
81 | R_CURLY@[81; 82) "}" | 81 | R_CURLY@[81; 82) "}" |
82 | WHITESPACE@[82; 83) "\n" | 82 | WHITESPACE@[82; 83) "\n" |