diff options
Diffstat (limited to 'crates/ra_syntax')
46 files changed, 305 insertions, 296 deletions
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index 930a643b7..8c0ba6f2d 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs | |||
@@ -76,7 +76,7 @@ impl Parse { | |||
76 | pub fn debug_dump(&self) -> String { | 76 | pub fn debug_dump(&self) -> String { |
77 | let mut buf = self.tree.syntax().debug_dump(); | 77 | let mut buf = self.tree.syntax().debug_dump(); |
78 | for err in self.errors.iter() { | 78 | for err in self.errors.iter() { |
79 | writeln!(buf, "err: `{}`", err).unwrap(); | 79 | writeln!(buf, "error {:?}: {}", err.location(), err.kind()).unwrap(); |
80 | } | 80 | } |
81 | buf | 81 | buf |
82 | } | 82 | } |
diff --git a/crates/ra_syntax/src/syntax_error.rs b/crates/ra_syntax/src/syntax_error.rs index 27e12293b..d29c0cf6c 100644 --- a/crates/ra_syntax/src/syntax_error.rs +++ b/crates/ra_syntax/src/syntax_error.rs | |||
@@ -13,21 +13,30 @@ pub struct SyntaxError { | |||
13 | location: Location, | 13 | location: Location, |
14 | } | 14 | } |
15 | 15 | ||
16 | #[derive(Debug, Clone, PartialEq, Eq, Hash)] | 16 | #[derive(Clone, PartialEq, Eq, Hash)] |
17 | pub enum Location { | 17 | pub enum Location { |
18 | Offset(TextUnit), | 18 | Offset(TextUnit), |
19 | Range(TextRange), | 19 | Range(TextRange), |
20 | } | 20 | } |
21 | 21 | ||
22 | impl Into<Location> for TextUnit { | 22 | impl From<TextUnit> for Location { |
23 | fn into(self) -> Location { | 23 | fn from(offset: TextUnit) -> Location { |
24 | Location::Offset(self) | 24 | Location::Offset(offset) |
25 | } | ||
26 | } | ||
27 | |||
28 | impl From<TextRange> for Location { | ||
29 | fn from(range: TextRange) -> Location { | ||
30 | Location::Range(range) | ||
25 | } | 31 | } |
26 | } | 32 | } |
27 | 33 | ||
28 | impl Into<Location> for TextRange { | 34 | impl fmt::Debug for Location { |
29 | fn into(self) -> Location { | 35 | fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { |
30 | Location::Range(self) | 36 | match self { |
37 | Location::Offset(it) => fmt::Debug::fmt(it, f), | ||
38 | Location::Range(it) => fmt::Debug::fmt(it, f), | ||
39 | } | ||
31 | } | 40 | } |
32 | } | 41 | } |
33 | 42 | ||
diff --git a/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt b/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt index 0662052c5..0dbbfe853 100644 --- a/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt +++ b/crates/ra_syntax/tests/data/parser/err/0000_struct_field_missing_comma.txt | |||
@@ -31,4 +31,4 @@ SOURCE_FILE@[0; 34) | |||
31 | IDENT@[29; 32) "u32" | 31 | IDENT@[29; 32) "u32" |
32 | WHITESPACE@[32; 33) "\n" | 32 | WHITESPACE@[32; 33) "\n" |
33 | R_CURLY@[33; 34) "}" | 33 | R_CURLY@[33; 34) "}" |
34 | err: `expected COMMA` | 34 | error 21: expected COMMA |
diff --git a/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt b/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt index 45044fe0a..7cfb54ef8 100644 --- a/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt +++ b/crates/ra_syntax/tests/data/parser/err/0001_item_recovery_in_file.txt | |||
@@ -14,5 +14,5 @@ SOURCE_FILE@[0; 21) | |||
14 | NAMED_FIELD_DEF_LIST@[19; 21) | 14 | NAMED_FIELD_DEF_LIST@[19; 21) |
15 | L_CURLY@[19; 20) "{" | 15 | L_CURLY@[19; 20) "{" |
16 | R_CURLY@[20; 21) "}" | 16 | R_CURLY@[20; 21) "}" |
17 | err: `expected an item` | 17 | error 0: expected an item |
18 | err: `expected an item` | 18 | error 3: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt b/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt index 1506acdfd..76d186a3c 100644 --- a/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt +++ b/crates/ra_syntax/tests/data/parser/err/0002_duplicate_shebang.txt | |||
@@ -4,4 +4,4 @@ SOURCE_FILE@[0; 42) | |||
4 | ERROR@[21; 41) | 4 | ERROR@[21; 41) |
5 | SHEBANG@[21; 41) "#!/use/bin/env rusti" | 5 | SHEBANG@[21; 41) "#!/use/bin/env rusti" |
6 | WHITESPACE@[41; 42) "\n" | 6 | WHITESPACE@[41; 42) "\n" |
7 | err: `expected an item` | 7 | error 21: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt index 586baf1bb..857826037 100644 --- a/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt +++ b/crates/ra_syntax/tests/data/parser/err/0003_C++_semicolon.txt | |||
@@ -35,5 +35,5 @@ SOURCE_FILE@[0; 40) | |||
35 | R_CURLY@[38; 39) "}" | 35 | R_CURLY@[38; 39) "}" |
36 | ERROR@[39; 40) | 36 | ERROR@[39; 40) |
37 | SEMI@[39; 40) ";" | 37 | SEMI@[39; 40) ";" |
38 | err: `expected item, found `;` | 38 | error 39: expected item, found `;` |
39 | consider removing this semicolon` | 39 | consider removing this semicolon |
diff --git a/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt b/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt index a70223912..5210a884d 100644 --- a/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt +++ b/crates/ra_syntax/tests/data/parser/err/0004_use_path_bad_segment.txt | |||
@@ -13,4 +13,4 @@ SOURCE_FILE@[0; 12) | |||
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 | SEMI@[11; 12) ";" |
16 | err: `expected identifier` | 16 | error 9: expected identifier |
diff --git a/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt b/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt index 9a6da88fe..6d5199a56 100644 --- a/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt +++ b/crates/ra_syntax/tests/data/parser/err/0005_attribute_recover.txt | |||
@@ -50,6 +50,6 @@ SOURCE_FILE@[0; 54) | |||
50 | WHITESPACE@[51; 52) "\n" | 50 | WHITESPACE@[51; 52) "\n" |
51 | R_CURLY@[52; 53) "}" | 51 | R_CURLY@[52; 53) "}" |
52 | WHITESPACE@[53; 54) "\n" | 52 | WHITESPACE@[53; 54) "\n" |
53 | err: `expected R_PAREN` | 53 | error 53: expected R_PAREN |
54 | err: `expected R_BRACK` | 54 | error 53: expected R_BRACK |
55 | err: `expected an item` | 55 | error 53: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt b/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt index 5effbb60f..6143e68f1 100644 --- a/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt +++ b/crates/ra_syntax/tests/data/parser/err/0006_named_field_recovery.txt | |||
@@ -64,11 +64,11 @@ SOURCE_FILE@[0; 74) | |||
64 | WHITESPACE@[71; 72) "\n" | 64 | WHITESPACE@[71; 72) "\n" |
65 | R_CURLY@[72; 73) "}" | 65 | R_CURLY@[72; 73) "}" |
66 | WHITESPACE@[73; 74) "\n" | 66 | WHITESPACE@[73; 74) "\n" |
67 | err: `expected field declaration` | 67 | error 31: expected field declaration |
68 | err: `expected COMMA` | 68 | error 33: expected COMMA |
69 | err: `expected field declaration` | 69 | error 38: expected field declaration |
70 | err: `expected COMMA` | 70 | error 39: expected COMMA |
71 | err: `expected field declaration` | 71 | error 40: expected field declaration |
72 | err: `expected COMMA` | 72 | error 41: expected COMMA |
73 | err: `expected field declaration` | 73 | error 42: expected field declaration |
74 | err: `expected COMMA` | 74 | error 43: expected COMMA |
diff --git a/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt b/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt index ff59f5d71..b79e01238 100644 --- a/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt +++ b/crates/ra_syntax/tests/data/parser/err/0007_stray_curly_in_file.txt | |||
@@ -27,6 +27,6 @@ SOURCE_FILE@[0; 31) | |||
27 | ERROR@[29; 30) | 27 | ERROR@[29; 30) |
28 | R_CURLY@[29; 30) "}" | 28 | R_CURLY@[29; 30) "}" |
29 | WHITESPACE@[30; 31) "\n" | 29 | WHITESPACE@[30; 31) "\n" |
30 | err: `unmatched `}`` | 30 | error 0: unmatched `}` |
31 | err: `unmatched `}`` | 31 | error 14: unmatched `}` |
32 | err: `unmatched `}`` | 32 | error 29: unmatched `}` |
diff --git a/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt b/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt index 75f6b3b9c..9a8871579 100644 --- a/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt +++ b/crates/ra_syntax/tests/data/parser/err/0008_item_block_recovery.txt | |||
@@ -72,6 +72,6 @@ SOURCE_FILE@[0; 95) | |||
72 | WHITESPACE@[92; 93) "\n" | 72 | WHITESPACE@[92; 93) "\n" |
73 | R_CURLY@[93; 94) "}" | 73 | R_CURLY@[93; 94) "}" |
74 | WHITESPACE@[94; 95) "\n" | 74 | WHITESPACE@[94; 95) "\n" |
75 | err: `expected EXCL` | 75 | error 17: expected EXCL |
76 | err: `expected SEMI` | 76 | error 19: expected SEMI |
77 | err: `expected an item` | 77 | error 20: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt b/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt index 8aa8c3ef4..e147d6424 100644 --- a/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt +++ b/crates/ra_syntax/tests/data/parser/err/0009_broken_struct_type_parameter.txt | |||
@@ -45,14 +45,14 @@ SOURCE_FILE@[0; 43) | |||
45 | IDENT@[40; 41) "T" | 45 | IDENT@[40; 41) "T" |
46 | SEMI@[41; 42) ";" | 46 | SEMI@[41; 42) ";" |
47 | WHITESPACE@[42; 43) "\n" | 47 | WHITESPACE@[42; 43) "\n" |
48 | err: `expected type parameter` | 48 | error 9: expected type parameter |
49 | err: `expected COMMA` | 49 | error 11: expected COMMA |
50 | err: `expected R_ANGLE` | 50 | error 11: expected R_ANGLE |
51 | err: `expected `;`, `{`, or `(`` | 51 | error 11: expected `;`, `{`, or `(` |
52 | err: `expected an item` | 52 | error 12: expected an item |
53 | err: `expected an item` | 53 | error 14: expected an item |
54 | err: `expected an item` | 54 | error 15: expected an item |
55 | err: `expected an item` | 55 | error 17: expected an item |
56 | err: `expected SEMI` | 56 | error 24: expected SEMI |
57 | err: `expected expression` | 57 | error 24: expected expression |
58 | err: `expected SEMI` | 58 | error 25: expected SEMI |
diff --git a/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt b/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt index 22a1727f0..c46809f81 100644 --- a/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt +++ b/crates/ra_syntax/tests/data/parser/err/0010_unsafe_lambda_block.txt | |||
@@ -39,4 +39,4 @@ SOURCE_FILE@[0; 42) | |||
39 | WHITESPACE@[39; 40) "\n" | 39 | WHITESPACE@[39; 40) "\n" |
40 | R_CURLY@[40; 41) "}" | 40 | R_CURLY@[40; 41) "}" |
41 | WHITESPACE@[41; 42) "\n" | 41 | WHITESPACE@[41; 42) "\n" |
42 | err: `expected `{`` | 42 | error 24: expected `{` |
diff --git a/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt b/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt index ee2a29d9f..033dac2aa 100644 --- a/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt +++ b/crates/ra_syntax/tests/data/parser/err/0011_extern_struct.txt | |||
@@ -10,4 +10,4 @@ SOURCE_FILE@[0; 19) | |||
10 | IDENT@[14; 17) "Foo" | 10 | IDENT@[14; 17) "Foo" |
11 | SEMI@[17; 18) ";" | 11 | SEMI@[17; 18) ";" |
12 | WHITESPACE@[18; 19) "\n" | 12 | WHITESPACE@[18; 19) "\n" |
13 | err: `expected fn, trait or impl` | 13 | error 6: expected fn, trait or impl |
diff --git a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt index 1f5cc55c0..bef286b37 100644 --- a/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt +++ b/crates/ra_syntax/tests/data/parser/err/0013_invalid_type.txt | |||
@@ -69,21 +69,21 @@ SOURCE_FILE@[0; 86) | |||
69 | ERROR@[83; 84) | 69 | ERROR@[83; 84) |
70 | SEMI@[83; 84) ";" | 70 | SEMI@[83; 84) ";" |
71 | WHITESPACE@[84; 86) "\n\n" | 71 | WHITESPACE@[84; 86) "\n\n" |
72 | err: `expected type` | 72 | error 67: expected type |
73 | err: `expected COMMA` | 73 | error 68: expected COMMA |
74 | err: `expected R_ANGLE` | 74 | error 68: expected R_ANGLE |
75 | err: `expected COMMA` | 75 | error 68: expected COMMA |
76 | err: `expected R_ANGLE` | 76 | error 68: expected R_ANGLE |
77 | err: `expected COMMA` | 77 | error 68: expected COMMA |
78 | err: `expected R_ANGLE` | 78 | error 68: expected R_ANGLE |
79 | err: `expected COMMA` | 79 | error 68: expected COMMA |
80 | err: `expected COMMA` | 80 | error 72: expected COMMA |
81 | err: `expected a type` | 81 | error 72: expected a type |
82 | err: `expected R_PAREN` | 82 | error 72: expected R_PAREN |
83 | err: `expected SEMI` | 83 | error 72: expected SEMI |
84 | err: `expected an item` | 84 | error 72: expected an item |
85 | err: `expected an item` | 85 | error 73: expected an item |
86 | err: `expected an item` | 86 | error 79: expected an item |
87 | err: `expected an item` | 87 | error 80: expected an item |
88 | err: `expected an item` | 88 | error 82: expected an item |
89 | err: `expected an item` | 89 | error 83: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt b/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt index 276a58b69..2f0878572 100644 --- a/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt +++ b/crates/ra_syntax/tests/data/parser/err/0014_where_no_bounds.txt | |||
@@ -28,4 +28,4 @@ SOURCE_FILE@[0; 23) | |||
28 | L_CURLY@[20; 21) "{" | 28 | L_CURLY@[20; 21) "{" |
29 | R_CURLY@[21; 22) "}" | 29 | R_CURLY@[21; 22) "}" |
30 | WHITESPACE@[22; 23) "\n" | 30 | WHITESPACE@[22; 23) "\n" |
31 | err: `expected colon` | 31 | error 19: expected colon |
diff --git a/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt b/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt index 8f93b832d..23ca0c446 100644 --- a/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt +++ b/crates/ra_syntax/tests/data/parser/err/0015_curly_in_params.txt | |||
@@ -16,9 +16,9 @@ SOURCE_FILE@[0; 14) | |||
16 | WHITESPACE@[11; 12) "\n" | 16 | WHITESPACE@[11; 12) "\n" |
17 | R_CURLY@[12; 13) "}" | 17 | R_CURLY@[12; 13) "}" |
18 | WHITESPACE@[13; 14) "\n" | 18 | WHITESPACE@[13; 14) "\n" |
19 | err: `expected value parameter` | 19 | error 7: expected value parameter |
20 | err: `expected R_PAREN` | 20 | error 7: expected R_PAREN |
21 | err: `expected a block` | 21 | error 7: expected a block |
22 | err: `unmatched `}`` | 22 | error 7: unmatched `}` |
23 | err: `expected an item` | 23 | error 8: expected an item |
24 | err: `expected an item` | 24 | error 10: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt b/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt index 105e45a35..97e64dea9 100644 --- a/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt +++ b/crates/ra_syntax/tests/data/parser/err/0016_missing_semi.txt | |||
@@ -40,4 +40,4 @@ SOURCE_FILE@[0; 56) | |||
40 | WHITESPACE@[53; 54) "\n" | 40 | WHITESPACE@[53; 54) "\n" |
41 | R_CURLY@[54; 55) "}" | 41 | R_CURLY@[54; 55) "}" |
42 | WHITESPACE@[55; 56) "\n" | 42 | WHITESPACE@[55; 56) "\n" |
43 | err: `expected SEMI` | 43 | error 38: expected SEMI |
diff --git a/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt b/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt index 751740620..c18e20900 100644 --- a/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt +++ b/crates/ra_syntax/tests/data/parser/err/0017_incomplete_binexpr.txt | |||
@@ -43,4 +43,4 @@ SOURCE_FILE@[0; 47) | |||
43 | WHITESPACE@[44; 45) "\n" | 43 | WHITESPACE@[44; 45) "\n" |
44 | R_CURLY@[45; 46) "}" | 44 | R_CURLY@[45; 46) "}" |
45 | WHITESPACE@[46; 47) "\n" | 45 | WHITESPACE@[46; 47) "\n" |
46 | err: `expected expression` | 46 | error 44: expected expression |
diff --git a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt index 82908b8f2..51def2d8f 100644 --- a/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt +++ b/crates/ra_syntax/tests/data/parser/err/0018_incomplete_fn.txt | |||
@@ -124,8 +124,8 @@ SOURCE_FILE@[0; 183) | |||
124 | WHITESPACE@[180; 181) "\n" | 124 | WHITESPACE@[180; 181) "\n" |
125 | R_CURLY@[181; 182) "}" | 125 | R_CURLY@[181; 182) "}" |
126 | WHITESPACE@[182; 183) "\n" | 126 | WHITESPACE@[182; 183) "\n" |
127 | err: `expected pattern` | 127 | error 34: expected pattern |
128 | err: `expected COLON` | 128 | error 34: expected COLON |
129 | err: `expected type` | 129 | error 34: expected type |
130 | err: `expected function arguments` | 130 | error 180: expected function arguments |
131 | err: `expected a block` | 131 | error 180: expected a block |
diff --git a/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt b/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt index 4a1b84ee5..b6710241e 100644 --- a/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt +++ b/crates/ra_syntax/tests/data/parser/err/0019_let_recover.txt | |||
@@ -91,13 +91,13 @@ SOURCE_FILE@[0; 139) | |||
91 | WHITESPACE@[136; 137) "\n" | 91 | WHITESPACE@[136; 137) "\n" |
92 | R_CURLY@[137; 138) "}" | 92 | R_CURLY@[137; 138) "}" |
93 | WHITESPACE@[138; 139) "\n" | 93 | WHITESPACE@[138; 139) "\n" |
94 | err: `expected expression` | 94 | error 24: expected expression |
95 | err: `expected SEMI` | 95 | error 24: expected SEMI |
96 | err: `expected pattern` | 96 | error 49: expected pattern |
97 | err: `expected SEMI` | 97 | error 49: expected SEMI |
98 | err: `expected pattern` | 98 | error 75: expected pattern |
99 | err: `expected SEMI` | 99 | error 75: expected SEMI |
100 | err: `expected pattern` | 100 | error 98: expected pattern |
101 | err: `expected SEMI` | 101 | error 98: expected SEMI |
102 | err: `expected pattern` | 102 | error 124: expected pattern |
103 | err: `expected SEMI` | 103 | error 124: expected SEMI |
diff --git a/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt b/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt index d7ac73afa..71c014028 100644 --- a/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt +++ b/crates/ra_syntax/tests/data/parser/err/0020_fn_recover.txt | |||
@@ -15,6 +15,6 @@ SOURCE_FILE@[0; 16) | |||
15 | L_CURLY@[13; 14) "{" | 15 | L_CURLY@[13; 14) "{" |
16 | R_CURLY@[14; 15) "}" | 16 | R_CURLY@[14; 15) "}" |
17 | WHITESPACE@[15; 16) "\n" | 17 | WHITESPACE@[15; 16) "\n" |
18 | err: `expected a name` | 18 | error 2: expected a name |
19 | err: `expected function arguments` | 19 | error 2: expected function arguments |
20 | err: `expected a block` | 20 | error 2: expected a block |
diff --git a/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt b/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt index 086224eee..c125a0bc9 100644 --- a/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt +++ b/crates/ra_syntax/tests/data/parser/err/0021_incomplete_param.txt | |||
@@ -30,5 +30,5 @@ SOURCE_FILE@[0; 22) | |||
30 | WHITESPACE@[19; 20) "\n" | 30 | WHITESPACE@[19; 20) "\n" |
31 | R_CURLY@[20; 21) "}" | 31 | R_CURLY@[20; 21) "}" |
32 | WHITESPACE@[21; 22) "\n" | 32 | WHITESPACE@[21; 22) "\n" |
33 | err: `expected COLON` | 33 | error 16: expected COLON |
34 | err: `expected type` | 34 | error 16: expected type |
diff --git a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt index d7a5fa1d2..32b53bba7 100644 --- a/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt +++ b/crates/ra_syntax/tests/data/parser/err/0022_bad_exprs.txt | |||
@@ -148,42 +148,42 @@ SOURCE_FILE@[0; 112) | |||
148 | WHITESPACE@[109; 110) " " | 148 | WHITESPACE@[109; 110) " " |
149 | R_CURLY@[110; 111) "}" | 149 | R_CURLY@[110; 111) "}" |
150 | WHITESPACE@[111; 112) "\n" | 150 | WHITESPACE@[111; 112) "\n" |
151 | err: `expected expression` | 151 | error 15: expected expression |
152 | err: `expected R_BRACK` | 152 | error 15: expected R_BRACK |
153 | err: `expected SEMI` | 153 | error 15: expected SEMI |
154 | err: `expected expression` | 154 | error 16: expected expression |
155 | err: `expected SEMI` | 155 | error 17: expected SEMI |
156 | err: `expected expression` | 156 | error 17: expected expression |
157 | err: `expected SEMI` | 157 | error 18: expected SEMI |
158 | err: `expected a name` | 158 | error 25: expected a name |
159 | err: `expected `;`, `{`, or `(`` | 159 | error 26: expected `;`, `{`, or `(` |
160 | err: `expected pattern` | 160 | error 30: expected pattern |
161 | err: `expected SEMI` | 161 | error 31: expected SEMI |
162 | err: `expected expression` | 162 | error 52: expected expression |
163 | err: `expected SEMI` | 163 | error 52: expected SEMI |
164 | err: `expected expression` | 164 | error 53: expected expression |
165 | err: `expected SEMI` | 165 | error 54: expected SEMI |
166 | err: `expected expression` | 166 | error 54: expected expression |
167 | err: `expected SEMI` | 167 | error 55: expected SEMI |
168 | err: `expected type` | 168 | error 60: expected type |
169 | err: `expected `{`` | 169 | error 60: expected `{` |
170 | err: `expected expression` | 170 | error 60: expected expression |
171 | err: `expected SEMI` | 171 | error 61: expected SEMI |
172 | err: `expected pattern` | 172 | error 65: expected pattern |
173 | err: `expected SEMI` | 173 | error 65: expected SEMI |
174 | err: `expected expression` | 174 | error 65: expected expression |
175 | err: `expected expression` | 175 | error 91: expected expression |
176 | err: `expected SEMI` | 176 | error 91: expected SEMI |
177 | err: `expected expression` | 177 | error 92: expected expression |
178 | err: `expected SEMI` | 178 | error 93: expected SEMI |
179 | err: `expected expression` | 179 | error 93: expected expression |
180 | err: `expected SEMI` | 180 | error 94: expected SEMI |
181 | err: `expected expression` | 181 | error 95: expected expression |
182 | err: `expected SEMI` | 182 | error 96: expected SEMI |
183 | err: `expected expression` | 183 | error 96: expected expression |
184 | err: `expected SEMI` | 184 | error 97: expected SEMI |
185 | err: `expected a name` | 185 | error 103: expected a name |
186 | err: `expected `{`` | 186 | error 104: expected `{` |
187 | err: `expected pattern` | 187 | error 108: expected pattern |
188 | err: `expected SEMI` | 188 | error 108: expected SEMI |
189 | err: `expected expression` | 189 | error 108: expected expression |
diff --git a/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt b/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt index 143600e67..f2515faa7 100644 --- a/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt +++ b/crates/ra_syntax/tests/data/parser/err/0023_mismatched_paren.txt | |||
@@ -39,5 +39,5 @@ SOURCE_FILE@[0; 94) | |||
39 | ERROR@[92; 93) | 39 | ERROR@[92; 93) |
40 | R_CURLY@[92; 93) "}" | 40 | R_CURLY@[92; 93) "}" |
41 | WHITESPACE@[93; 94) "\n" | 41 | WHITESPACE@[93; 94) "\n" |
42 | err: `unmatched `}`` | 42 | error 49: unmatched `}` |
43 | err: `unmatched `}`` | 43 | error 92: unmatched `}` |
diff --git a/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt b/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt index 4f505fa76..faf0fe462 100644 --- a/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt +++ b/crates/ra_syntax/tests/data/parser/err/0024_many_type_parens.txt | |||
@@ -291,34 +291,34 @@ SOURCE_FILE@[0; 240) | |||
291 | WHITESPACE@[237; 238) "\n" | 291 | WHITESPACE@[237; 238) "\n" |
292 | R_CURLY@[238; 239) "}" | 292 | R_CURLY@[238; 239) "}" |
293 | WHITESPACE@[239; 240) "\n" | 293 | WHITESPACE@[239; 240) "\n" |
294 | err: `expected COMMA` | 294 | error 88: expected COMMA |
295 | err: `expected R_ANGLE` | 295 | error 88: expected R_ANGLE |
296 | err: `expected SEMI` | 296 | error 121: expected SEMI |
297 | err: `expected expression` | 297 | error 121: expected expression |
298 | err: `expected type` | 298 | error 140: expected type |
299 | err: `expected R_PAREN` | 299 | error 141: expected R_PAREN |
300 | err: `expected COMMA` | 300 | error 141: expected COMMA |
301 | err: `expected R_ANGLE` | 301 | error 141: expected R_ANGLE |
302 | err: `expected SEMI` | 302 | error 141: expected SEMI |
303 | err: `expected SEMI` | 303 | error 146: expected SEMI |
304 | err: `expected expression` | 304 | error 146: expected expression |
305 | err: `expected SEMI` | 305 | error 147: expected SEMI |
306 | err: `expected expression` | 306 | error 148: expected expression |
307 | err: `expected SEMI` | 307 | error 149: expected SEMI |
308 | err: `expected expression` | 308 | error 151: expected expression |
309 | err: `expected R_PAREN` | 309 | error 151: expected R_PAREN |
310 | err: `expected SEMI` | 310 | error 151: expected SEMI |
311 | err: `expected pattern` | 311 | error 154: expected pattern |
312 | err: `expected IN_KW` | 312 | error 155: expected IN_KW |
313 | err: `expected expression` | 313 | error 155: expected expression |
314 | err: `expected a block` | 314 | error 157: expected a block |
315 | err: `expected expression` | 315 | error 157: expected expression |
316 | err: `expected SEMI` | 316 | error 158: expected SEMI |
317 | err: `expected expression` | 317 | error 165: expected expression |
318 | err: `expected expression` | 318 | error 168: expected expression |
319 | err: `expected expression` | 319 | error 179: expected expression |
320 | err: `expected SEMI` | 320 | error 180: expected SEMI |
321 | err: `expected COMMA` | 321 | error 215: expected COMMA |
322 | err: `expected R_ANGLE` | 322 | error 215: expected R_ANGLE |
323 | err: `expected SEMI` | 323 | error 235: expected SEMI |
324 | err: `expected expression` | 324 | error 235: expected expression |
diff --git a/crates/ra_syntax/tests/data/parser/err/0025_nope.txt b/crates/ra_syntax/tests/data/parser/err/0025_nope.txt index a1bd8647a..0a3952dc9 100644 --- a/crates/ra_syntax/tests/data/parser/err/0025_nope.txt +++ b/crates/ra_syntax/tests/data/parser/err/0025_nope.txt | |||
@@ -190,14 +190,14 @@ SOURCE_FILE@[0; 575) | |||
190 | WHITESPACE@[572; 573) "\n" | 190 | WHITESPACE@[572; 573) "\n" |
191 | R_CURLY@[573; 574) "}" | 191 | R_CURLY@[573; 574) "}" |
192 | WHITESPACE@[574; 575) "\n" | 192 | WHITESPACE@[574; 575) "\n" |
193 | err: `expected type` | 193 | error 95: expected type |
194 | err: `expected COMMA` | 194 | error 95: expected COMMA |
195 | err: `expected field` | 195 | error 96: expected field |
196 | err: `expected field declaration` | 196 | error 98: expected field declaration |
197 | err: `expected COMMA` | 197 | error 371: expected COMMA |
198 | err: `expected a type` | 198 | error 372: expected a type |
199 | err: `expected R_PAREN` | 199 | error 372: expected R_PAREN |
200 | err: `expected COMMA` | 200 | error 372: expected COMMA |
201 | err: `expected enum variant` | 201 | error 372: expected enum variant |
202 | err: `expected enum variant` | 202 | error 374: expected enum variant |
203 | err: `expected expression` | 203 | error 508: expected expression |
diff --git a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt b/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt index f473718dc..d3da2f54f 100644 --- a/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt +++ b/crates/ra_syntax/tests/data/parser/err/0026_imp_recovery.txt | |||
@@ -45,5 +45,5 @@ SOURCE_FILE@[0; 38) | |||
45 | L_CURLY@[35; 36) "{" | 45 | L_CURLY@[35; 36) "{" |
46 | R_CURLY@[36; 37) "}" | 46 | R_CURLY@[36; 37) "}" |
47 | WHITESPACE@[37; 38) "\n" | 47 | WHITESPACE@[37; 38) "\n" |
48 | err: `expected trait or type` | 48 | error 14: expected trait or type |
49 | err: `expected `{`` | 49 | error 14: expected `{` |
diff --git a/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.txt b/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.txt index 5a2b52d05..061e6fb31 100644 --- a/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.txt +++ b/crates/ra_syntax/tests/data/parser/err/0027_incomplere_where_for.txt | |||
@@ -24,5 +24,5 @@ SOURCE_FILE@[0; 30) | |||
24 | L_CURLY@[27; 28) "{" | 24 | L_CURLY@[27; 28) "{" |
25 | R_CURLY@[28; 29) "}" | 25 | R_CURLY@[28; 29) "}" |
26 | WHITESPACE@[29; 30) "\n" | 26 | WHITESPACE@[29; 30) "\n" |
27 | err: `expected a path` | 27 | error 26: expected a path |
28 | err: `expected colon` | 28 | error 26: expected colon |
diff --git a/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.txt b/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.txt index 8a59a5ac3..98bc562a3 100644 --- a/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.txt +++ b/crates/ra_syntax/tests/data/parser/err/0028_macro_2.0.txt | |||
@@ -256,70 +256,70 @@ SOURCE_FILE@[0; 349) | |||
256 | WHITESPACE@[346; 347) "\n" | 256 | WHITESPACE@[346; 347) "\n" |
257 | R_CURLY@[347; 348) "}" | 257 | R_CURLY@[347; 348) "}" |
258 | WHITESPACE@[348; 349) "\n" | 258 | WHITESPACE@[348; 349) "\n" |
259 | err: `expected EXCL` | 259 | error 5: expected EXCL |
260 | err: `expected SEMI` | 260 | error 41: expected SEMI |
261 | err: `expected an item` | 261 | error 42: expected an item |
262 | err: `expected SEMI` | 262 | error 139: expected SEMI |
263 | err: `expected expression` | 263 | error 152: expected expression |
264 | err: `expected COMMA` | 264 | error 153: expected COMMA |
265 | err: `expected expression` | 265 | error 154: expected expression |
266 | err: `expected R_PAREN` | 266 | error 154: expected R_PAREN |
267 | err: `expected COMMA` | 267 | error 154: expected COMMA |
268 | err: `expected expression` | 268 | error 154: expected expression |
269 | err: `expected R_BRACK` | 269 | error 154: expected R_BRACK |
270 | err: `expected COMMA` | 270 | error 154: expected COMMA |
271 | err: `expected SEMI` | 271 | error 154: expected SEMI |
272 | err: `expected expression` | 272 | error 154: expected expression |
273 | err: `expected SEMI` | 273 | error 155: expected SEMI |
274 | err: `expected SEMI` | 274 | error 160: expected SEMI |
275 | err: `expected expression` | 275 | error 160: expected expression |
276 | err: `expected SEMI` | 276 | error 161: expected SEMI |
277 | err: `expected SEMI` | 277 | error 165: expected SEMI |
278 | err: `expected expression` | 278 | error 165: expected expression |
279 | err: `expected SEMI` | 279 | error 166: expected SEMI |
280 | err: `expected expression` | 280 | error 166: expected expression |
281 | err: `expected SEMI` | 281 | error 167: expected SEMI |
282 | err: `expected expression` | 282 | error 169: expected expression |
283 | err: `expected SEMI` | 283 | error 170: expected SEMI |
284 | err: `expected expression` | 284 | error 171: expected expression |
285 | err: `expected R_PAREN` | 285 | error 171: expected R_PAREN |
286 | err: `expected SEMI` | 286 | error 171: expected SEMI |
287 | err: `expected expression` | 287 | error 171: expected expression |
288 | err: `expected SEMI` | 288 | error 172: expected SEMI |
289 | err: `expected expression` | 289 | error 172: expected expression |
290 | err: `expected SEMI` | 290 | error 173: expected SEMI |
291 | err: `expected expression` | 291 | error 174: expected expression |
292 | err: `expected SEMI` | 292 | error 175: expected SEMI |
293 | err: `expected expression` | 293 | error 175: expected expression |
294 | err: `expected SEMI` | 294 | error 176: expected SEMI |
295 | err: `expected expression` | 295 | error 178: expected expression |
296 | err: `expected COMMA` | 296 | error 179: expected COMMA |
297 | err: `expected expression` | 297 | error 180: expected expression |
298 | err: `expected R_PAREN` | 298 | error 180: expected R_PAREN |
299 | err: `expected COMMA` | 299 | error 180: expected COMMA |
300 | err: `expected expression` | 300 | error 180: expected expression |
301 | err: `expected R_BRACK` | 301 | error 180: expected R_BRACK |
302 | err: `expected SEMI` | 302 | error 180: expected SEMI |
303 | err: `expected expression` | 303 | error 180: expected expression |
304 | err: `expected SEMI` | 304 | error 181: expected SEMI |
305 | err: `expected SEMI` | 305 | error 187: expected SEMI |
306 | err: `expected expression` | 306 | error 187: expected expression |
307 | err: `expected SEMI` | 307 | error 188: expected SEMI |
308 | err: `expected SEMI` | 308 | error 192: expected SEMI |
309 | err: `expected expression` | 309 | error 192: expected expression |
310 | err: `expected SEMI` | 310 | error 193: expected SEMI |
311 | err: `expected expression` | 311 | error 193: expected expression |
312 | err: `expected SEMI` | 312 | error 194: expected SEMI |
313 | err: `expected expression` | 313 | error 196: expected expression |
314 | err: `expected SEMI` | 314 | error 197: expected SEMI |
315 | err: `expected expression` | 315 | error 198: expected expression |
316 | err: `expected R_PAREN` | 316 | error 198: expected R_PAREN |
317 | err: `expected SEMI` | 317 | error 198: expected SEMI |
318 | err: `expected expression` | 318 | error 198: expected expression |
319 | err: `expected SEMI` | 319 | error 199: expected SEMI |
320 | err: `expected expression` | 320 | error 199: expected expression |
321 | err: `expected SEMI` | 321 | error 200: expected SEMI |
322 | err: `expected expression` | 322 | error 201: expected expression |
323 | err: `expected SEMI` | 323 | error 202: expected SEMI |
324 | err: `expected expression` | 324 | error 202: expected expression |
325 | err: `expected SEMI` | 325 | error 203: expected SEMI |
diff --git a/crates/ra_syntax/tests/data/parser/err/0029_field_completion.txt b/crates/ra_syntax/tests/data/parser/err/0029_field_completion.txt index fa92f0845..fb50a12fc 100644 --- a/crates/ra_syntax/tests/data/parser/err/0029_field_completion.txt +++ b/crates/ra_syntax/tests/data/parser/err/0029_field_completion.txt | |||
@@ -32,4 +32,4 @@ SOURCE_FILE@[0; 24) | |||
32 | WHITESPACE@[21; 22) "\n" | 32 | WHITESPACE@[21; 22) "\n" |
33 | R_CURLY@[22; 23) "}" | 33 | R_CURLY@[22; 23) "}" |
34 | WHITESPACE@[23; 24) "\n" | 34 | WHITESPACE@[23; 24) "\n" |
35 | err: `expected field name or number` | 35 | error 21: expected field name or number |
diff --git a/crates/ra_syntax/tests/data/parser/err/0030_string_suffixes.txt b/crates/ra_syntax/tests/data/parser/err/0030_string_suffixes.txt index fb6d3c9c7..b0acfa5d2 100644 --- a/crates/ra_syntax/tests/data/parser/err/0030_string_suffixes.txt +++ b/crates/ra_syntax/tests/data/parser/err/0030_string_suffixes.txt | |||
@@ -67,4 +67,4 @@ SOURCE_FILE@[0; 112) | |||
67 | WHITESPACE@[109; 110) "\n" | 67 | WHITESPACE@[109; 110) "\n" |
68 | R_CURLY@[110; 111) "}" | 68 | R_CURLY@[110; 111) "}" |
69 | WHITESPACE@[111; 112) "\n" | 69 | WHITESPACE@[111; 112) "\n" |
70 | err: `expected SEMI` | 70 | error 27: expected SEMI |
diff --git a/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.txt b/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.txt index b4ec999b1..c205cf147 100644 --- a/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.txt +++ b/crates/ra_syntax/tests/data/parser/err/0031_block_inner_attrs.txt | |||
@@ -108,7 +108,7 @@ SOURCE_FILE@[0; 350) | |||
108 | WHITESPACE@[347; 348) "\n" | 108 | WHITESPACE@[347; 348) "\n" |
109 | R_CURLY@[348; 349) "}" | 109 | R_CURLY@[348; 349) "}" |
110 | WHITESPACE@[349; 350) "\n" | 110 | WHITESPACE@[349; 350) "\n" |
111 | err: `A block in this position cannot accept inner attributes` | 111 | error [39; 83): A block in this position cannot accept inner attributes |
112 | err: `A block in this position cannot accept inner attributes` | 112 | error [152; 171): A block in this position cannot accept inner attributes |
113 | err: `A block in this position cannot accept inner attributes` | 113 | error [180; 212): A block in this position cannot accept inner attributes |
114 | err: `A block in this position cannot accept inner attributes` | 114 | error [283; 302): A block in this position cannot accept inner attributes |
diff --git a/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.txt b/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.txt index a3c53f353..4e8c4143b 100644 --- a/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.txt +++ b/crates/ra_syntax/tests/data/parser/err/0032_match_arms_inner_attrs.txt | |||
@@ -188,14 +188,14 @@ SOURCE_FILE@[0; 293) | |||
188 | WHITESPACE@[290; 291) "\n" | 188 | WHITESPACE@[290; 291) "\n" |
189 | R_CURLY@[291; 292) "}" | 189 | R_CURLY@[291; 292) "}" |
190 | WHITESPACE@[292; 293) "\n" | 190 | WHITESPACE@[292; 293) "\n" |
191 | err: `expected `[`` | 191 | error 52: expected `[` |
192 | err: `expected pattern` | 192 | error 52: expected pattern |
193 | err: `expected FAT_ARROW` | 193 | error 53: expected FAT_ARROW |
194 | err: `expected COMMA` | 194 | error 78: expected COMMA |
195 | err: `expected `[`` | 195 | error 161: expected `[` |
196 | err: `expected pattern` | 196 | error 161: expected pattern |
197 | err: `expected FAT_ARROW` | 197 | error 162: expected FAT_ARROW |
198 | err: `expected `[`` | 198 | error 232: expected `[` |
199 | err: `expected pattern` | 199 | error 232: expected pattern |
200 | err: `expected FAT_ARROW` | 200 | error 233: expected FAT_ARROW |
201 | err: `expected COMMA` | 201 | error 250: expected COMMA |
diff --git a/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.txt b/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.txt index 7bcf5ec81..e4f1f6337 100644 --- a/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.txt +++ b/crates/ra_syntax/tests/data/parser/err/0033_match_arms_outer_attrs.txt | |||
@@ -59,6 +59,6 @@ SOURCE_FILE@[0; 89) | |||
59 | WHITESPACE@[86; 87) "\n" | 59 | WHITESPACE@[86; 87) "\n" |
60 | R_CURLY@[87; 88) "}" | 60 | R_CURLY@[87; 88) "}" |
61 | WHITESPACE@[88; 89) "\n" | 61 | WHITESPACE@[88; 89) "\n" |
62 | err: `expected pattern` | 62 | error 80: expected pattern |
63 | err: `expected FAT_ARROW` | 63 | error 80: expected FAT_ARROW |
64 | err: `expected expression` | 64 | error 80: expected expression |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt index eb6d98fcd..3f0f1b480 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0001_array_type_missing_semi.txt | |||
@@ -20,8 +20,8 @@ SOURCE_FILE@[0; 18) | |||
20 | ERROR@[16; 17) | 20 | ERROR@[16; 17) |
21 | SEMI@[16; 17) ";" | 21 | SEMI@[16; 17) ";" |
22 | WHITESPACE@[17; 18) "\n" | 22 | WHITESPACE@[17; 18) "\n" |
23 | err: `expected `;` or `]`` | 23 | error 12: expected `;` or `]` |
24 | err: `expected SEMI` | 24 | error 12: expected SEMI |
25 | err: `expected an item` | 25 | error 13: expected an item |
26 | err: `expected an item` | 26 | error 15: expected an item |
27 | err: `expected an item` | 27 | error 16: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt index b1d104bd4..7abc49d5e 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0002_misplaced_label_err.txt | |||
@@ -22,7 +22,7 @@ SOURCE_FILE@[0; 30) | |||
22 | WHITESPACE@[27; 28) "\n" | 22 | WHITESPACE@[27; 28) "\n" |
23 | R_CURLY@[28; 29) "}" | 23 | R_CURLY@[28; 29) "}" |
24 | WHITESPACE@[29; 30) "\n" | 24 | WHITESPACE@[29; 30) "\n" |
25 | err: `expected a loop` | 25 | error 22: expected a loop |
26 | err: `expected SEMI` | 26 | error 22: expected SEMI |
27 | err: `expected type` | 27 | error 27: expected type |
28 | err: `expected `{`` | 28 | error 27: expected `{` |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt index b470d9ad1..b97e339bb 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0003_pointer_type_no_mutability.txt | |||
@@ -14,4 +14,4 @@ SOURCE_FILE@[0; 14) | |||
14 | R_PAREN@[11; 12) ")" | 14 | R_PAREN@[11; 12) ")" |
15 | SEMI@[12; 13) ";" | 15 | SEMI@[12; 13) ";" |
16 | WHITESPACE@[13; 14) "\n" | 16 | WHITESPACE@[13; 14) "\n" |
17 | err: `expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate)` | 17 | error 10: expected mut or const in raw pointer type (use `*mut T` or `*const T` as appropriate) |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt index ef4e0d5dd..43321b1ed 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0004_impl_type.txt | |||
@@ -73,7 +73,7 @@ SOURCE_FILE@[0; 87) | |||
73 | L_CURLY@[84; 85) "{" | 73 | L_CURLY@[84; 85) "{" |
74 | R_CURLY@[85; 86) "}" | 74 | R_CURLY@[85; 86) "}" |
75 | WHITESPACE@[86; 87) "\n" | 75 | WHITESPACE@[86; 87) "\n" |
76 | err: `expected trait or type` | 76 | error 38: expected trait or type |
77 | err: `expected `{`` | 77 | error 38: expected `{` |
78 | err: `expected trait or type` | 78 | error 70: expected trait or type |
79 | err: `expected `{`` | 79 | error 70: expected `{` |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt index 41e623b41..451f29d39 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0005_fn_pointer_type_missing_fn.txt | |||
@@ -16,8 +16,8 @@ SOURCE_FILE@[0; 20) | |||
16 | ERROR@[18; 19) | 16 | ERROR@[18; 19) |
17 | SEMI@[18; 19) ";" | 17 | SEMI@[18; 19) ";" |
18 | WHITESPACE@[19; 20) "\n" | 18 | WHITESPACE@[19; 20) "\n" |
19 | err: `expected `fn`` | 19 | error 15: expected `fn` |
20 | err: `expected SEMI` | 20 | error 15: expected SEMI |
21 | err: `expected an item` | 21 | error 16: expected an item |
22 | err: `expected an item` | 22 | error 17: expected an item |
23 | err: `expected an item` | 23 | error 18: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt index f1d0dd5c6..a1871ec08 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0006_unsafe_block_in_mod.txt | |||
@@ -31,5 +31,5 @@ SOURCE_FILE@[0; 33) | |||
31 | L_CURLY@[30; 31) "{" | 31 | L_CURLY@[30; 31) "{" |
32 | R_CURLY@[31; 32) "}" | 32 | R_CURLY@[31; 32) "}" |
33 | WHITESPACE@[32; 33) "\n" | 33 | WHITESPACE@[32; 33) "\n" |
34 | err: `expected an item` | 34 | error 11: expected an item |
35 | err: `expected an item` | 35 | error 18: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt b/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt index 1a8fa029c..f70adc25d 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0007_async_without_semicolon.txt | |||
@@ -28,4 +28,4 @@ SOURCE_FILE@[0; 30) | |||
28 | WHITESPACE@[27; 28) " " | 28 | WHITESPACE@[27; 28) " " |
29 | R_CURLY@[28; 29) "}" | 29 | R_CURLY@[28; 29) "}" |
30 | WHITESPACE@[29; 30) "\n" | 30 | WHITESPACE@[29; 30) "\n" |
31 | err: `expected SEMI` | 31 | error 27: expected SEMI |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt b/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt index cadbbc078..1dbfca698 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0008_pub_expr.txt | |||
@@ -22,4 +22,4 @@ SOURCE_FILE@[0; 21) | |||
22 | WHITESPACE@[18; 19) " " | 22 | WHITESPACE@[18; 19) " " |
23 | R_CURLY@[19; 20) "}" | 23 | R_CURLY@[19; 20) "}" |
24 | WHITESPACE@[20; 21) "\n" | 24 | WHITESPACE@[20; 21) "\n" |
25 | err: `expected an item` | 25 | error 14: expected an item |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt b/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt index 8e7d7d241..338776a72 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0009_attr_on_expr_not_allowed.txt | |||
@@ -51,5 +51,5 @@ SOURCE_FILE@[0; 48) | |||
51 | WHITESPACE@[45; 46) "\n" | 51 | WHITESPACE@[45; 46) "\n" |
52 | R_CURLY@[46; 47) "}" | 52 | R_CURLY@[46; 47) "}" |
53 | WHITESPACE@[47; 48) "\n" | 53 | WHITESPACE@[47; 48) "\n" |
54 | err: `attributes are not allowed on BIN_EXPR` | 54 | error 24: attributes are not allowed on BIN_EXPR |
55 | err: `attributes are not allowed on IF_EXPR` | 55 | error 44: attributes are not allowed on IF_EXPR |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt b/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt index 36717439e..a21b29c80 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0010_bad_tuple_index_expr.txt | |||
@@ -46,6 +46,6 @@ SOURCE_FILE@[0; 47) | |||
46 | WHITESPACE@[44; 45) "\n" | 46 | WHITESPACE@[44; 45) "\n" |
47 | R_CURLY@[45; 46) "}" | 47 | R_CURLY@[45; 46) "}" |
48 | WHITESPACE@[46; 47) "\n" | 48 | WHITESPACE@[46; 47) "\n" |
49 | err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` | 49 | error [17; 19): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix |
50 | err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` | 50 | error [27; 31): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix |
51 | err: `Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix` | 51 | error [39; 43): Tuple (struct) field access is only allowed through decimal integers with no underscores or suffix |
diff --git a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt b/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt index 5f39e7238..9eb4c9b36 100644 --- a/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt +++ b/crates/ra_syntax/tests/data/parser/inline/err/0010_wrong_order_fns.txt | |||
@@ -35,5 +35,5 @@ SOURCE_FILE@[0; 50) | |||
35 | L_CURLY@[47; 48) "{" | 35 | L_CURLY@[47; 48) "{" |
36 | R_CURLY@[48; 49) "}" | 36 | R_CURLY@[48; 49) "}" |
37 | WHITESPACE@[49; 50) "\n" | 37 | WHITESPACE@[49; 50) "\n" |
38 | err: `expected fn, trait or impl` | 38 | error 5: expected fn, trait or impl |
39 | err: `expected fn, trait or impl` | 39 | error 31: expected fn, trait or impl |