diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-02 20:20:24 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-02 20:20:24 +0100 |
commit | 7faec1c30046769d4ae490e15cf5405bcfbdeef8 (patch) | |
tree | 6d268b721027a5350928a6c5a0ec227b5fde8ebc /crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt | |
parent | a8397deab914240aca8f015fb3736689919c0a5b (diff) | |
parent | e94587e3153b52684fd3f6b82c8e7efc09ff5c8d (diff) |
Merge #1752
1752: Always wrap blocks into block expressions r=flodiebold a=matklad
This way, things like function bodies are expressions, and we don't have to single them out
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt')
-rw-r--r-- | crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt | 249 |
1 files changed, 125 insertions, 124 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt index 9c238e869..5fd0adfc2 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0121_match_arms_outer_attributes.txt | |||
@@ -8,128 +8,129 @@ SOURCE_FILE@[0; 259) | |||
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; 258) | 11 | BLOCK_EXPR@[9; 258) |
12 | L_CURLY@[9; 10) "{" | 12 | BLOCK@[9; 258) |
13 | WHITESPACE@[10; 15) "\n " | 13 | L_CURLY@[9; 10) "{" |
14 | MATCH_EXPR@[15; 256) | 14 | WHITESPACE@[10; 15) "\n " |
15 | MATCH_KW@[15; 20) "match" | 15 | MATCH_EXPR@[15; 256) |
16 | WHITESPACE@[20; 21) " " | 16 | MATCH_KW@[15; 20) "match" |
17 | TUPLE_EXPR@[21; 23) | 17 | WHITESPACE@[20; 21) " " |
18 | L_PAREN@[21; 22) "(" | 18 | TUPLE_EXPR@[21; 23) |
19 | R_PAREN@[22; 23) ")" | 19 | L_PAREN@[21; 22) "(" |
20 | WHITESPACE@[23; 24) " " | 20 | R_PAREN@[22; 23) ")" |
21 | MATCH_ARM_LIST@[24; 256) | 21 | WHITESPACE@[23; 24) " " |
22 | L_CURLY@[24; 25) "{" | 22 | MATCH_ARM_LIST@[24; 256) |
23 | WHITESPACE@[25; 34) "\n " | 23 | L_CURLY@[24; 25) "{" |
24 | MATCH_ARM@[34; 74) | 24 | WHITESPACE@[25; 34) "\n " |
25 | ATTR@[34; 58) | 25 | MATCH_ARM@[34; 74) |
26 | POUND@[34; 35) "#" | 26 | ATTR@[34; 58) |
27 | TOKEN_TREE@[35; 58) | 27 | POUND@[34; 35) "#" |
28 | L_BRACK@[35; 36) "[" | 28 | TOKEN_TREE@[35; 58) |
29 | IDENT@[36; 39) "cfg" | 29 | L_BRACK@[35; 36) "[" |
30 | TOKEN_TREE@[39; 57) | 30 | IDENT@[36; 39) "cfg" |
31 | L_PAREN@[39; 40) "(" | 31 | TOKEN_TREE@[39; 57) |
32 | IDENT@[40; 47) "feature" | 32 | L_PAREN@[39; 40) "(" |
33 | WHITESPACE@[47; 48) " " | 33 | IDENT@[40; 47) "feature" |
34 | EQ@[48; 49) "=" | 34 | WHITESPACE@[47; 48) " " |
35 | WHITESPACE@[49; 50) " " | 35 | EQ@[48; 49) "=" |
36 | STRING@[50; 56) "\"some\"" | 36 | WHITESPACE@[49; 50) " " |
37 | R_PAREN@[56; 57) ")" | 37 | STRING@[50; 56) "\"some\"" |
38 | R_BRACK@[57; 58) "]" | 38 | R_PAREN@[56; 57) ")" |
39 | WHITESPACE@[58; 67) "\n " | 39 | R_BRACK@[57; 58) "]" |
40 | PLACEHOLDER_PAT@[67; 68) | 40 | WHITESPACE@[58; 67) "\n " |
41 | UNDERSCORE@[67; 68) "_" | 41 | PLACEHOLDER_PAT@[67; 68) |
42 | WHITESPACE@[68; 69) " " | 42 | UNDERSCORE@[67; 68) "_" |
43 | FAT_ARROW@[69; 71) "=>" | 43 | WHITESPACE@[68; 69) " " |
44 | WHITESPACE@[71; 72) " " | 44 | FAT_ARROW@[69; 71) "=>" |
45 | TUPLE_EXPR@[72; 74) | 45 | WHITESPACE@[71; 72) " " |
46 | L_PAREN@[72; 73) "(" | 46 | TUPLE_EXPR@[72; 74) |
47 | R_PAREN@[73; 74) ")" | 47 | L_PAREN@[72; 73) "(" |
48 | COMMA@[74; 75) "," | 48 | R_PAREN@[73; 74) ")" |
49 | WHITESPACE@[75; 84) "\n " | 49 | COMMA@[74; 75) "," |
50 | MATCH_ARM@[84; 125) | 50 | WHITESPACE@[75; 84) "\n " |
51 | ATTR@[84; 109) | 51 | MATCH_ARM@[84; 125) |
52 | POUND@[84; 85) "#" | 52 | ATTR@[84; 109) |
53 | TOKEN_TREE@[85; 109) | 53 | POUND@[84; 85) "#" |
54 | L_BRACK@[85; 86) "[" | 54 | TOKEN_TREE@[85; 109) |
55 | IDENT@[86; 89) "cfg" | 55 | L_BRACK@[85; 86) "[" |
56 | TOKEN_TREE@[89; 108) | 56 | IDENT@[86; 89) "cfg" |
57 | L_PAREN@[89; 90) "(" | 57 | TOKEN_TREE@[89; 108) |
58 | IDENT@[90; 97) "feature" | 58 | L_PAREN@[89; 90) "(" |
59 | WHITESPACE@[97; 98) " " | 59 | IDENT@[90; 97) "feature" |
60 | EQ@[98; 99) "=" | 60 | WHITESPACE@[97; 98) " " |
61 | WHITESPACE@[99; 100) " " | 61 | EQ@[98; 99) "=" |
62 | STRING@[100; 107) "\"other\"" | 62 | WHITESPACE@[99; 100) " " |
63 | R_PAREN@[107; 108) ")" | 63 | STRING@[100; 107) "\"other\"" |
64 | R_BRACK@[108; 109) "]" | 64 | R_PAREN@[107; 108) ")" |
65 | WHITESPACE@[109; 118) "\n " | 65 | R_BRACK@[108; 109) "]" |
66 | PLACEHOLDER_PAT@[118; 119) | 66 | WHITESPACE@[109; 118) "\n " |
67 | UNDERSCORE@[118; 119) "_" | 67 | PLACEHOLDER_PAT@[118; 119) |
68 | WHITESPACE@[119; 120) " " | 68 | UNDERSCORE@[118; 119) "_" |
69 | FAT_ARROW@[120; 122) "=>" | 69 | WHITESPACE@[119; 120) " " |
70 | WHITESPACE@[122; 123) " " | 70 | FAT_ARROW@[120; 122) "=>" |
71 | TUPLE_EXPR@[123; 125) | 71 | WHITESPACE@[122; 123) " " |
72 | L_PAREN@[123; 124) "(" | 72 | TUPLE_EXPR@[123; 125) |
73 | R_PAREN@[124; 125) ")" | 73 | L_PAREN@[123; 124) "(" |
74 | COMMA@[125; 126) "," | 74 | R_PAREN@[124; 125) ")" |
75 | WHITESPACE@[126; 135) "\n " | 75 | COMMA@[125; 126) "," |
76 | MATCH_ARM@[135; 249) | 76 | WHITESPACE@[126; 135) "\n " |
77 | ATTR@[135; 159) | 77 | MATCH_ARM@[135; 249) |
78 | POUND@[135; 136) "#" | 78 | ATTR@[135; 159) |
79 | TOKEN_TREE@[136; 159) | 79 | POUND@[135; 136) "#" |
80 | L_BRACK@[136; 137) "[" | 80 | TOKEN_TREE@[136; 159) |
81 | IDENT@[137; 140) "cfg" | 81 | L_BRACK@[136; 137) "[" |
82 | TOKEN_TREE@[140; 158) | 82 | IDENT@[137; 140) "cfg" |
83 | L_PAREN@[140; 141) "(" | 83 | TOKEN_TREE@[140; 158) |
84 | IDENT@[141; 148) "feature" | 84 | L_PAREN@[140; 141) "(" |
85 | WHITESPACE@[148; 149) " " | 85 | IDENT@[141; 148) "feature" |
86 | EQ@[149; 150) "=" | 86 | WHITESPACE@[148; 149) " " |
87 | WHITESPACE@[150; 151) " " | 87 | EQ@[149; 150) "=" |
88 | STRING@[151; 157) "\"many\"" | 88 | WHITESPACE@[150; 151) " " |
89 | R_PAREN@[157; 158) ")" | 89 | STRING@[151; 157) "\"many\"" |
90 | R_BRACK@[158; 159) "]" | 90 | R_PAREN@[157; 158) ")" |
91 | WHITESPACE@[159; 168) "\n " | 91 | R_BRACK@[158; 159) "]" |
92 | ATTR@[168; 198) | 92 | WHITESPACE@[159; 168) "\n " |
93 | POUND@[168; 169) "#" | 93 | ATTR@[168; 198) |
94 | TOKEN_TREE@[169; 198) | 94 | POUND@[168; 169) "#" |
95 | L_BRACK@[169; 170) "[" | 95 | TOKEN_TREE@[169; 198) |
96 | IDENT@[170; 173) "cfg" | 96 | L_BRACK@[169; 170) "[" |
97 | TOKEN_TREE@[173; 197) | 97 | IDENT@[170; 173) "cfg" |
98 | L_PAREN@[173; 174) "(" | 98 | TOKEN_TREE@[173; 197) |
99 | IDENT@[174; 181) "feature" | 99 | L_PAREN@[173; 174) "(" |
100 | WHITESPACE@[181; 182) " " | 100 | IDENT@[174; 181) "feature" |
101 | EQ@[182; 183) "=" | 101 | WHITESPACE@[181; 182) " " |
102 | WHITESPACE@[183; 184) " " | 102 | EQ@[182; 183) "=" |
103 | STRING@[184; 196) "\"attributes\"" | 103 | WHITESPACE@[183; 184) " " |
104 | R_PAREN@[196; 197) ")" | 104 | STRING@[184; 196) "\"attributes\"" |
105 | R_BRACK@[197; 198) "]" | 105 | R_PAREN@[196; 197) ")" |
106 | WHITESPACE@[198; 207) "\n " | 106 | R_BRACK@[197; 198) "]" |
107 | ATTR@[207; 233) | 107 | WHITESPACE@[198; 207) "\n " |
108 | POUND@[207; 208) "#" | 108 | ATTR@[207; 233) |
109 | TOKEN_TREE@[208; 233) | 109 | POUND@[207; 208) "#" |
110 | L_BRACK@[208; 209) "[" | 110 | TOKEN_TREE@[208; 233) |
111 | IDENT@[209; 212) "cfg" | 111 | L_BRACK@[208; 209) "[" |
112 | TOKEN_TREE@[212; 232) | 112 | IDENT@[209; 212) "cfg" |
113 | L_PAREN@[212; 213) "(" | 113 | TOKEN_TREE@[212; 232) |
114 | IDENT@[213; 220) "feature" | 114 | L_PAREN@[212; 213) "(" |
115 | WHITESPACE@[220; 221) " " | 115 | IDENT@[213; 220) "feature" |
116 | EQ@[221; 222) "=" | 116 | WHITESPACE@[220; 221) " " |
117 | WHITESPACE@[222; 223) " " | 117 | EQ@[221; 222) "=" |
118 | STRING@[223; 231) "\"before\"" | 118 | WHITESPACE@[222; 223) " " |
119 | R_PAREN@[231; 232) ")" | 119 | STRING@[223; 231) "\"before\"" |
120 | R_BRACK@[232; 233) "]" | 120 | R_PAREN@[231; 232) ")" |
121 | WHITESPACE@[233; 242) "\n " | 121 | R_BRACK@[232; 233) "]" |
122 | PLACEHOLDER_PAT@[242; 243) | 122 | WHITESPACE@[233; 242) "\n " |
123 | UNDERSCORE@[242; 243) "_" | 123 | PLACEHOLDER_PAT@[242; 243) |
124 | WHITESPACE@[243; 244) " " | 124 | UNDERSCORE@[242; 243) "_" |
125 | FAT_ARROW@[244; 246) "=>" | 125 | WHITESPACE@[243; 244) " " |
126 | WHITESPACE@[246; 247) " " | 126 | FAT_ARROW@[244; 246) "=>" |
127 | TUPLE_EXPR@[247; 249) | 127 | WHITESPACE@[246; 247) " " |
128 | L_PAREN@[247; 248) "(" | 128 | TUPLE_EXPR@[247; 249) |
129 | R_PAREN@[248; 249) ")" | 129 | L_PAREN@[247; 248) "(" |
130 | COMMA@[249; 250) "," | 130 | R_PAREN@[248; 249) ")" |
131 | WHITESPACE@[250; 255) "\n " | 131 | COMMA@[249; 250) "," |
132 | R_CURLY@[255; 256) "}" | 132 | WHITESPACE@[250; 255) "\n " |
133 | WHITESPACE@[256; 257) "\n" | 133 | R_CURLY@[255; 256) "}" |
134 | R_CURLY@[257; 258) "}" | 134 | WHITESPACE@[256; 257) "\n" |
135 | R_CURLY@[257; 258) "}" | ||
135 | WHITESPACE@[258; 259) "\n" | 136 | WHITESPACE@[258; 259) "\n" |