diff options
Diffstat (limited to 'crates/ra_syntax/test_data')
43 files changed, 359 insertions, 211 deletions
diff --git a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt index 0dbbfe853..dc143945a 100644 --- a/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt +++ b/crates/ra_syntax/test_data/parser/err/0000_struct_field_missing_comma.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 34) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) " " | 7 | WHITESPACE@[8; 9) " " |
8 | NAMED_FIELD_DEF_LIST@[9; 34) | 8 | RECORD_FIELD_DEF_LIST@[9; 34) |
9 | L_CURLY@[9; 10) "{" | 9 | L_CURLY@[9; 10) "{" |
10 | WHITESPACE@[10; 15) "\n " | 10 | WHITESPACE@[10; 15) "\n " |
11 | NAMED_FIELD_DEF@[15; 21) | 11 | RECORD_FIELD_DEF@[15; 21) |
12 | NAME@[15; 16) | 12 | NAME@[15; 16) |
13 | IDENT@[15; 16) "a" | 13 | IDENT@[15; 16) "a" |
14 | COLON@[16; 17) ":" | 14 | COLON@[16; 17) ":" |
@@ -19,7 +19,7 @@ SOURCE_FILE@[0; 34) | |||
19 | NAME_REF@[18; 21) | 19 | NAME_REF@[18; 21) |
20 | IDENT@[18; 21) "u32" | 20 | IDENT@[18; 21) "u32" |
21 | WHITESPACE@[21; 26) "\n " | 21 | WHITESPACE@[21; 26) "\n " |
22 | NAMED_FIELD_DEF@[26; 32) | 22 | RECORD_FIELD_DEF@[26; 32) |
23 | NAME@[26; 27) | 23 | NAME@[26; 27) |
24 | IDENT@[26; 27) "b" | 24 | IDENT@[26; 27) "b" |
25 | COLON@[27; 28) ":" | 25 | COLON@[27; 28) ":" |
diff --git a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt index 7cfb54ef8..181bcdb9e 100644 --- a/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt +++ b/crates/ra_syntax/test_data/parser/err/0001_item_recovery_in_file.txt | |||
@@ -11,7 +11,7 @@ SOURCE_FILE@[0; 21) | |||
11 | NAME@[17; 18) | 11 | NAME@[17; 18) |
12 | IDENT@[17; 18) "S" | 12 | IDENT@[17; 18) "S" |
13 | WHITESPACE@[18; 19) " " | 13 | WHITESPACE@[18; 19) " " |
14 | NAMED_FIELD_DEF_LIST@[19; 21) | 14 | RECORD_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 | error 0: expected an item | 17 | error 0: expected an item |
diff --git a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt index 857826037..58d005902 100644 --- a/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt +++ b/crates/ra_syntax/test_data/parser/err/0003_C++_semicolon.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 40) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) " " | 7 | WHITESPACE@[8; 9) " " |
8 | NAMED_FIELD_DEF_LIST@[9; 39) | 8 | RECORD_FIELD_DEF_LIST@[9; 39) |
9 | L_CURLY@[9; 10) "{" | 9 | L_CURLY@[9; 10) "{" |
10 | WHITESPACE@[10; 15) "\n " | 10 | WHITESPACE@[10; 15) "\n " |
11 | NAMED_FIELD_DEF@[15; 21) | 11 | RECORD_FIELD_DEF@[15; 21) |
12 | NAME@[15; 16) | 12 | NAME@[15; 16) |
13 | IDENT@[15; 16) "a" | 13 | IDENT@[15; 16) "a" |
14 | COLON@[16; 17) ":" | 14 | COLON@[16; 17) ":" |
@@ -20,7 +20,7 @@ SOURCE_FILE@[0; 40) | |||
20 | IDENT@[18; 21) "i32" | 20 | IDENT@[18; 21) "i32" |
21 | COMMA@[21; 22) "," | 21 | COMMA@[21; 22) "," |
22 | WHITESPACE@[22; 27) "\n " | 22 | WHITESPACE@[22; 27) "\n " |
23 | NAMED_FIELD_DEF@[27; 36) | 23 | RECORD_FIELD_DEF@[27; 36) |
24 | NAME@[27; 28) | 24 | NAME@[27; 28) |
25 | IDENT@[27; 28) "b" | 25 | IDENT@[27; 28) "b" |
26 | COLON@[28; 29) ":" | 26 | COLON@[28; 29) ":" |
diff --git a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt index 6143e68f1..5f5198b31 100644 --- a/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt +++ b/crates/ra_syntax/test_data/parser/err/0006_named_field_recovery.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 74) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) " " | 7 | WHITESPACE@[8; 9) " " |
8 | NAMED_FIELD_DEF_LIST@[9; 73) | 8 | RECORD_FIELD_DEF_LIST@[9; 73) |
9 | L_CURLY@[9; 10) "{" | 9 | L_CURLY@[9; 10) "{" |
10 | WHITESPACE@[10; 15) "\n " | 10 | WHITESPACE@[10; 15) "\n " |
11 | NAMED_FIELD_DEF@[15; 21) | 11 | RECORD_FIELD_DEF@[15; 21) |
12 | NAME@[15; 16) | 12 | NAME@[15; 16) |
13 | IDENT@[15; 16) "f" | 13 | IDENT@[15; 16) "f" |
14 | COLON@[16; 17) ":" | 14 | COLON@[16; 17) ":" |
@@ -35,7 +35,7 @@ SOURCE_FILE@[0; 74) | |||
35 | ERROR@[42; 43) | 35 | ERROR@[42; 43) |
36 | STAR@[42; 43) "*" | 36 | STAR@[42; 43) "*" |
37 | WHITESPACE@[43; 48) "\n " | 37 | WHITESPACE@[43; 48) "\n " |
38 | NAMED_FIELD_DEF@[48; 58) | 38 | RECORD_FIELD_DEF@[48; 58) |
39 | VISIBILITY@[48; 51) | 39 | VISIBILITY@[48; 51) |
40 | PUB_KW@[48; 51) "pub" | 40 | PUB_KW@[48; 51) "pub" |
41 | WHITESPACE@[51; 52) " " | 41 | WHITESPACE@[51; 52) " " |
@@ -50,7 +50,7 @@ SOURCE_FILE@[0; 74) | |||
50 | IDENT@[55; 58) "u32" | 50 | IDENT@[55; 58) "u32" |
51 | COMMA@[58; 59) "," | 51 | COMMA@[58; 59) "," |
52 | WHITESPACE@[59; 64) "\n " | 52 | WHITESPACE@[59; 64) "\n " |
53 | NAMED_FIELD_DEF@[64; 70) | 53 | RECORD_FIELD_DEF@[64; 70) |
54 | NAME@[64; 65) | 54 | NAME@[64; 65) |
55 | IDENT@[64; 65) "z" | 55 | IDENT@[64; 65) "z" |
56 | COLON@[65; 66) ":" | 56 | COLON@[65; 66) ":" |
diff --git a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt index bef286b37..4907bac6d 100644 --- a/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt +++ b/crates/ra_syntax/test_data/parser/err/0013_invalid_type.txt | |||
@@ -7,10 +7,10 @@ SOURCE_FILE@[0; 86) | |||
7 | WHITESPACE@[10; 11) " " | 7 | WHITESPACE@[10; 11) " " |
8 | NAME@[11; 16) | 8 | NAME@[11; 16) |
9 | IDENT@[11; 16) "Cache" | 9 | IDENT@[11; 16) "Cache" |
10 | POS_FIELD_DEF_LIST@[16; 72) | 10 | TUPLE_FIELD_DEF_LIST@[16; 72) |
11 | L_PAREN@[16; 17) "(" | 11 | L_PAREN@[16; 17) "(" |
12 | WHITESPACE@[17; 22) "\n " | 12 | WHITESPACE@[17; 22) "\n " |
13 | POS_FIELD_DEF@[22; 68) | 13 | TUPLE_FIELD_DEF@[22; 68) |
14 | PATH_TYPE@[22; 68) | 14 | PATH_TYPE@[22; 68) |
15 | PATH@[22; 68) | 15 | PATH@[22; 68) |
16 | PATH_SEGMENT@[22; 68) | 16 | PATH_SEGMENT@[22; 68) |
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 86) | |||
47 | ERROR@[67; 68) | 47 | ERROR@[67; 68) |
48 | AT@[67; 68) "@" | 48 | AT@[67; 68) "@" |
49 | WHITESPACE@[68; 69) " " | 49 | WHITESPACE@[68; 69) " " |
50 | POS_FIELD_DEF@[69; 72) | 50 | TUPLE_FIELD_DEF@[69; 72) |
51 | PATH_TYPE@[69; 72) | 51 | PATH_TYPE@[69; 72) |
52 | PATH@[69; 72) | 52 | PATH@[69; 72) |
53 | PATH_SEGMENT@[69; 72) | 53 | PATH_SEGMENT@[69; 72) |
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt index 51def2d8f..52eb7d5e2 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.txt | |||
@@ -75,16 +75,16 @@ SOURCE_FILE@[0; 183) | |||
75 | IDENT@[106; 110) "push" | 75 | IDENT@[106; 110) "push" |
76 | ARG_LIST@[110; 155) | 76 | ARG_LIST@[110; 155) |
77 | L_PAREN@[110; 111) "(" | 77 | L_PAREN@[110; 111) "(" |
78 | STRUCT_LIT@[111; 154) | 78 | RECORD_LIT@[111; 154) |
79 | PATH@[111; 120) | 79 | PATH@[111; 120) |
80 | PATH_SEGMENT@[111; 120) | 80 | PATH_SEGMENT@[111; 120) |
81 | NAME_REF@[111; 120) | 81 | NAME_REF@[111; 120) |
82 | IDENT@[111; 120) "ScopeData" | 82 | IDENT@[111; 120) "ScopeData" |
83 | WHITESPACE@[120; 121) " " | 83 | WHITESPACE@[120; 121) " " |
84 | NAMED_FIELD_LIST@[121; 154) | 84 | RECORD_FIELD_LIST@[121; 154) |
85 | L_CURLY@[121; 122) "{" | 85 | L_CURLY@[121; 122) "{" |
86 | WHITESPACE@[122; 123) " " | 86 | WHITESPACE@[122; 123) " " |
87 | NAMED_FIELD@[123; 135) | 87 | RECORD_FIELD@[123; 135) |
88 | NAME_REF@[123; 129) | 88 | NAME_REF@[123; 129) |
89 | IDENT@[123; 129) "parent" | 89 | IDENT@[123; 129) "parent" |
90 | COLON@[129; 130) ":" | 90 | COLON@[129; 130) ":" |
@@ -96,7 +96,7 @@ SOURCE_FILE@[0; 183) | |||
96 | IDENT@[131; 135) "None" | 96 | IDENT@[131; 135) "None" |
97 | COMMA@[135; 136) "," | 97 | COMMA@[135; 136) "," |
98 | WHITESPACE@[136; 137) " " | 98 | WHITESPACE@[136; 137) " " |
99 | NAMED_FIELD@[137; 152) | 99 | RECORD_FIELD@[137; 152) |
100 | NAME_REF@[137; 144) | 100 | NAME_REF@[137; 144) |
101 | IDENT@[137; 144) "entries" | 101 | IDENT@[137; 144) "entries" |
102 | COLON@[144; 145) ":" | 102 | COLON@[144; 145) ":" |
diff --git a/crates/ra_syntax/test_data/parser/err/0025_nope.txt b/crates/ra_syntax/test_data/parser/err/0025_nope.txt index 0a3952dc9..7b228a8ed 100644 --- a/crates/ra_syntax/test_data/parser/err/0025_nope.txt +++ b/crates/ra_syntax/test_data/parser/err/0025_nope.txt | |||
@@ -28,9 +28,9 @@ SOURCE_FILE@[0; 575) | |||
28 | ENUM_VARIANT@[50; 62) | 28 | ENUM_VARIANT@[50; 62) |
29 | NAME@[50; 54) | 29 | NAME@[50; 54) |
30 | IDENT@[50; 54) "Var2" | 30 | IDENT@[50; 54) "Var2" |
31 | POS_FIELD_DEF_LIST@[54; 62) | 31 | TUPLE_FIELD_DEF_LIST@[54; 62) |
32 | L_PAREN@[54; 55) "(" | 32 | L_PAREN@[54; 55) "(" |
33 | POS_FIELD_DEF@[55; 61) | 33 | TUPLE_FIELD_DEF@[55; 61) |
34 | PATH_TYPE@[55; 61) | 34 | PATH_TYPE@[55; 61) |
35 | PATH@[55; 61) | 35 | PATH@[55; 61) |
36 | PATH_SEGMENT@[55; 61) | 36 | PATH_SEGMENT@[55; 61) |
@@ -43,10 +43,10 @@ SOURCE_FILE@[0; 575) | |||
43 | NAME@[72; 76) | 43 | NAME@[72; 76) |
44 | IDENT@[72; 76) "Var3" | 44 | IDENT@[72; 76) "Var3" |
45 | WHITESPACE@[76; 77) " " | 45 | WHITESPACE@[76; 77) " " |
46 | NAMED_FIELD_DEF_LIST@[77; 145) | 46 | RECORD_FIELD_DEF_LIST@[77; 145) |
47 | L_CURLY@[77; 78) "{" | 47 | L_CURLY@[77; 78) "{" |
48 | WHITESPACE@[78; 91) "\n " | 48 | WHITESPACE@[78; 91) "\n " |
49 | NAMED_FIELD_DEF@[91; 95) | 49 | RECORD_FIELD_DEF@[91; 95) |
50 | NAME@[91; 94) | 50 | NAME@[91; 94) |
51 | IDENT@[91; 94) "abc" | 51 | IDENT@[91; 94) "abc" |
52 | COLON@[94; 95) ":" | 52 | COLON@[94; 95) ":" |
@@ -108,10 +108,10 @@ SOURCE_FILE@[0; 575) | |||
108 | NAME@[250; 259) | 108 | NAME@[250; 259) |
109 | IDENT@[250; 259) "StillFine" | 109 | IDENT@[250; 259) "StillFine" |
110 | WHITESPACE@[259; 260) " " | 110 | WHITESPACE@[259; 260) " " |
111 | NAMED_FIELD_DEF_LIST@[260; 293) | 111 | RECORD_FIELD_DEF_LIST@[260; 293) |
112 | L_CURLY@[260; 261) "{" | 112 | L_CURLY@[260; 261) "{" |
113 | WHITESPACE@[261; 274) "\n " | 113 | WHITESPACE@[261; 274) "\n " |
114 | NAMED_FIELD_DEF@[274; 282) | 114 | RECORD_FIELD_DEF@[274; 282) |
115 | NAME@[274; 277) | 115 | NAME@[274; 277) |
116 | IDENT@[274; 277) "def" | 116 | IDENT@[274; 277) "def" |
117 | COLON@[277; 278) ":" | 117 | COLON@[277; 278) ":" |
@@ -147,9 +147,9 @@ SOURCE_FILE@[0; 575) | |||
147 | ENUM_VARIANT@[363; 372) | 147 | ENUM_VARIANT@[363; 372) |
148 | NAME@[363; 367) | 148 | NAME@[363; 367) |
149 | IDENT@[363; 367) "Nope" | 149 | IDENT@[363; 367) "Nope" |
150 | POS_FIELD_DEF_LIST@[367; 372) | 150 | TUPLE_FIELD_DEF_LIST@[367; 372) |
151 | L_PAREN@[367; 368) "(" | 151 | L_PAREN@[367; 368) "(" |
152 | POS_FIELD_DEF@[368; 371) | 152 | TUPLE_FIELD_DEF@[368; 371) |
153 | PATH_TYPE@[368; 371) | 153 | PATH_TYPE@[368; 371) |
154 | PATH@[368; 371) | 154 | PATH@[368; 371) |
155 | PATH_SEGMENT@[368; 371) | 155 | PATH_SEGMENT@[368; 371) |
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rs b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rs new file mode 100644 index 000000000..d3fa2e468 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.rs | |||
@@ -0,0 +1,6 @@ | |||
1 | fn main() { | ||
2 | let ref box i = (); | ||
3 | let mut box i = (); | ||
4 | let ref mut box i = (); | ||
5 | } | ||
6 | |||
diff --git a/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.txt b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.txt new file mode 100644 index 000000000..0cdca4b55 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0034_bad_box_pattern.txt | |||
@@ -0,0 +1,95 @@ | |||
1 | SOURCE_FILE@[0; 91) | ||
2 | FN_DEF@[0; 89) | ||
3 | FN_KW@[0; 2) "fn" | ||
4 | WHITESPACE@[2; 3) " " | ||
5 | NAME@[3; 7) | ||
6 | IDENT@[3; 7) "main" | ||
7 | PARAM_LIST@[7; 9) | ||
8 | L_PAREN@[7; 8) "(" | ||
9 | R_PAREN@[8; 9) ")" | ||
10 | WHITESPACE@[9; 10) " " | ||
11 | BLOCK@[10; 89) | ||
12 | L_CURLY@[10; 11) "{" | ||
13 | WHITESPACE@[11; 16) "\n " | ||
14 | LET_STMT@[16; 27) | ||
15 | LET_KW@[16; 19) "let" | ||
16 | WHITESPACE@[19; 20) " " | ||
17 | BIND_PAT@[20; 27) | ||
18 | REF_KW@[20; 23) "ref" | ||
19 | WHITESPACE@[23; 24) " " | ||
20 | ERROR@[24; 27) | ||
21 | BOX_KW@[24; 27) "box" | ||
22 | WHITESPACE@[27; 28) " " | ||
23 | EXPR_STMT@[28; 35) | ||
24 | BIN_EXPR@[28; 34) | ||
25 | PATH_EXPR@[28; 29) | ||
26 | PATH@[28; 29) | ||
27 | PATH_SEGMENT@[28; 29) | ||
28 | NAME_REF@[28; 29) | ||
29 | IDENT@[28; 29) "i" | ||
30 | WHITESPACE@[29; 30) " " | ||
31 | EQ@[30; 31) "=" | ||
32 | WHITESPACE@[31; 32) " " | ||
33 | TUPLE_EXPR@[32; 34) | ||
34 | L_PAREN@[32; 33) "(" | ||
35 | R_PAREN@[33; 34) ")" | ||
36 | SEMI@[34; 35) ";" | ||
37 | WHITESPACE@[35; 40) "\n " | ||
38 | LET_STMT@[40; 51) | ||
39 | LET_KW@[40; 43) "let" | ||
40 | WHITESPACE@[43; 44) " " | ||
41 | BIND_PAT@[44; 51) | ||
42 | MUT_KW@[44; 47) "mut" | ||
43 | WHITESPACE@[47; 48) " " | ||
44 | ERROR@[48; 51) | ||
45 | BOX_KW@[48; 51) "box" | ||
46 | WHITESPACE@[51; 52) " " | ||
47 | EXPR_STMT@[52; 59) | ||
48 | BIN_EXPR@[52; 58) | ||
49 | PATH_EXPR@[52; 53) | ||
50 | PATH@[52; 53) | ||
51 | PATH_SEGMENT@[52; 53) | ||
52 | NAME_REF@[52; 53) | ||
53 | IDENT@[52; 53) "i" | ||
54 | WHITESPACE@[53; 54) " " | ||
55 | EQ@[54; 55) "=" | ||
56 | WHITESPACE@[55; 56) " " | ||
57 | TUPLE_EXPR@[56; 58) | ||
58 | L_PAREN@[56; 57) "(" | ||
59 | R_PAREN@[57; 58) ")" | ||
60 | SEMI@[58; 59) ";" | ||
61 | WHITESPACE@[59; 64) "\n " | ||
62 | LET_STMT@[64; 79) | ||
63 | LET_KW@[64; 67) "let" | ||
64 | WHITESPACE@[67; 68) " " | ||
65 | BIND_PAT@[68; 79) | ||
66 | REF_KW@[68; 71) "ref" | ||
67 | WHITESPACE@[71; 72) " " | ||
68 | MUT_KW@[72; 75) "mut" | ||
69 | WHITESPACE@[75; 76) " " | ||
70 | ERROR@[76; 79) | ||
71 | BOX_KW@[76; 79) "box" | ||
72 | WHITESPACE@[79; 80) " " | ||
73 | EXPR_STMT@[80; 87) | ||
74 | BIN_EXPR@[80; 86) | ||
75 | PATH_EXPR@[80; 81) | ||
76 | PATH@[80; 81) | ||
77 | PATH_SEGMENT@[80; 81) | ||
78 | NAME_REF@[80; 81) | ||
79 | IDENT@[80; 81) "i" | ||
80 | WHITESPACE@[81; 82) " " | ||
81 | EQ@[82; 83) "=" | ||
82 | WHITESPACE@[83; 84) " " | ||
83 | TUPLE_EXPR@[84; 86) | ||
84 | L_PAREN@[84; 85) "(" | ||
85 | R_PAREN@[85; 86) ")" | ||
86 | SEMI@[86; 87) ";" | ||
87 | WHITESPACE@[87; 88) "\n" | ||
88 | R_CURLY@[88; 89) "}" | ||
89 | WHITESPACE@[89; 91) "\n\n" | ||
90 | error 24: expected a name | ||
91 | error 27: expected SEMI | ||
92 | error 48: expected a name | ||
93 | error 51: expected SEMI | ||
94 | error 76: expected a name | ||
95 | error 79: expected SEMI | ||
diff --git a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs index e0437d163..0e6e0ccc3 100644 --- a/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs +++ b/crates/ra_syntax/test_data/parser/fuzz-failures/0000.rs | |||
@@ -86,7 +86,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax | |||
86 | fn reparser(node: SyntaxNodeRef) -> Option<fn(&mut Parser)> { | 86 | fn reparser(node: SyntaxNodeRef) -> Option<fn(&mut Parser)> { |
87 | let res = match node.kind() { | 87 | let res = match node.kind() { |
88 | BLOCK => grammar::block, | 88 | BLOCK => grammar::block, |
89 | NAMED_FIELD_DEF_LIST => grammar::named_field_def_list, | 89 | RECORD_FIELD_DEF_LIST => grammar::record_field_def_list, |
90 | _ => return None, | 90 | _ => return None, |
91 | }; | 91 | }; |
92 | Some(res) | 92 | Some(res) |
@@ -138,7 +138,7 @@ fn find_reparsable_node(node: SyntaxNodeRef, range: TextRange) -> Option<(Syntax | |||
138 | let res = match node.kind() { | 138 | let res = match node.kind() { |
139 | ; | 139 | ; |
140 | let end = u32::from(range.end()) as usize; | 140 | let end = u32::from(range.end()) as usize; |
141 | text.replaT => grammar::named_field_def_list, | 141 | text.replaT => grammar::record_field_def_list, |
142 | _ => return None, | 142 | _ => return None, |
143 | }; | 143 | }; |
144 | Some(res) | 144 | Some(res) |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt index 0c6be485e..4108762e5 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.txt | |||
@@ -52,13 +52,13 @@ SOURCE_FILE@[0; 103) | |||
52 | LET_STMT@[58; 78) | 52 | LET_STMT@[58; 78) |
53 | LET_KW@[58; 61) "let" | 53 | LET_KW@[58; 61) "let" |
54 | WHITESPACE@[61; 62) " " | 54 | WHITESPACE@[61; 62) " " |
55 | STRUCT_PAT@[62; 72) | 55 | RECORD_PAT@[62; 72) |
56 | PATH@[62; 65) | 56 | PATH@[62; 65) |
57 | PATH_SEGMENT@[62; 65) | 57 | PATH_SEGMENT@[62; 65) |
58 | NAME_REF@[62; 65) | 58 | NAME_REF@[62; 65) |
59 | IDENT@[62; 65) "Bar" | 59 | IDENT@[62; 65) "Bar" |
60 | WHITESPACE@[65; 66) " " | 60 | WHITESPACE@[65; 66) " " |
61 | FIELD_PAT_LIST@[66; 72) | 61 | RECORD_FIELD_PAT_LIST@[66; 72) |
62 | L_CURLY@[66; 67) "{" | 62 | L_CURLY@[66; 67) "{" |
63 | WHITESPACE@[67; 68) " " | 63 | WHITESPACE@[67; 68) " " |
64 | DOTDOT@[68; 70) ".." | 64 | DOTDOT@[68; 70) ".." |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt index fb8246174..882e4a9ae 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0040_crate_keyword_vis.txt | |||
@@ -22,10 +22,10 @@ SOURCE_FILE@[0; 71) | |||
22 | NAME@[27; 28) | 22 | NAME@[27; 28) |
23 | IDENT@[27; 28) "S" | 23 | IDENT@[27; 28) "S" |
24 | WHITESPACE@[28; 29) " " | 24 | WHITESPACE@[28; 29) " " |
25 | NAMED_FIELD_DEF_LIST@[29; 49) | 25 | RECORD_FIELD_DEF_LIST@[29; 49) |
26 | L_CURLY@[29; 30) "{" | 26 | L_CURLY@[29; 30) "{" |
27 | WHITESPACE@[30; 31) " " | 27 | WHITESPACE@[30; 31) " " |
28 | NAMED_FIELD_DEF@[31; 47) | 28 | RECORD_FIELD_DEF@[31; 47) |
29 | VISIBILITY@[31; 36) | 29 | VISIBILITY@[31; 36) |
30 | CRATE_KW@[31; 36) "crate" | 30 | CRATE_KW@[31; 36) "crate" |
31 | WHITESPACE@[36; 37) " " | 31 | WHITESPACE@[36; 37) " " |
@@ -46,9 +46,9 @@ SOURCE_FILE@[0; 71) | |||
46 | WHITESPACE@[56; 57) " " | 46 | WHITESPACE@[56; 57) " " |
47 | NAME@[57; 58) | 47 | NAME@[57; 58) |
48 | IDENT@[57; 58) "T" | 48 | IDENT@[57; 58) "T" |
49 | POS_FIELD_DEF_LIST@[58; 69) | 49 | TUPLE_FIELD_DEF_LIST@[58; 69) |
50 | L_PAREN@[58; 59) "(" | 50 | L_PAREN@[58; 59) "(" |
51 | POS_FIELD_DEF@[59; 68) | 51 | TUPLE_FIELD_DEF@[59; 68) |
52 | VISIBILITY@[59; 64) | 52 | VISIBILITY@[59; 64) |
53 | CRATE_KW@[59; 64) "crate" | 53 | CRATE_KW@[59; 64) "crate" |
54 | WHITESPACE@[64; 65) " " | 54 | WHITESPACE@[64; 65) " " |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.rs b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs index 4744d8ac0..4744d8ac0 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.rs | |||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.txt b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.txt index f214d1d47..56aeba768 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0054_field_attrs.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0054_record_field_attrs.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 64) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) " " | 7 | WHITESPACE@[8; 9) " " |
8 | NAMED_FIELD_DEF_LIST@[9; 63) | 8 | RECORD_FIELD_DEF_LIST@[9; 63) |
9 | L_CURLY@[9; 10) "{" | 9 | L_CURLY@[9; 10) "{" |
10 | WHITESPACE@[10; 15) "\n " | 10 | WHITESPACE@[10; 15) "\n " |
11 | NAMED_FIELD_DEF@[15; 60) | 11 | RECORD_FIELD_DEF@[15; 60) |
12 | ATTR@[15; 43) | 12 | ATTR@[15; 43) |
13 | POUND@[15; 16) "#" | 13 | POUND@[15; 16) "#" |
14 | TOKEN_TREE@[16; 43) | 14 | TOKEN_TREE@[16; 43) |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.rs b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs index 6285e5549..6285e5549 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.rs | |||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.txt b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.txt index d06594cae..1c915ea0c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0061_struct_lit.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0061_record_lit.txt | |||
@@ -12,33 +12,33 @@ SOURCE_FILE@[0; 112) | |||
12 | L_CURLY@[9; 10) "{" | 12 | L_CURLY@[9; 10) "{" |
13 | WHITESPACE@[10; 15) "\n " | 13 | WHITESPACE@[10; 15) "\n " |
14 | EXPR_STMT@[15; 20) | 14 | EXPR_STMT@[15; 20) |
15 | STRUCT_LIT@[15; 19) | 15 | RECORD_LIT@[15; 19) |
16 | PATH@[15; 16) | 16 | PATH@[15; 16) |
17 | PATH_SEGMENT@[15; 16) | 17 | PATH_SEGMENT@[15; 16) |
18 | NAME_REF@[15; 16) | 18 | NAME_REF@[15; 16) |
19 | IDENT@[15; 16) "S" | 19 | IDENT@[15; 16) "S" |
20 | WHITESPACE@[16; 17) " " | 20 | WHITESPACE@[16; 17) " " |
21 | NAMED_FIELD_LIST@[17; 19) | 21 | RECORD_FIELD_LIST@[17; 19) |
22 | L_CURLY@[17; 18) "{" | 22 | L_CURLY@[17; 18) "{" |
23 | R_CURLY@[18; 19) "}" | 23 | R_CURLY@[18; 19) "}" |
24 | SEMI@[19; 20) ";" | 24 | SEMI@[19; 20) ";" |
25 | WHITESPACE@[20; 25) "\n " | 25 | WHITESPACE@[20; 25) "\n " |
26 | EXPR_STMT@[25; 41) | 26 | EXPR_STMT@[25; 41) |
27 | STRUCT_LIT@[25; 40) | 27 | RECORD_LIT@[25; 40) |
28 | PATH@[25; 26) | 28 | PATH@[25; 26) |
29 | PATH_SEGMENT@[25; 26) | 29 | PATH_SEGMENT@[25; 26) |
30 | NAME_REF@[25; 26) | 30 | NAME_REF@[25; 26) |
31 | IDENT@[25; 26) "S" | 31 | IDENT@[25; 26) "S" |
32 | WHITESPACE@[26; 27) " " | 32 | WHITESPACE@[26; 27) " " |
33 | NAMED_FIELD_LIST@[27; 40) | 33 | RECORD_FIELD_LIST@[27; 40) |
34 | L_CURLY@[27; 28) "{" | 34 | L_CURLY@[27; 28) "{" |
35 | WHITESPACE@[28; 29) " " | 35 | WHITESPACE@[28; 29) " " |
36 | NAMED_FIELD@[29; 30) | 36 | RECORD_FIELD@[29; 30) |
37 | NAME_REF@[29; 30) | 37 | NAME_REF@[29; 30) |
38 | IDENT@[29; 30) "x" | 38 | IDENT@[29; 30) "x" |
39 | COMMA@[30; 31) "," | 39 | COMMA@[30; 31) "," |
40 | WHITESPACE@[31; 32) " " | 40 | WHITESPACE@[31; 32) " " |
41 | NAMED_FIELD@[32; 37) | 41 | RECORD_FIELD@[32; 37) |
42 | NAME_REF@[32; 33) | 42 | NAME_REF@[32; 33) |
43 | IDENT@[32; 33) "y" | 43 | IDENT@[32; 33) "y" |
44 | COLON@[33; 34) ":" | 44 | COLON@[33; 34) ":" |
@@ -51,21 +51,21 @@ SOURCE_FILE@[0; 112) | |||
51 | SEMI@[40; 41) ";" | 51 | SEMI@[40; 41) ";" |
52 | WHITESPACE@[41; 46) "\n " | 52 | WHITESPACE@[41; 46) "\n " |
53 | EXPR_STMT@[46; 83) | 53 | EXPR_STMT@[46; 83) |
54 | STRUCT_LIT@[46; 82) | 54 | RECORD_LIT@[46; 82) |
55 | PATH@[46; 47) | 55 | PATH@[46; 47) |
56 | PATH_SEGMENT@[46; 47) | 56 | PATH_SEGMENT@[46; 47) |
57 | NAME_REF@[46; 47) | 57 | NAME_REF@[46; 47) |
58 | IDENT@[46; 47) "S" | 58 | IDENT@[46; 47) "S" |
59 | WHITESPACE@[47; 48) " " | 59 | WHITESPACE@[47; 48) " " |
60 | NAMED_FIELD_LIST@[48; 82) | 60 | RECORD_FIELD_LIST@[48; 82) |
61 | L_CURLY@[48; 49) "{" | 61 | L_CURLY@[48; 49) "{" |
62 | WHITESPACE@[49; 50) " " | 62 | WHITESPACE@[49; 50) " " |
63 | NAMED_FIELD@[50; 51) | 63 | RECORD_FIELD@[50; 51) |
64 | NAME_REF@[50; 51) | 64 | NAME_REF@[50; 51) |
65 | IDENT@[50; 51) "x" | 65 | IDENT@[50; 51) "x" |
66 | COMMA@[51; 52) "," | 66 | COMMA@[51; 52) "," |
67 | WHITESPACE@[52; 53) " " | 67 | WHITESPACE@[52; 53) " " |
68 | NAMED_FIELD@[53; 58) | 68 | RECORD_FIELD@[53; 58) |
69 | NAME_REF@[53; 54) | 69 | NAME_REF@[53; 54) |
70 | IDENT@[53; 54) "y" | 70 | IDENT@[53; 54) "y" |
71 | COLON@[54; 55) ":" | 71 | COLON@[54; 55) ":" |
@@ -94,16 +94,16 @@ SOURCE_FILE@[0; 112) | |||
94 | SEMI@[82; 83) ";" | 94 | SEMI@[82; 83) ";" |
95 | WHITESPACE@[83; 88) "\n " | 95 | WHITESPACE@[83; 88) "\n " |
96 | EXPR_STMT@[88; 109) | 96 | EXPR_STMT@[88; 109) |
97 | STRUCT_LIT@[88; 108) | 97 | RECORD_LIT@[88; 108) |
98 | PATH@[88; 99) | 98 | PATH@[88; 99) |
99 | PATH_SEGMENT@[88; 99) | 99 | PATH_SEGMENT@[88; 99) |
100 | NAME_REF@[88; 99) | 100 | NAME_REF@[88; 99) |
101 | IDENT@[88; 99) "TupleStruct" | 101 | IDENT@[88; 99) "TupleStruct" |
102 | WHITESPACE@[99; 100) " " | 102 | WHITESPACE@[99; 100) " " |
103 | NAMED_FIELD_LIST@[100; 108) | 103 | RECORD_FIELD_LIST@[100; 108) |
104 | L_CURLY@[100; 101) "{" | 104 | L_CURLY@[100; 101) "{" |
105 | WHITESPACE@[101; 102) " " | 105 | WHITESPACE@[101; 102) " " |
106 | NAMED_FIELD@[102; 106) | 106 | RECORD_FIELD@[102; 106) |
107 | NAME_REF@[102; 103) | 107 | NAME_REF@[102; 103) |
108 | INT_NUMBER@[102; 103) "0" | 108 | INT_NUMBER@[102; 103) "0" |
109 | COLON@[103; 104) ":" | 109 | COLON@[103; 104) ":" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs index 2d476278d..9e009e24f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.rs | |||
@@ -5,7 +5,5 @@ fn foo() { | |||
5 | X | Y if Z => (), | 5 | X | Y if Z => (), |
6 | | X | Y if Z => (), | 6 | | X | Y if Z => (), |
7 | | X => (), | 7 | | X => (), |
8 | box X => (), | ||
9 | Some(box X) => (), | ||
10 | }; | 8 | }; |
11 | } | 9 | } |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt index 28d501459..c2f256ac3 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | SOURCE_FILE@[0; 215) | 1 | SOURCE_FILE@[0; 167) |
2 | FN_DEF@[0; 214) | 2 | FN_DEF@[0; 166) |
3 | FN_KW@[0; 2) "fn" | 3 | FN_KW@[0; 2) "fn" |
4 | WHITESPACE@[2; 3) " " | 4 | WHITESPACE@[2; 3) " " |
5 | NAME@[3; 6) | 5 | NAME@[3; 6) |
@@ -8,18 +8,18 @@ SOURCE_FILE@[0; 215) | |||
8 | L_PAREN@[6; 7) "(" | 8 | L_PAREN@[6; 7) "(" |
9 | R_PAREN@[7; 8) ")" | 9 | R_PAREN@[7; 8) ")" |
10 | WHITESPACE@[8; 9) " " | 10 | WHITESPACE@[8; 9) " " |
11 | BLOCK@[9; 214) | 11 | BLOCK@[9; 166) |
12 | L_CURLY@[9; 10) "{" | 12 | L_CURLY@[9; 10) "{" |
13 | WHITESPACE@[10; 15) "\n " | 13 | WHITESPACE@[10; 15) "\n " |
14 | EXPR_STMT@[15; 212) | 14 | EXPR_STMT@[15; 164) |
15 | MATCH_EXPR@[15; 211) | 15 | MATCH_EXPR@[15; 163) |
16 | MATCH_KW@[15; 20) "match" | 16 | MATCH_KW@[15; 20) "match" |
17 | WHITESPACE@[20; 21) " " | 17 | WHITESPACE@[20; 21) " " |
18 | TUPLE_EXPR@[21; 23) | 18 | TUPLE_EXPR@[21; 23) |
19 | L_PAREN@[21; 22) "(" | 19 | L_PAREN@[21; 22) "(" |
20 | R_PAREN@[22; 23) ")" | 20 | R_PAREN@[22; 23) ")" |
21 | WHITESPACE@[23; 24) " " | 21 | WHITESPACE@[23; 24) " " |
22 | MATCH_ARM_LIST@[24; 211) | 22 | MATCH_ARM_LIST@[24; 163) |
23 | L_CURLY@[24; 25) "{" | 23 | L_CURLY@[24; 25) "{" |
24 | WHITESPACE@[25; 34) "\n " | 24 | WHITESPACE@[25; 34) "\n " |
25 | MATCH_ARM@[34; 41) | 25 | MATCH_ARM@[34; 41) |
@@ -49,14 +49,14 @@ SOURCE_FILE@[0; 215) | |||
49 | WHITESPACE@[60; 61) " " | 49 | WHITESPACE@[60; 61) " " |
50 | R_ANGLE@[61; 62) ">" | 50 | R_ANGLE@[61; 62) ">" |
51 | WHITESPACE@[62; 63) " " | 51 | WHITESPACE@[62; 63) " " |
52 | STRUCT_LIT@[63; 77) | 52 | RECORD_LIT@[63; 77) |
53 | PATH@[63; 67) | 53 | PATH@[63; 67) |
54 | PATH_SEGMENT@[63; 67) | 54 | PATH_SEGMENT@[63; 67) |
55 | NAME_REF@[63; 67) | 55 | NAME_REF@[63; 67) |
56 | IDENT@[63; 67) "Test" | 56 | IDENT@[63; 67) "Test" |
57 | NAMED_FIELD_LIST@[67; 77) | 57 | RECORD_FIELD_LIST@[67; 77) |
58 | L_CURLY@[67; 68) "{" | 58 | L_CURLY@[67; 68) "{" |
59 | NAMED_FIELD@[68; 76) | 59 | RECORD_FIELD@[68; 76) |
60 | NAME_REF@[68; 73) | 60 | NAME_REF@[68; 73) |
61 | IDENT@[68; 73) "field" | 61 | IDENT@[68; 73) "field" |
62 | COLON@[73; 74) ":" | 62 | COLON@[73; 74) ":" |
@@ -141,44 +141,9 @@ SOURCE_FILE@[0; 215) | |||
141 | L_PAREN@[154; 155) "(" | 141 | L_PAREN@[154; 155) "(" |
142 | R_PAREN@[155; 156) ")" | 142 | R_PAREN@[155; 156) ")" |
143 | COMMA@[156; 157) "," | 143 | COMMA@[156; 157) "," |
144 | WHITESPACE@[157; 166) "\n " | 144 | WHITESPACE@[157; 162) "\n " |
145 | MATCH_ARM@[166; 177) | 145 | R_CURLY@[162; 163) "}" |
146 | BIND_PAT@[166; 171) | 146 | SEMI@[163; 164) ";" |
147 | BOX_KW@[166; 169) "box" | 147 | WHITESPACE@[164; 165) "\n" |
148 | WHITESPACE@[169; 170) " " | 148 | R_CURLY@[165; 166) "}" |
149 | NAME@[170; 171) | 149 | WHITESPACE@[166; 167) "\n" |
150 | IDENT@[170; 171) "X" | ||
151 | WHITESPACE@[171; 172) " " | ||
152 | FAT_ARROW@[172; 174) "=>" | ||
153 | WHITESPACE@[174; 175) " " | ||
154 | TUPLE_EXPR@[175; 177) | ||
155 | L_PAREN@[175; 176) "(" | ||
156 | R_PAREN@[176; 177) ")" | ||
157 | COMMA@[177; 178) "," | ||
158 | WHITESPACE@[178; 187) "\n " | ||
159 | MATCH_ARM@[187; 204) | ||
160 | TUPLE_STRUCT_PAT@[187; 198) | ||
161 | PATH@[187; 191) | ||
162 | PATH_SEGMENT@[187; 191) | ||
163 | NAME_REF@[187; 191) | ||
164 | IDENT@[187; 191) "Some" | ||
165 | L_PAREN@[191; 192) "(" | ||
166 | BIND_PAT@[192; 197) | ||
167 | BOX_KW@[192; 195) "box" | ||
168 | WHITESPACE@[195; 196) " " | ||
169 | NAME@[196; 197) | ||
170 | IDENT@[196; 197) "X" | ||
171 | R_PAREN@[197; 198) ")" | ||
172 | WHITESPACE@[198; 199) " " | ||
173 | FAT_ARROW@[199; 201) "=>" | ||
174 | WHITESPACE@[201; 202) " " | ||
175 | TUPLE_EXPR@[202; 204) | ||
176 | L_PAREN@[202; 203) "(" | ||
177 | R_PAREN@[203; 204) ")" | ||
178 | COMMA@[204; 205) "," | ||
179 | WHITESPACE@[205; 210) "\n " | ||
180 | R_CURLY@[210; 211) "}" | ||
181 | SEMI@[211; 212) ";" | ||
182 | WHITESPACE@[212; 213) "\n" | ||
183 | R_CURLY@[213; 214) "}" | ||
184 | WHITESPACE@[214; 215) "\n" | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt index 4b653317b..f9ace02ee 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0068_union_items.txt | |||
@@ -5,7 +5,7 @@ SOURCE_FILE@[0; 51) | |||
5 | NAME@[6; 9) | 5 | NAME@[6; 9) |
6 | IDENT@[6; 9) "Foo" | 6 | IDENT@[6; 9) "Foo" |
7 | WHITESPACE@[9; 10) " " | 7 | WHITESPACE@[9; 10) " " |
8 | NAMED_FIELD_DEF_LIST@[10; 12) | 8 | RECORD_FIELD_DEF_LIST@[10; 12) |
9 | L_CURLY@[10; 11) "{" | 9 | L_CURLY@[10; 11) "{" |
10 | R_CURLY@[11; 12) "}" | 10 | R_CURLY@[11; 12) "}" |
11 | WHITESPACE@[12; 13) "\n" | 11 | WHITESPACE@[12; 13) "\n" |
@@ -15,10 +15,10 @@ SOURCE_FILE@[0; 51) | |||
15 | NAME@[19; 22) | 15 | NAME@[19; 22) |
16 | IDENT@[19; 22) "Foo" | 16 | IDENT@[19; 22) "Foo" |
17 | WHITESPACE@[22; 23) " " | 17 | WHITESPACE@[22; 23) " " |
18 | NAMED_FIELD_DEF_LIST@[23; 50) | 18 | RECORD_FIELD_DEF_LIST@[23; 50) |
19 | L_CURLY@[23; 24) "{" | 19 | L_CURLY@[23; 24) "{" |
20 | WHITESPACE@[24; 29) "\n " | 20 | WHITESPACE@[24; 29) "\n " |
21 | NAMED_FIELD_DEF@[29; 35) | 21 | RECORD_FIELD_DEF@[29; 35) |
22 | NAME@[29; 30) | 22 | NAME@[29; 30) |
23 | IDENT@[29; 30) "a" | 23 | IDENT@[29; 30) "a" |
24 | COLON@[30; 31) ":" | 24 | COLON@[30; 31) ":" |
@@ -30,7 +30,7 @@ SOURCE_FILE@[0; 51) | |||
30 | IDENT@[32; 35) "i32" | 30 | IDENT@[32; 35) "i32" |
31 | COMMA@[35; 36) "," | 31 | COMMA@[35; 36) "," |
32 | WHITESPACE@[36; 41) "\n " | 32 | WHITESPACE@[36; 41) "\n " |
33 | NAMED_FIELD_DEF@[41; 47) | 33 | RECORD_FIELD_DEF@[41; 47) |
34 | NAME@[41; 42) | 34 | NAME@[41; 42) |
35 | IDENT@[41; 42) "b" | 35 | IDENT@[41; 42) "b" |
36 | COLON@[42; 43) ":" | 36 | COLON@[42; 43) ":" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt index 62d93512b..e909f2b78 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0083_struct_items.txt | |||
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 106) | |||
12 | NAME@[19; 22) | 12 | NAME@[19; 22) |
13 | IDENT@[19; 22) "Foo" | 13 | IDENT@[19; 22) "Foo" |
14 | WHITESPACE@[22; 23) " " | 14 | WHITESPACE@[22; 23) " " |
15 | NAMED_FIELD_DEF_LIST@[23; 25) | 15 | RECORD_FIELD_DEF_LIST@[23; 25) |
16 | L_CURLY@[23; 24) "{" | 16 | L_CURLY@[23; 24) "{" |
17 | R_CURLY@[24; 25) "}" | 17 | R_CURLY@[24; 25) "}" |
18 | WHITESPACE@[25; 26) "\n" | 18 | WHITESPACE@[25; 26) "\n" |
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 106) | |||
21 | WHITESPACE@[32; 33) " " | 21 | WHITESPACE@[32; 33) " " |
22 | NAME@[33; 36) | 22 | NAME@[33; 36) |
23 | IDENT@[33; 36) "Foo" | 23 | IDENT@[33; 36) "Foo" |
24 | POS_FIELD_DEF_LIST@[36; 38) | 24 | TUPLE_FIELD_DEF_LIST@[36; 38) |
25 | L_PAREN@[36; 37) "(" | 25 | L_PAREN@[36; 37) "(" |
26 | R_PAREN@[37; 38) ")" | 26 | R_PAREN@[37; 38) ")" |
27 | SEMI@[38; 39) ";" | 27 | SEMI@[38; 39) ";" |
@@ -31,9 +31,9 @@ SOURCE_FILE@[0; 106) | |||
31 | WHITESPACE@[46; 47) " " | 31 | WHITESPACE@[46; 47) " " |
32 | NAME@[47; 50) | 32 | NAME@[47; 50) |
33 | IDENT@[47; 50) "Foo" | 33 | IDENT@[47; 50) "Foo" |
34 | POS_FIELD_DEF_LIST@[50; 65) | 34 | TUPLE_FIELD_DEF_LIST@[50; 65) |
35 | L_PAREN@[50; 51) "(" | 35 | L_PAREN@[50; 51) "(" |
36 | POS_FIELD_DEF@[51; 57) | 36 | TUPLE_FIELD_DEF@[51; 57) |
37 | PATH_TYPE@[51; 57) | 37 | PATH_TYPE@[51; 57) |
38 | PATH@[51; 57) | 38 | PATH@[51; 57) |
39 | PATH_SEGMENT@[51; 57) | 39 | PATH_SEGMENT@[51; 57) |
@@ -41,7 +41,7 @@ SOURCE_FILE@[0; 106) | |||
41 | IDENT@[51; 57) "String" | 41 | IDENT@[51; 57) "String" |
42 | COMMA@[57; 58) "," | 42 | COMMA@[57; 58) "," |
43 | WHITESPACE@[58; 59) " " | 43 | WHITESPACE@[58; 59) " " |
44 | POS_FIELD_DEF@[59; 64) | 44 | TUPLE_FIELD_DEF@[59; 64) |
45 | PATH_TYPE@[59; 64) | 45 | PATH_TYPE@[59; 64) |
46 | PATH@[59; 64) | 46 | PATH@[59; 64) |
47 | PATH_SEGMENT@[59; 64) | 47 | PATH_SEGMENT@[59; 64) |
@@ -56,10 +56,10 @@ SOURCE_FILE@[0; 106) | |||
56 | NAME@[74; 77) | 56 | NAME@[74; 77) |
57 | IDENT@[74; 77) "Foo" | 57 | IDENT@[74; 77) "Foo" |
58 | WHITESPACE@[77; 78) " " | 58 | WHITESPACE@[77; 78) " " |
59 | NAMED_FIELD_DEF_LIST@[78; 105) | 59 | RECORD_FIELD_DEF_LIST@[78; 105) |
60 | L_CURLY@[78; 79) "{" | 60 | L_CURLY@[78; 79) "{" |
61 | WHITESPACE@[79; 84) "\n " | 61 | WHITESPACE@[79; 84) "\n " |
62 | NAMED_FIELD_DEF@[84; 90) | 62 | RECORD_FIELD_DEF@[84; 90) |
63 | NAME@[84; 85) | 63 | NAME@[84; 85) |
64 | IDENT@[84; 85) "a" | 64 | IDENT@[84; 85) "a" |
65 | COLON@[85; 86) ":" | 65 | COLON@[85; 86) ":" |
@@ -71,7 +71,7 @@ SOURCE_FILE@[0; 106) | |||
71 | IDENT@[87; 90) "i32" | 71 | IDENT@[87; 90) "i32" |
72 | COMMA@[90; 91) "," | 72 | COMMA@[90; 91) "," |
73 | WHITESPACE@[91; 96) "\n " | 73 | WHITESPACE@[91; 96) "\n " |
74 | NAMED_FIELD_DEF@[96; 102) | 74 | RECORD_FIELD_DEF@[96; 102) |
75 | NAME@[96; 97) | 75 | NAME@[96; 97) |
76 | IDENT@[96; 97) "b" | 76 | IDENT@[96; 97) "b" |
77 | COLON@[97; 98) ":" | 77 | COLON@[97; 98) ":" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.rs b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs index da3412fa8..da3412fa8 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rs | |||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.txt b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.txt index a2af4fc60..22db72c12 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_field_pat_list.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.txt | |||
@@ -14,13 +14,13 @@ SOURCE_FILE@[0; 119) | |||
14 | LET_STMT@[15; 29) | 14 | LET_STMT@[15; 29) |
15 | LET_KW@[15; 18) "let" | 15 | LET_KW@[15; 18) "let" |
16 | WHITESPACE@[18; 19) " " | 16 | WHITESPACE@[18; 19) " " |
17 | STRUCT_PAT@[19; 23) | 17 | RECORD_PAT@[19; 23) |
18 | PATH@[19; 20) | 18 | PATH@[19; 20) |
19 | PATH_SEGMENT@[19; 20) | 19 | PATH_SEGMENT@[19; 20) |
20 | NAME_REF@[19; 20) | 20 | NAME_REF@[19; 20) |
21 | IDENT@[19; 20) "S" | 21 | IDENT@[19; 20) "S" |
22 | WHITESPACE@[20; 21) " " | 22 | WHITESPACE@[20; 21) " " |
23 | FIELD_PAT_LIST@[21; 23) | 23 | RECORD_FIELD_PAT_LIST@[21; 23) |
24 | L_CURLY@[21; 22) "{" | 24 | L_CURLY@[21; 22) "{" |
25 | R_CURLY@[22; 23) "}" | 25 | R_CURLY@[22; 23) "}" |
26 | WHITESPACE@[23; 24) " " | 26 | WHITESPACE@[23; 24) " " |
@@ -34,13 +34,13 @@ SOURCE_FILE@[0; 119) | |||
34 | LET_STMT@[34; 62) | 34 | LET_STMT@[34; 62) |
35 | LET_KW@[34; 37) "let" | 35 | LET_KW@[34; 37) "let" |
36 | WHITESPACE@[37; 38) " " | 36 | WHITESPACE@[37; 38) " " |
37 | STRUCT_PAT@[38; 56) | 37 | RECORD_PAT@[38; 56) |
38 | PATH@[38; 39) | 38 | PATH@[38; 39) |
39 | PATH_SEGMENT@[38; 39) | 39 | PATH_SEGMENT@[38; 39) |
40 | NAME_REF@[38; 39) | 40 | NAME_REF@[38; 39) |
41 | IDENT@[38; 39) "S" | 41 | IDENT@[38; 39) "S" |
42 | WHITESPACE@[39; 40) " " | 42 | WHITESPACE@[39; 40) " " |
43 | FIELD_PAT_LIST@[40; 56) | 43 | RECORD_FIELD_PAT_LIST@[40; 56) |
44 | L_CURLY@[40; 41) "{" | 44 | L_CURLY@[40; 41) "{" |
45 | WHITESPACE@[41; 42) " " | 45 | WHITESPACE@[41; 42) " " |
46 | BIND_PAT@[42; 43) | 46 | BIND_PAT@[42; 43) |
@@ -68,16 +68,16 @@ SOURCE_FILE@[0; 119) | |||
68 | LET_STMT@[67; 90) | 68 | LET_STMT@[67; 90) |
69 | LET_KW@[67; 70) "let" | 69 | LET_KW@[67; 70) "let" |
70 | WHITESPACE@[70; 71) " " | 70 | WHITESPACE@[70; 71) " " |
71 | STRUCT_PAT@[71; 84) | 71 | RECORD_PAT@[71; 84) |
72 | PATH@[71; 72) | 72 | PATH@[71; 72) |
73 | PATH_SEGMENT@[71; 72) | 73 | PATH_SEGMENT@[71; 72) |
74 | NAME_REF@[71; 72) | 74 | NAME_REF@[71; 72) |
75 | IDENT@[71; 72) "S" | 75 | IDENT@[71; 72) "S" |
76 | WHITESPACE@[72; 73) " " | 76 | WHITESPACE@[72; 73) " " |
77 | FIELD_PAT_LIST@[73; 84) | 77 | RECORD_FIELD_PAT_LIST@[73; 84) |
78 | L_CURLY@[73; 74) "{" | 78 | L_CURLY@[73; 74) "{" |
79 | WHITESPACE@[74; 75) " " | 79 | WHITESPACE@[74; 75) " " |
80 | FIELD_PAT@[75; 79) | 80 | RECORD_FIELD_PAT@[75; 79) |
81 | NAME@[75; 76) | 81 | NAME@[75; 76) |
82 | IDENT@[75; 76) "h" | 82 | IDENT@[75; 76) "h" |
83 | COLON@[76; 77) ":" | 83 | COLON@[76; 77) ":" |
@@ -99,16 +99,16 @@ SOURCE_FILE@[0; 119) | |||
99 | LET_STMT@[95; 116) | 99 | LET_STMT@[95; 116) |
100 | LET_KW@[95; 98) "let" | 100 | LET_KW@[95; 98) "let" |
101 | WHITESPACE@[98; 99) " " | 101 | WHITESPACE@[98; 99) " " |
102 | STRUCT_PAT@[99; 110) | 102 | RECORD_PAT@[99; 110) |
103 | PATH@[99; 100) | 103 | PATH@[99; 100) |
104 | PATH_SEGMENT@[99; 100) | 104 | PATH_SEGMENT@[99; 100) |
105 | NAME_REF@[99; 100) | 105 | NAME_REF@[99; 100) |
106 | IDENT@[99; 100) "S" | 106 | IDENT@[99; 100) "S" |
107 | WHITESPACE@[100; 101) " " | 107 | WHITESPACE@[100; 101) " " |
108 | FIELD_PAT_LIST@[101; 110) | 108 | RECORD_FIELD_PAT_LIST@[101; 110) |
109 | L_CURLY@[101; 102) "{" | 109 | L_CURLY@[101; 102) "{" |
110 | WHITESPACE@[102; 103) " " | 110 | WHITESPACE@[102; 103) " " |
111 | FIELD_PAT@[103; 107) | 111 | RECORD_FIELD_PAT@[103; 107) |
112 | NAME@[103; 104) | 112 | NAME@[103; 104) |
113 | IDENT@[103; 104) "h" | 113 | IDENT@[103; 104) "h" |
114 | COLON@[104; 105) ":" | 114 | COLON@[104; 105) ":" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs index 5a93469af..820a9e72c 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.rs | |||
@@ -5,5 +5,4 @@ fn main() { | |||
5 | let ref mut d = (); | 5 | let ref mut d = (); |
6 | let e @ _ = (); | 6 | let e @ _ = (); |
7 | let ref mut f @ g @ _ = (); | 7 | let ref mut f @ g @ _ = (); |
8 | let box i = Box::new(1i32); | ||
9 | } | 8 | } |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.txt index 189254a19..ab0f88507 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0112_bind_pat.txt | |||
@@ -1,5 +1,5 @@ | |||
1 | SOURCE_FILE@[0; 178) | 1 | SOURCE_FILE@[0; 146) |
2 | FN_DEF@[0; 177) | 2 | FN_DEF@[0; 145) |
3 | FN_KW@[0; 2) "fn" | 3 | FN_KW@[0; 2) "fn" |
4 | WHITESPACE@[2; 3) " " | 4 | WHITESPACE@[2; 3) " " |
5 | NAME@[3; 7) | 5 | NAME@[3; 7) |
@@ -8,7 +8,7 @@ SOURCE_FILE@[0; 178) | |||
8 | L_PAREN@[7; 8) "(" | 8 | L_PAREN@[7; 8) "(" |
9 | R_PAREN@[8; 9) ")" | 9 | R_PAREN@[8; 9) ")" |
10 | WHITESPACE@[9; 10) " " | 10 | WHITESPACE@[9; 10) " " |
11 | BLOCK@[10; 177) | 11 | BLOCK@[10; 145) |
12 | L_CURLY@[10; 11) "{" | 12 | L_CURLY@[10; 11) "{" |
13 | WHITESPACE@[11; 16) "\n " | 13 | WHITESPACE@[11; 16) "\n " |
14 | LET_STMT@[16; 27) | 14 | LET_STMT@[16; 27) |
@@ -122,35 +122,6 @@ SOURCE_FILE@[0; 178) | |||
122 | L_PAREN@[140; 141) "(" | 122 | L_PAREN@[140; 141) "(" |
123 | R_PAREN@[141; 142) ")" | 123 | R_PAREN@[141; 142) ")" |
124 | SEMI@[142; 143) ";" | 124 | SEMI@[142; 143) ";" |
125 | WHITESPACE@[143; 148) "\n " | 125 | WHITESPACE@[143; 144) "\n" |
126 | LET_STMT@[148; 175) | 126 | R_CURLY@[144; 145) "}" |
127 | LET_KW@[148; 151) "let" | 127 | WHITESPACE@[145; 146) "\n" |
128 | WHITESPACE@[151; 152) " " | ||
129 | BIND_PAT@[152; 157) | ||
130 | BOX_KW@[152; 155) "box" | ||
131 | WHITESPACE@[155; 156) " " | ||
132 | NAME@[156; 157) | ||
133 | IDENT@[156; 157) "i" | ||
134 | WHITESPACE@[157; 158) " " | ||
135 | EQ@[158; 159) "=" | ||
136 | WHITESPACE@[159; 160) " " | ||
137 | CALL_EXPR@[160; 174) | ||
138 | PATH_EXPR@[160; 168) | ||
139 | PATH@[160; 168) | ||
140 | PATH@[160; 163) | ||
141 | PATH_SEGMENT@[160; 163) | ||
142 | NAME_REF@[160; 163) | ||
143 | IDENT@[160; 163) "Box" | ||
144 | COLONCOLON@[163; 165) "::" | ||
145 | PATH_SEGMENT@[165; 168) | ||
146 | NAME_REF@[165; 168) | ||
147 | IDENT@[165; 168) "new" | ||
148 | ARG_LIST@[168; 174) | ||
149 | L_PAREN@[168; 169) "(" | ||
150 | LITERAL@[169; 173) | ||
151 | INT_NUMBER@[169; 173) "1i32" | ||
152 | R_PAREN@[173; 174) ")" | ||
153 | SEMI@[174; 175) ";" | ||
154 | WHITESPACE@[175; 176) "\n" | ||
155 | R_CURLY@[176; 177) "}" | ||
156 | WHITESPACE@[177; 178) "\n" | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt index 8534592b9..f5de01405 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0114_tuple_struct_where.txt | |||
@@ -10,9 +10,9 @@ SOURCE_FILE@[0; 53) | |||
10 | NAME@[12; 13) | 10 | NAME@[12; 13) |
11 | IDENT@[12; 13) "T" | 11 | IDENT@[12; 13) "T" |
12 | R_ANGLE@[13; 14) ">" | 12 | R_ANGLE@[13; 14) ">" |
13 | POS_FIELD_DEF_LIST@[14; 17) | 13 | TUPLE_FIELD_DEF_LIST@[14; 17) |
14 | L_PAREN@[14; 15) "(" | 14 | L_PAREN@[14; 15) "(" |
15 | POS_FIELD_DEF@[15; 16) | 15 | TUPLE_FIELD_DEF@[15; 16) |
16 | PATH_TYPE@[15; 16) | 16 | PATH_TYPE@[15; 16) |
17 | PATH@[15; 16) | 17 | PATH@[15; 16) |
18 | PATH_SEGMENT@[15; 16) | 18 | PATH_SEGMENT@[15; 16) |
@@ -51,9 +51,9 @@ SOURCE_FILE@[0; 53) | |||
51 | NAME@[46; 47) | 51 | NAME@[46; 47) |
52 | IDENT@[46; 47) "T" | 52 | IDENT@[46; 47) "T" |
53 | R_ANGLE@[47; 48) ">" | 53 | R_ANGLE@[47; 48) ">" |
54 | POS_FIELD_DEF_LIST@[48; 51) | 54 | TUPLE_FIELD_DEF_LIST@[48; 51) |
55 | L_PAREN@[48; 49) "(" | 55 | L_PAREN@[48; 49) "(" |
56 | POS_FIELD_DEF@[49; 50) | 56 | TUPLE_FIELD_DEF@[49; 50) |
57 | PATH_TYPE@[49; 50) | 57 | PATH_TYPE@[49; 50) |
58 | PATH@[49; 50) | 58 | PATH@[49; 50) |
59 | PATH_SEGMENT@[49; 50) | 59 | PATH_SEGMENT@[49; 50) |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.rs b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs index 635b9ac21..635b9ac21 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.rs | |||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.txt b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.txt index 6dd3a9b93..cb6d9f76d 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0115_pos_field_attrs.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0115_tuple_field_attrs.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 60) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) " " | 7 | WHITESPACE@[8; 9) " " |
8 | POS_FIELD_DEF_LIST@[9; 58) | 8 | TUPLE_FIELD_DEF_LIST@[9; 58) |
9 | L_PAREN@[9; 10) "(" | 9 | L_PAREN@[9; 10) "(" |
10 | WHITESPACE@[10; 15) "\n " | 10 | WHITESPACE@[10; 15) "\n " |
11 | POS_FIELD_DEF@[15; 55) | 11 | TUPLE_FIELD_DEF@[15; 55) |
12 | ATTR@[15; 43) | 12 | ATTR@[15; 43) |
13 | POUND@[15; 16) "#" | 13 | POUND@[15; 16) "#" |
14 | TOKEN_TREE@[16; 43) | 14 | TOKEN_TREE@[16; 43) |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.rs b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs index a6c7760c7..a6c7760c7 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.rs +++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.rs | |||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.txt b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.txt index f9c5ec124..8fdf3756f 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0125_struct_literal_field_with_attr.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0125_record_literal_field_with_attr.txt | |||
@@ -11,16 +11,16 @@ SOURCE_FILE@[0; 46) | |||
11 | BLOCK@[10; 45) | 11 | BLOCK@[10; 45) |
12 | L_CURLY@[10; 11) "{" | 12 | L_CURLY@[10; 11) "{" |
13 | WHITESPACE@[11; 16) "\n " | 13 | WHITESPACE@[11; 16) "\n " |
14 | STRUCT_LIT@[16; 43) | 14 | RECORD_LIT@[16; 43) |
15 | PATH@[16; 17) | 15 | PATH@[16; 17) |
16 | PATH_SEGMENT@[16; 17) | 16 | PATH_SEGMENT@[16; 17) |
17 | NAME_REF@[16; 17) | 17 | NAME_REF@[16; 17) |
18 | IDENT@[16; 17) "S" | 18 | IDENT@[16; 17) "S" |
19 | WHITESPACE@[17; 18) " " | 19 | WHITESPACE@[17; 18) " " |
20 | NAMED_FIELD_LIST@[18; 43) | 20 | RECORD_FIELD_LIST@[18; 43) |
21 | L_CURLY@[18; 19) "{" | 21 | L_CURLY@[18; 19) "{" |
22 | WHITESPACE@[19; 20) " " | 22 | WHITESPACE@[19; 20) " " |
23 | NAMED_FIELD@[20; 41) | 23 | RECORD_FIELD@[20; 41) |
24 | ATTR@[20; 32) | 24 | ATTR@[20; 32) |
25 | POUND@[20; 21) "#" | 25 | POUND@[20; 21) "#" |
26 | TOKEN_TREE@[21; 32) | 26 | TOKEN_TREE@[21; 32) |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt index 50d3b5def..64cbf4632 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0134_nocontentexpr_after_item.txt | |||
@@ -53,7 +53,7 @@ SOURCE_FILE@[0; 111) | |||
53 | NAME@[103; 104) | 53 | NAME@[103; 104) |
54 | IDENT@[103; 104) "S" | 54 | IDENT@[103; 104) "S" |
55 | WHITESPACE@[104; 105) " " | 55 | WHITESPACE@[104; 105) " " |
56 | NAMED_FIELD_DEF_LIST@[105; 107) | 56 | RECORD_FIELD_DEF_LIST@[105; 107) |
57 | L_CURLY@[105; 106) "{" | 57 | L_CURLY@[105; 106) "{" |
58 | R_CURLY@[106; 107) "}" | 58 | R_CURLY@[106; 107) "}" |
59 | SEMI@[107; 108) ";" | 59 | SEMI@[107; 108) ";" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt index 08128f365..c4db9da40 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0138_expression_after_block.txt | |||
@@ -22,14 +22,14 @@ SOURCE_FILE@[0; 52) | |||
22 | WHITESPACE@[23; 24) " " | 22 | WHITESPACE@[23; 24) " " |
23 | EQ@[24; 25) "=" | 23 | EQ@[24; 25) "=" |
24 | WHITESPACE@[25; 26) " " | 24 | WHITESPACE@[25; 26) " " |
25 | STRUCT_LIT@[26; 33) | 25 | RECORD_LIT@[26; 33) |
26 | PATH@[26; 27) | 26 | PATH@[26; 27) |
27 | PATH_SEGMENT@[26; 27) | 27 | PATH_SEGMENT@[26; 27) |
28 | NAME_REF@[26; 27) | 28 | NAME_REF@[26; 27) |
29 | IDENT@[26; 27) "F" | 29 | IDENT@[26; 27) "F" |
30 | NAMED_FIELD_LIST@[27; 33) | 30 | RECORD_FIELD_LIST@[27; 33) |
31 | L_CURLY@[27; 28) "{" | 31 | L_CURLY@[27; 28) "{" |
32 | NAMED_FIELD@[28; 32) | 32 | RECORD_FIELD@[28; 32) |
33 | NAME_REF@[28; 29) | 33 | NAME_REF@[28; 29) |
34 | IDENT@[28; 29) "x" | 34 | IDENT@[28; 29) "x" |
35 | COLON@[29; 30) ":" | 35 | COLON@[29; 30) ":" |
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rs b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rs new file mode 100644 index 000000000..9d458aa1e --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rs | |||
@@ -0,0 +1,5 @@ | |||
1 | fn main() { | ||
2 | let box i = (); | ||
3 | let box Outer { box i, j: box Inner(box &x) } = (); | ||
4 | let box ref mut i = (); | ||
5 | } | ||
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.txt b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.txt new file mode 100644 index 000000000..f0db58143 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.txt | |||
@@ -0,0 +1,109 @@ | |||
1 | SOURCE_FILE@[0; 118) | ||
2 | FN_DEF@[0; 117) | ||
3 | FN_KW@[0; 2) "fn" | ||
4 | WHITESPACE@[2; 3) " " | ||
5 | NAME@[3; 7) | ||
6 | IDENT@[3; 7) "main" | ||
7 | PARAM_LIST@[7; 9) | ||
8 | L_PAREN@[7; 8) "(" | ||
9 | R_PAREN@[8; 9) ")" | ||
10 | WHITESPACE@[9; 10) " " | ||
11 | BLOCK@[10; 117) | ||
12 | L_CURLY@[10; 11) "{" | ||
13 | WHITESPACE@[11; 16) "\n " | ||
14 | LET_STMT@[16; 31) | ||
15 | LET_KW@[16; 19) "let" | ||
16 | WHITESPACE@[19; 20) " " | ||
17 | BOX_PAT@[20; 25) | ||
18 | BOX_KW@[20; 23) "box" | ||
19 | WHITESPACE@[23; 24) " " | ||
20 | BIND_PAT@[24; 25) | ||
21 | NAME@[24; 25) | ||
22 | IDENT@[24; 25) "i" | ||
23 | WHITESPACE@[25; 26) " " | ||
24 | EQ@[26; 27) "=" | ||
25 | WHITESPACE@[27; 28) " " | ||
26 | TUPLE_EXPR@[28; 30) | ||
27 | L_PAREN@[28; 29) "(" | ||
28 | R_PAREN@[29; 30) ")" | ||
29 | SEMI@[30; 31) ";" | ||
30 | WHITESPACE@[31; 36) "\n " | ||
31 | LET_STMT@[36; 87) | ||
32 | LET_KW@[36; 39) "let" | ||
33 | WHITESPACE@[39; 40) " " | ||
34 | BOX_PAT@[40; 81) | ||
35 | BOX_KW@[40; 43) "box" | ||
36 | WHITESPACE@[43; 44) " " | ||
37 | RECORD_PAT@[44; 81) | ||
38 | PATH@[44; 49) | ||
39 | PATH_SEGMENT@[44; 49) | ||
40 | NAME_REF@[44; 49) | ||
41 | IDENT@[44; 49) "Outer" | ||
42 | WHITESPACE@[49; 50) " " | ||
43 | RECORD_FIELD_PAT_LIST@[50; 81) | ||
44 | L_CURLY@[50; 51) "{" | ||
45 | WHITESPACE@[51; 52) " " | ||
46 | BOX_PAT@[52; 57) | ||
47 | BOX_KW@[52; 55) "box" | ||
48 | WHITESPACE@[55; 56) " " | ||
49 | BIND_PAT@[56; 57) | ||
50 | NAME@[56; 57) | ||
51 | IDENT@[56; 57) "i" | ||
52 | COMMA@[57; 58) "," | ||
53 | WHITESPACE@[58; 59) " " | ||
54 | RECORD_FIELD_PAT@[59; 79) | ||
55 | NAME@[59; 60) | ||
56 | IDENT@[59; 60) "j" | ||
57 | COLON@[60; 61) ":" | ||
58 | WHITESPACE@[61; 62) " " | ||
59 | BOX_PAT@[62; 79) | ||
60 | BOX_KW@[62; 65) "box" | ||
61 | WHITESPACE@[65; 66) " " | ||
62 | TUPLE_STRUCT_PAT@[66; 79) | ||
63 | PATH@[66; 71) | ||
64 | PATH_SEGMENT@[66; 71) | ||
65 | NAME_REF@[66; 71) | ||
66 | IDENT@[66; 71) "Inner" | ||
67 | L_PAREN@[71; 72) "(" | ||
68 | BOX_PAT@[72; 78) | ||
69 | BOX_KW@[72; 75) "box" | ||
70 | WHITESPACE@[75; 76) " " | ||
71 | REF_PAT@[76; 78) | ||
72 | AMP@[76; 77) "&" | ||
73 | BIND_PAT@[77; 78) | ||
74 | NAME@[77; 78) | ||
75 | IDENT@[77; 78) "x" | ||
76 | R_PAREN@[78; 79) ")" | ||
77 | WHITESPACE@[79; 80) " " | ||
78 | R_CURLY@[80; 81) "}" | ||
79 | WHITESPACE@[81; 82) " " | ||
80 | EQ@[82; 83) "=" | ||
81 | WHITESPACE@[83; 84) " " | ||
82 | TUPLE_EXPR@[84; 86) | ||
83 | L_PAREN@[84; 85) "(" | ||
84 | R_PAREN@[85; 86) ")" | ||
85 | SEMI@[86; 87) ";" | ||
86 | WHITESPACE@[87; 92) "\n " | ||
87 | LET_STMT@[92; 115) | ||
88 | LET_KW@[92; 95) "let" | ||
89 | WHITESPACE@[95; 96) " " | ||
90 | BOX_PAT@[96; 109) | ||
91 | BOX_KW@[96; 99) "box" | ||
92 | WHITESPACE@[99; 100) " " | ||
93 | BIND_PAT@[100; 109) | ||
94 | REF_KW@[100; 103) "ref" | ||
95 | WHITESPACE@[103; 104) " " | ||
96 | MUT_KW@[104; 107) "mut" | ||
97 | WHITESPACE@[107; 108) " " | ||
98 | NAME@[108; 109) | ||
99 | IDENT@[108; 109) "i" | ||
100 | WHITESPACE@[109; 110) " " | ||
101 | EQ@[110; 111) "=" | ||
102 | WHITESPACE@[111; 112) " " | ||
103 | TUPLE_EXPR@[112; 114) | ||
104 | L_PAREN@[112; 113) "(" | ||
105 | R_PAREN@[113; 114) ")" | ||
106 | SEMI@[114; 115) ";" | ||
107 | WHITESPACE@[115; 116) "\n" | ||
108 | R_CURLY@[116; 117) "}" | ||
109 | WHITESPACE@[117; 118) "\n" | ||
diff --git a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt index c6653cf25..fdc2d6768 100644 --- a/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt +++ b/crates/ra_syntax/test_data/parser/ok/0001_struct_item.txt | |||
@@ -20,10 +20,10 @@ SOURCE_FILE@[0; 32) | |||
20 | IDENT@[12; 16) "Copy" | 20 | IDENT@[12; 16) "Copy" |
21 | R_ANGLE@[16; 17) ">" | 21 | R_ANGLE@[16; 17) ">" |
22 | WHITESPACE@[17; 18) " " | 22 | WHITESPACE@[17; 18) " " |
23 | NAMED_FIELD_DEF_LIST@[18; 31) | 23 | RECORD_FIELD_DEF_LIST@[18; 31) |
24 | L_CURLY@[18; 19) "{" | 24 | L_CURLY@[18; 19) "{" |
25 | WHITESPACE@[19; 24) "\n " | 25 | WHITESPACE@[19; 24) "\n " |
26 | NAMED_FIELD_DEF@[24; 28) | 26 | RECORD_FIELD_DEF@[24; 28) |
27 | NAME@[24; 25) | 27 | NAME@[24; 25) |
28 | IDENT@[24; 25) "f" | 28 | IDENT@[24; 25) "f" |
29 | COLON@[25; 26) ":" | 29 | COLON@[25; 26) ":" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt index d0565ea83..ef34702fd 100644 --- a/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt +++ b/crates/ra_syntax/test_data/parser/ok/0002_struct_item_field.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 25) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) " " | 7 | WHITESPACE@[8; 9) " " |
8 | NAMED_FIELD_DEF_LIST@[9; 25) | 8 | RECORD_FIELD_DEF_LIST@[9; 25) |
9 | L_CURLY@[9; 10) "{" | 9 | L_CURLY@[9; 10) "{" |
10 | WHITESPACE@[10; 15) "\n " | 10 | WHITESPACE@[10; 15) "\n " |
11 | NAMED_FIELD_DEF@[15; 23) | 11 | RECORD_FIELD_DEF@[15; 23) |
12 | NAME@[15; 18) | 12 | NAME@[15; 18) |
13 | IDENT@[15; 18) "foo" | 13 | IDENT@[15; 18) "foo" |
14 | COLON@[18; 19) ":" | 14 | COLON@[18; 19) ":" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt index 9152d6eb6..5c16d0be6 100644 --- a/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt +++ b/crates/ra_syntax/test_data/parser/ok/0008_mod_item.txt | |||
@@ -46,7 +46,7 @@ SOURCE_FILE@[0; 118) | |||
46 | NAME@[59; 60) | 46 | NAME@[59; 60) |
47 | IDENT@[59; 60) "S" | 47 | IDENT@[59; 60) "S" |
48 | WHITESPACE@[60; 61) " " | 48 | WHITESPACE@[60; 61) " " |
49 | NAMED_FIELD_DEF_LIST@[61; 63) | 49 | RECORD_FIELD_DEF_LIST@[61; 63) |
50 | L_CURLY@[61; 62) "{" | 50 | L_CURLY@[61; 62) "{" |
51 | R_CURLY@[62; 63) "}" | 51 | R_CURLY@[62; 63) "}" |
52 | WHITESPACE@[63; 64) "\n" | 52 | WHITESPACE@[63; 64) "\n" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt index ac44093e8..3fbd14d7b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt +++ b/crates/ra_syntax/test_data/parser/ok/0016_struct_flavors.txt | |||
@@ -12,7 +12,7 @@ SOURCE_FILE@[0; 97) | |||
12 | NAME@[17; 18) | 12 | NAME@[17; 18) |
13 | IDENT@[17; 18) "B" | 13 | IDENT@[17; 18) "B" |
14 | WHITESPACE@[18; 19) " " | 14 | WHITESPACE@[18; 19) " " |
15 | NAMED_FIELD_DEF_LIST@[19; 21) | 15 | RECORD_FIELD_DEF_LIST@[19; 21) |
16 | L_CURLY@[19; 20) "{" | 16 | L_CURLY@[19; 20) "{" |
17 | R_CURLY@[20; 21) "}" | 17 | R_CURLY@[20; 21) "}" |
18 | WHITESPACE@[21; 22) "\n" | 18 | WHITESPACE@[21; 22) "\n" |
@@ -21,7 +21,7 @@ SOURCE_FILE@[0; 97) | |||
21 | WHITESPACE@[28; 29) " " | 21 | WHITESPACE@[28; 29) " " |
22 | NAME@[29; 30) | 22 | NAME@[29; 30) |
23 | IDENT@[29; 30) "C" | 23 | IDENT@[29; 30) "C" |
24 | POS_FIELD_DEF_LIST@[30; 32) | 24 | TUPLE_FIELD_DEF_LIST@[30; 32) |
25 | L_PAREN@[30; 31) "(" | 25 | L_PAREN@[30; 31) "(" |
26 | R_PAREN@[31; 32) ")" | 26 | R_PAREN@[31; 32) ")" |
27 | SEMI@[32; 33) ";" | 27 | SEMI@[32; 33) ";" |
@@ -32,10 +32,10 @@ SOURCE_FILE@[0; 97) | |||
32 | NAME@[42; 43) | 32 | NAME@[42; 43) |
33 | IDENT@[42; 43) "D" | 33 | IDENT@[42; 43) "D" |
34 | WHITESPACE@[43; 44) " " | 34 | WHITESPACE@[43; 44) " " |
35 | NAMED_FIELD_DEF_LIST@[44; 74) | 35 | RECORD_FIELD_DEF_LIST@[44; 74) |
36 | L_CURLY@[44; 45) "{" | 36 | L_CURLY@[44; 45) "{" |
37 | WHITESPACE@[45; 50) "\n " | 37 | WHITESPACE@[45; 50) "\n " |
38 | NAMED_FIELD_DEF@[50; 56) | 38 | RECORD_FIELD_DEF@[50; 56) |
39 | NAME@[50; 51) | 39 | NAME@[50; 51) |
40 | IDENT@[50; 51) "a" | 40 | IDENT@[50; 51) "a" |
41 | COLON@[51; 52) ":" | 41 | COLON@[51; 52) ":" |
@@ -47,7 +47,7 @@ SOURCE_FILE@[0; 97) | |||
47 | IDENT@[53; 56) "u32" | 47 | IDENT@[53; 56) "u32" |
48 | COMMA@[56; 57) "," | 48 | COMMA@[56; 57) "," |
49 | WHITESPACE@[57; 62) "\n " | 49 | WHITESPACE@[57; 62) "\n " |
50 | NAMED_FIELD_DEF@[62; 72) | 50 | RECORD_FIELD_DEF@[62; 72) |
51 | VISIBILITY@[62; 65) | 51 | VISIBILITY@[62; 65) |
52 | PUB_KW@[62; 65) "pub" | 52 | PUB_KW@[62; 65) "pub" |
53 | WHITESPACE@[65; 66) " " | 53 | WHITESPACE@[65; 66) " " |
@@ -68,9 +68,9 @@ SOURCE_FILE@[0; 97) | |||
68 | WHITESPACE@[82; 83) " " | 68 | WHITESPACE@[82; 83) " " |
69 | NAME@[83; 84) | 69 | NAME@[83; 84) |
70 | IDENT@[83; 84) "E" | 70 | IDENT@[83; 84) "E" |
71 | POS_FIELD_DEF_LIST@[84; 95) | 71 | TUPLE_FIELD_DEF_LIST@[84; 95) |
72 | L_PAREN@[84; 85) "(" | 72 | L_PAREN@[84; 85) "(" |
73 | POS_FIELD_DEF@[85; 90) | 73 | TUPLE_FIELD_DEF@[85; 90) |
74 | VISIBILITY@[85; 88) | 74 | VISIBILITY@[85; 88) |
75 | PUB_KW@[85; 88) "pub" | 75 | PUB_KW@[85; 88) "pub" |
76 | WHITESPACE@[88; 89) " " | 76 | WHITESPACE@[88; 89) " " |
@@ -81,7 +81,7 @@ SOURCE_FILE@[0; 97) | |||
81 | IDENT@[89; 90) "x" | 81 | IDENT@[89; 90) "x" |
82 | COMMA@[90; 91) "," | 82 | COMMA@[90; 91) "," |
83 | WHITESPACE@[91; 92) " " | 83 | WHITESPACE@[91; 92) " " |
84 | POS_FIELD_DEF@[92; 93) | 84 | TUPLE_FIELD_DEF@[92; 93) |
85 | PATH_TYPE@[92; 93) | 85 | PATH_TYPE@[92; 93) |
86 | PATH@[92; 93) | 86 | PATH@[92; 93) |
87 | PATH_SEGMENT@[92; 93) | 87 | PATH_SEGMENT@[92; 93) |
diff --git a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt index 3f06f20f9..1e4e58dd3 100644 --- a/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt +++ b/crates/ra_syntax/test_data/parser/ok/0018_struct_type_params.txt | |||
@@ -23,9 +23,9 @@ SOURCE_FILE@[0; 290) | |||
23 | NAME@[24; 25) | 23 | NAME@[24; 25) |
24 | IDENT@[24; 25) "T" | 24 | IDENT@[24; 25) "T" |
25 | R_ANGLE@[25; 26) ">" | 25 | R_ANGLE@[25; 26) ">" |
26 | POS_FIELD_DEF_LIST@[26; 31) | 26 | TUPLE_FIELD_DEF_LIST@[26; 31) |
27 | L_PAREN@[26; 27) "(" | 27 | L_PAREN@[26; 27) "(" |
28 | POS_FIELD_DEF@[27; 30) | 28 | TUPLE_FIELD_DEF@[27; 30) |
29 | PATH_TYPE@[27; 30) | 29 | PATH_TYPE@[27; 30) |
30 | PATH@[27; 30) | 30 | PATH@[27; 30) |
31 | PATH_SEGMENT@[27; 30) | 31 | PATH_SEGMENT@[27; 30) |
@@ -46,10 +46,10 @@ SOURCE_FILE@[0; 290) | |||
46 | IDENT@[43; 44) "T" | 46 | IDENT@[43; 44) "T" |
47 | R_ANGLE@[44; 45) ">" | 47 | R_ANGLE@[44; 45) ">" |
48 | WHITESPACE@[45; 46) " " | 48 | WHITESPACE@[45; 46) " " |
49 | NAMED_FIELD_DEF_LIST@[46; 56) | 49 | RECORD_FIELD_DEF_LIST@[46; 56) |
50 | L_CURLY@[46; 47) "{" | 50 | L_CURLY@[46; 47) "{" |
51 | WHITESPACE@[47; 48) " " | 51 | WHITESPACE@[47; 48) " " |
52 | NAMED_FIELD_DEF@[48; 54) | 52 | RECORD_FIELD_DEF@[48; 54) |
53 | NAME@[48; 49) | 53 | NAME@[48; 49) |
54 | IDENT@[48; 49) "u" | 54 | IDENT@[48; 49) "u" |
55 | COLON@[49; 50) ":" | 55 | COLON@[49; 50) ":" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0019_enums.txt b/crates/ra_syntax/test_data/parser/ok/0019_enums.txt index 37753a7d0..9d4a47a51 100644 --- a/crates/ra_syntax/test_data/parser/ok/0019_enums.txt +++ b/crates/ra_syntax/test_data/parser/ok/0019_enums.txt | |||
@@ -86,10 +86,10 @@ SOURCE_FILE@[0; 182) | |||
86 | NAME@[101; 102) | 86 | NAME@[101; 102) |
87 | IDENT@[101; 102) "C" | 87 | IDENT@[101; 102) "C" |
88 | WHITESPACE@[102; 103) " " | 88 | WHITESPACE@[102; 103) " " |
89 | NAMED_FIELD_DEF_LIST@[103; 146) | 89 | RECORD_FIELD_DEF_LIST@[103; 146) |
90 | L_CURLY@[103; 104) "{" | 90 | L_CURLY@[103; 104) "{" |
91 | WHITESPACE@[104; 113) "\n " | 91 | WHITESPACE@[104; 113) "\n " |
92 | NAMED_FIELD_DEF@[113; 119) | 92 | RECORD_FIELD_DEF@[113; 119) |
93 | NAME@[113; 114) | 93 | NAME@[113; 114) |
94 | IDENT@[113; 114) "a" | 94 | IDENT@[113; 114) "a" |
95 | COLON@[114; 115) ":" | 95 | COLON@[114; 115) ":" |
@@ -101,7 +101,7 @@ SOURCE_FILE@[0; 182) | |||
101 | IDENT@[116; 119) "u32" | 101 | IDENT@[116; 119) "u32" |
102 | COMMA@[119; 120) "," | 102 | COMMA@[119; 120) "," |
103 | WHITESPACE@[120; 129) "\n " | 103 | WHITESPACE@[120; 129) "\n " |
104 | NAMED_FIELD_DEF@[129; 139) | 104 | RECORD_FIELD_DEF@[129; 139) |
105 | VISIBILITY@[129; 132) | 105 | VISIBILITY@[129; 132) |
106 | PUB_KW@[129; 132) "pub" | 106 | PUB_KW@[129; 132) "pub" |
107 | WHITESPACE@[132; 133) " " | 107 | WHITESPACE@[132; 133) " " |
@@ -123,7 +123,7 @@ SOURCE_FILE@[0; 182) | |||
123 | NAME@[152; 153) | 123 | NAME@[152; 153) |
124 | IDENT@[152; 153) "F" | 124 | IDENT@[152; 153) "F" |
125 | WHITESPACE@[153; 154) " " | 125 | WHITESPACE@[153; 154) " " |
126 | NAMED_FIELD_DEF_LIST@[154; 156) | 126 | RECORD_FIELD_DEF_LIST@[154; 156) |
127 | L_CURLY@[154; 155) "{" | 127 | L_CURLY@[154; 155) "{" |
128 | R_CURLY@[155; 156) "}" | 128 | R_CURLY@[155; 156) "}" |
129 | COMMA@[156; 157) "," | 129 | COMMA@[156; 157) "," |
@@ -131,9 +131,9 @@ SOURCE_FILE@[0; 182) | |||
131 | ENUM_VARIANT@[162; 169) | 131 | ENUM_VARIANT@[162; 169) |
132 | NAME@[162; 163) | 132 | NAME@[162; 163) |
133 | IDENT@[162; 163) "D" | 133 | IDENT@[162; 163) "D" |
134 | POS_FIELD_DEF_LIST@[163; 169) | 134 | TUPLE_FIELD_DEF_LIST@[163; 169) |
135 | L_PAREN@[163; 164) "(" | 135 | L_PAREN@[163; 164) "(" |
136 | POS_FIELD_DEF@[164; 167) | 136 | TUPLE_FIELD_DEF@[164; 167) |
137 | PATH_TYPE@[164; 167) | 137 | PATH_TYPE@[164; 167) |
138 | PATH@[164; 167) | 138 | PATH@[164; 167) |
139 | PATH_SEGMENT@[164; 167) | 139 | PATH_SEGMENT@[164; 167) |
@@ -146,7 +146,7 @@ SOURCE_FILE@[0; 182) | |||
146 | ENUM_VARIANT@[175; 178) | 146 | ENUM_VARIANT@[175; 178) |
147 | NAME@[175; 176) | 147 | NAME@[175; 176) |
148 | IDENT@[175; 176) "E" | 148 | IDENT@[175; 176) "E" |
149 | POS_FIELD_DEF_LIST@[176; 178) | 149 | TUPLE_FIELD_DEF_LIST@[176; 178) |
150 | L_PAREN@[176; 177) "(" | 150 | L_PAREN@[176; 177) "(" |
151 | R_PAREN@[177; 178) ")" | 151 | R_PAREN@[177; 178) ")" |
152 | COMMA@[178; 179) "," | 152 | COMMA@[178; 179) "," |
diff --git a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt index c89b591e9..c13ebfe37 100644 --- a/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt +++ b/crates/ra_syntax/test_data/parser/ok/0035_weird_exprs.txt | |||
@@ -1564,10 +1564,10 @@ SOURCE_FILE@[0; 3813) | |||
1564 | LIFETIME@[2863; 2869) "\'union" | 1564 | LIFETIME@[2863; 2869) "\'union" |
1565 | R_ANGLE@[2869; 2870) ">" | 1565 | R_ANGLE@[2869; 2870) ">" |
1566 | WHITESPACE@[2870; 2871) " " | 1566 | WHITESPACE@[2870; 2871) " " |
1567 | NAMED_FIELD_DEF_LIST@[2871; 2904) | 1567 | RECORD_FIELD_DEF_LIST@[2871; 2904) |
1568 | L_CURLY@[2871; 2872) "{" | 1568 | L_CURLY@[2871; 2872) "{" |
1569 | WHITESPACE@[2872; 2873) " " | 1569 | WHITESPACE@[2872; 2873) " " |
1570 | NAMED_FIELD_DEF@[2873; 2901) | 1570 | RECORD_FIELD_DEF@[2873; 2901) |
1571 | NAME@[2873; 2878) | 1571 | NAME@[2873; 2878) |
1572 | IDENT@[2873; 2878) "union" | 1572 | IDENT@[2873; 2878) "union" |
1573 | COLON@[2878; 2879) ":" | 1573 | COLON@[2878; 2879) ":" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt index 3c717555d..05f2c656f 100644 --- a/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt +++ b/crates/ra_syntax/test_data/parser/ok/0040_raw_struct_item_field.txt | |||
@@ -5,10 +5,10 @@ SOURCE_FILE@[0; 27) | |||
5 | NAME@[7; 8) | 5 | NAME@[7; 8) |
6 | IDENT@[7; 8) "S" | 6 | IDENT@[7; 8) "S" |
7 | WHITESPACE@[8; 9) " " | 7 | WHITESPACE@[8; 9) " " |
8 | NAMED_FIELD_DEF_LIST@[9; 27) | 8 | RECORD_FIELD_DEF_LIST@[9; 27) |
9 | L_CURLY@[9; 10) "{" | 9 | L_CURLY@[9; 10) "{" |
10 | WHITESPACE@[10; 15) "\n " | 10 | WHITESPACE@[10; 15) "\n " |
11 | NAMED_FIELD_DEF@[15; 25) | 11 | RECORD_FIELD_DEF@[15; 25) |
12 | NAME@[15; 20) | 12 | NAME@[15; 20) |
13 | IDENT@[15; 20) "r#foo" | 13 | IDENT@[15; 20) "r#foo" |
14 | COLON@[20; 21) ":" | 14 | COLON@[20; 21) ":" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt index ef47521bf..1f2456afa 100644 --- a/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt +++ b/crates/ra_syntax/test_data/parser/ok/0043_complex_assignment.txt | |||
@@ -7,10 +7,10 @@ SOURCE_FILE@[0; 160) | |||
7 | NAME@[69; 73) | 7 | NAME@[69; 73) |
8 | IDENT@[69; 73) "Repr" | 8 | IDENT@[69; 73) "Repr" |
9 | WHITESPACE@[73; 74) " " | 9 | WHITESPACE@[73; 74) " " |
10 | NAMED_FIELD_DEF_LIST@[74; 90) | 10 | RECORD_FIELD_DEF_LIST@[74; 90) |
11 | L_CURLY@[74; 75) "{" | 11 | L_CURLY@[74; 75) "{" |
12 | WHITESPACE@[75; 76) " " | 12 | WHITESPACE@[75; 76) " " |
13 | NAMED_FIELD_DEF@[76; 88) | 13 | RECORD_FIELD_DEF@[76; 88) |
14 | NAME@[76; 79) | 14 | NAME@[76; 79) |
15 | IDENT@[76; 79) "raw" | 15 | IDENT@[76; 79) "raw" |
16 | COLON@[79; 80) ":" | 16 | COLON@[79; 80) ":" |
@@ -46,16 +46,16 @@ SOURCE_FILE@[0; 160) | |||
46 | BIN_EXPR@[107; 135) | 46 | BIN_EXPR@[107; 135) |
47 | INDEX_EXPR@[107; 131) | 47 | INDEX_EXPR@[107; 131) |
48 | FIELD_EXPR@[107; 128) | 48 | FIELD_EXPR@[107; 128) |
49 | STRUCT_LIT@[107; 124) | 49 | RECORD_LIT@[107; 124) |
50 | PATH@[107; 111) | 50 | PATH@[107; 111) |
51 | PATH_SEGMENT@[107; 111) | 51 | PATH_SEGMENT@[107; 111) |
52 | NAME_REF@[107; 111) | 52 | NAME_REF@[107; 111) |
53 | IDENT@[107; 111) "Repr" | 53 | IDENT@[107; 111) "Repr" |
54 | WHITESPACE@[111; 112) " " | 54 | WHITESPACE@[111; 112) " " |
55 | NAMED_FIELD_LIST@[112; 124) | 55 | RECORD_FIELD_LIST@[112; 124) |
56 | L_CURLY@[112; 113) "{" | 56 | L_CURLY@[112; 113) "{" |
57 | WHITESPACE@[113; 114) " " | 57 | WHITESPACE@[113; 114) " " |
58 | NAMED_FIELD@[114; 122) | 58 | RECORD_FIELD@[114; 122) |
59 | NAME_REF@[114; 117) | 59 | NAME_REF@[114; 117) |
60 | IDENT@[114; 117) "raw" | 60 | IDENT@[114; 117) "raw" |
61 | COLON@[117; 118) ":" | 61 | COLON@[117; 118) ":" |
@@ -83,14 +83,14 @@ SOURCE_FILE@[0; 160) | |||
83 | WHITESPACE@[136; 141) "\n " | 83 | WHITESPACE@[136; 141) "\n " |
84 | EXPR_STMT@[141; 157) | 84 | EXPR_STMT@[141; 157) |
85 | CALL_EXPR@[141; 156) | 85 | CALL_EXPR@[141; 156) |
86 | STRUCT_LIT@[141; 154) | 86 | RECORD_LIT@[141; 154) |
87 | PATH@[141; 145) | 87 | PATH@[141; 145) |
88 | PATH_SEGMENT@[141; 145) | 88 | PATH_SEGMENT@[141; 145) |
89 | NAME_REF@[141; 145) | 89 | NAME_REF@[141; 145) |
90 | IDENT@[141; 145) "Repr" | 90 | IDENT@[141; 145) "Repr" |
91 | NAMED_FIELD_LIST@[145; 154) | 91 | RECORD_FIELD_LIST@[145; 154) |
92 | L_CURLY@[145; 146) "{" | 92 | L_CURLY@[145; 146) "{" |
93 | NAMED_FIELD@[146; 153) | 93 | RECORD_FIELD@[146; 153) |
94 | NAME_REF@[146; 149) | 94 | NAME_REF@[146; 149) |
95 | IDENT@[146; 149) "raw" | 95 | IDENT@[146; 149) "raw" |
96 | COLON@[149; 150) ":" | 96 | COLON@[149; 150) ":" |
diff --git a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt index 917b50ddf..136e2aae1 100644 --- a/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt +++ b/crates/ra_syntax/test_data/parser/ok/0047_minus_in_inner_pattern.txt | |||
@@ -268,9 +268,9 @@ SOURCE_FILE@[0; 395) | |||
268 | ENUM_VARIANT@[356; 365) | 268 | ENUM_VARIANT@[356; 365) |
269 | NAME@[356; 357) | 269 | NAME@[356; 357) |
270 | IDENT@[356; 357) "B" | 270 | IDENT@[356; 357) "B" |
271 | POS_FIELD_DEF_LIST@[357; 365) | 271 | TUPLE_FIELD_DEF_LIST@[357; 365) |
272 | L_PAREN@[357; 358) "(" | 272 | L_PAREN@[357; 358) "(" |
273 | POS_FIELD_DEF@[358; 360) | 273 | TUPLE_FIELD_DEF@[358; 360) |
274 | PATH_TYPE@[358; 360) | 274 | PATH_TYPE@[358; 360) |
275 | PATH@[358; 360) | 275 | PATH@[358; 360) |
276 | PATH_SEGMENT@[358; 360) | 276 | PATH_SEGMENT@[358; 360) |
@@ -278,7 +278,7 @@ SOURCE_FILE@[0; 395) | |||
278 | IDENT@[358; 360) "i8" | 278 | IDENT@[358; 360) "i8" |
279 | COMMA@[360; 361) "," | 279 | COMMA@[360; 361) "," |
280 | WHITESPACE@[361; 362) " " | 280 | WHITESPACE@[361; 362) " " |
281 | POS_FIELD_DEF@[362; 364) | 281 | TUPLE_FIELD_DEF@[362; 364) |
282 | PATH_TYPE@[362; 364) | 282 | PATH_TYPE@[362; 364) |
283 | PATH@[362; 364) | 283 | PATH@[362; 364) |
284 | PATH_SEGMENT@[362; 364) | 284 | PATH_SEGMENT@[362; 364) |