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/0066_match_arm.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/0066_match_arm.txt')
-rw-r--r-- | crates/ra_syntax/test_data/parser/inline/ok/0066_match_arm.txt | 277 |
1 files changed, 139 insertions, 138 deletions
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 c2f256ac3..87272917b 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 | |||
@@ -8,142 +8,143 @@ SOURCE_FILE@[0; 167) | |||
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; 166) | 11 | BLOCK_EXPR@[9; 166) |
12 | L_CURLY@[9; 10) "{" | 12 | BLOCK@[9; 166) |
13 | WHITESPACE@[10; 15) "\n " | 13 | L_CURLY@[9; 10) "{" |
14 | EXPR_STMT@[15; 164) | 14 | WHITESPACE@[10; 15) "\n " |
15 | MATCH_EXPR@[15; 163) | 15 | EXPR_STMT@[15; 164) |
16 | MATCH_KW@[15; 20) "match" | 16 | MATCH_EXPR@[15; 163) |
17 | WHITESPACE@[20; 21) " " | 17 | MATCH_KW@[15; 20) "match" |
18 | TUPLE_EXPR@[21; 23) | 18 | WHITESPACE@[20; 21) " " |
19 | L_PAREN@[21; 22) "(" | 19 | TUPLE_EXPR@[21; 23) |
20 | R_PAREN@[22; 23) ")" | 20 | L_PAREN@[21; 22) "(" |
21 | WHITESPACE@[23; 24) " " | 21 | R_PAREN@[22; 23) ")" |
22 | MATCH_ARM_LIST@[24; 163) | 22 | WHITESPACE@[23; 24) " " |
23 | L_CURLY@[24; 25) "{" | 23 | MATCH_ARM_LIST@[24; 163) |
24 | WHITESPACE@[25; 34) "\n " | 24 | L_CURLY@[24; 25) "{" |
25 | MATCH_ARM@[34; 41) | 25 | WHITESPACE@[25; 34) "\n " |
26 | PLACEHOLDER_PAT@[34; 35) | 26 | MATCH_ARM@[34; 41) |
27 | UNDERSCORE@[34; 35) "_" | 27 | PLACEHOLDER_PAT@[34; 35) |
28 | WHITESPACE@[35; 36) " " | 28 | UNDERSCORE@[34; 35) "_" |
29 | FAT_ARROW@[36; 38) "=>" | 29 | WHITESPACE@[35; 36) " " |
30 | WHITESPACE@[38; 39) " " | 30 | FAT_ARROW@[36; 38) "=>" |
31 | TUPLE_EXPR@[39; 41) | 31 | WHITESPACE@[38; 39) " " |
32 | L_PAREN@[39; 40) "(" | 32 | TUPLE_EXPR@[39; 41) |
33 | R_PAREN@[40; 41) ")" | 33 | L_PAREN@[39; 40) "(" |
34 | COMMA@[41; 42) "," | 34 | R_PAREN@[40; 41) ")" |
35 | WHITESPACE@[42; 51) "\n " | 35 | COMMA@[41; 42) "," |
36 | MATCH_ARM@[51; 83) | 36 | WHITESPACE@[42; 51) "\n " |
37 | PLACEHOLDER_PAT@[51; 52) | 37 | MATCH_ARM@[51; 83) |
38 | UNDERSCORE@[51; 52) "_" | 38 | PLACEHOLDER_PAT@[51; 52) |
39 | WHITESPACE@[52; 53) " " | 39 | UNDERSCORE@[51; 52) "_" |
40 | MATCH_GUARD@[53; 77) | 40 | WHITESPACE@[52; 53) " " |
41 | IF_KW@[53; 55) "if" | 41 | MATCH_GUARD@[53; 77) |
42 | WHITESPACE@[55; 56) " " | 42 | IF_KW@[53; 55) "if" |
43 | BIN_EXPR@[56; 77) | 43 | WHITESPACE@[55; 56) " " |
44 | PATH_EXPR@[56; 60) | 44 | BIN_EXPR@[56; 77) |
45 | PATH@[56; 60) | 45 | PATH_EXPR@[56; 60) |
46 | PATH_SEGMENT@[56; 60) | 46 | PATH@[56; 60) |
47 | NAME_REF@[56; 60) | 47 | PATH_SEGMENT@[56; 60) |
48 | IDENT@[56; 60) "Test" | 48 | NAME_REF@[56; 60) |
49 | WHITESPACE@[60; 61) " " | 49 | IDENT@[56; 60) "Test" |
50 | R_ANGLE@[61; 62) ">" | 50 | WHITESPACE@[60; 61) " " |
51 | WHITESPACE@[62; 63) " " | 51 | R_ANGLE@[61; 62) ">" |
52 | RECORD_LIT@[63; 77) | 52 | WHITESPACE@[62; 63) " " |
53 | PATH@[63; 67) | 53 | RECORD_LIT@[63; 77) |
54 | PATH_SEGMENT@[63; 67) | 54 | PATH@[63; 67) |
55 | NAME_REF@[63; 67) | 55 | PATH_SEGMENT@[63; 67) |
56 | IDENT@[63; 67) "Test" | 56 | NAME_REF@[63; 67) |
57 | RECORD_FIELD_LIST@[67; 77) | 57 | IDENT@[63; 67) "Test" |
58 | L_CURLY@[67; 68) "{" | 58 | RECORD_FIELD_LIST@[67; 77) |
59 | RECORD_FIELD@[68; 76) | 59 | L_CURLY@[67; 68) "{" |
60 | NAME_REF@[68; 73) | 60 | RECORD_FIELD@[68; 76) |
61 | IDENT@[68; 73) "field" | 61 | NAME_REF@[68; 73) |
62 | COLON@[73; 74) ":" | 62 | IDENT@[68; 73) "field" |
63 | WHITESPACE@[74; 75) " " | 63 | COLON@[73; 74) ":" |
64 | LITERAL@[75; 76) | 64 | WHITESPACE@[74; 75) " " |
65 | INT_NUMBER@[75; 76) "0" | 65 | LITERAL@[75; 76) |
66 | R_CURLY@[76; 77) "}" | 66 | INT_NUMBER@[75; 76) "0" |
67 | WHITESPACE@[77; 78) " " | 67 | R_CURLY@[76; 77) "}" |
68 | FAT_ARROW@[78; 80) "=>" | 68 | WHITESPACE@[77; 78) " " |
69 | WHITESPACE@[80; 81) " " | 69 | FAT_ARROW@[78; 80) "=>" |
70 | TUPLE_EXPR@[81; 83) | 70 | WHITESPACE@[80; 81) " " |
71 | L_PAREN@[81; 82) "(" | 71 | TUPLE_EXPR@[81; 83) |
72 | R_PAREN@[82; 83) ")" | 72 | L_PAREN@[81; 82) "(" |
73 | COMMA@[83; 84) "," | 73 | R_PAREN@[82; 83) ")" |
74 | WHITESPACE@[84; 93) "\n " | 74 | COMMA@[83; 84) "," |
75 | MATCH_ARM@[93; 109) | 75 | WHITESPACE@[84; 93) "\n " |
76 | BIND_PAT@[93; 94) | 76 | MATCH_ARM@[93; 109) |
77 | NAME@[93; 94) | 77 | BIND_PAT@[93; 94) |
78 | IDENT@[93; 94) "X" | 78 | NAME@[93; 94) |
79 | WHITESPACE@[94; 95) " " | 79 | IDENT@[93; 94) "X" |
80 | PIPE@[95; 96) "|" | 80 | WHITESPACE@[94; 95) " " |
81 | WHITESPACE@[96; 97) " " | 81 | PIPE@[95; 96) "|" |
82 | BIND_PAT@[97; 98) | 82 | WHITESPACE@[96; 97) " " |
83 | NAME@[97; 98) | 83 | BIND_PAT@[97; 98) |
84 | IDENT@[97; 98) "Y" | 84 | NAME@[97; 98) |
85 | WHITESPACE@[98; 99) " " | 85 | IDENT@[97; 98) "Y" |
86 | MATCH_GUARD@[99; 103) | 86 | WHITESPACE@[98; 99) " " |
87 | IF_KW@[99; 101) "if" | 87 | MATCH_GUARD@[99; 103) |
88 | WHITESPACE@[101; 102) " " | 88 | IF_KW@[99; 101) "if" |
89 | PATH_EXPR@[102; 103) | 89 | WHITESPACE@[101; 102) " " |
90 | PATH@[102; 103) | 90 | PATH_EXPR@[102; 103) |
91 | PATH_SEGMENT@[102; 103) | 91 | PATH@[102; 103) |
92 | NAME_REF@[102; 103) | 92 | PATH_SEGMENT@[102; 103) |
93 | IDENT@[102; 103) "Z" | 93 | NAME_REF@[102; 103) |
94 | WHITESPACE@[103; 104) " " | 94 | IDENT@[102; 103) "Z" |
95 | FAT_ARROW@[104; 106) "=>" | 95 | WHITESPACE@[103; 104) " " |
96 | WHITESPACE@[106; 107) " " | 96 | FAT_ARROW@[104; 106) "=>" |
97 | TUPLE_EXPR@[107; 109) | 97 | WHITESPACE@[106; 107) " " |
98 | L_PAREN@[107; 108) "(" | 98 | TUPLE_EXPR@[107; 109) |
99 | R_PAREN@[108; 109) ")" | 99 | L_PAREN@[107; 108) "(" |
100 | COMMA@[109; 110) "," | 100 | R_PAREN@[108; 109) ")" |
101 | WHITESPACE@[110; 119) "\n " | 101 | COMMA@[109; 110) "," |
102 | MATCH_ARM@[119; 137) | 102 | WHITESPACE@[110; 119) "\n " |
103 | PIPE@[119; 120) "|" | 103 | MATCH_ARM@[119; 137) |
104 | WHITESPACE@[120; 121) " " | 104 | PIPE@[119; 120) "|" |
105 | BIND_PAT@[121; 122) | 105 | WHITESPACE@[120; 121) " " |
106 | NAME@[121; 122) | 106 | BIND_PAT@[121; 122) |
107 | IDENT@[121; 122) "X" | 107 | NAME@[121; 122) |
108 | WHITESPACE@[122; 123) " " | 108 | IDENT@[121; 122) "X" |
109 | PIPE@[123; 124) "|" | 109 | WHITESPACE@[122; 123) " " |
110 | WHITESPACE@[124; 125) " " | 110 | PIPE@[123; 124) "|" |
111 | BIND_PAT@[125; 126) | 111 | WHITESPACE@[124; 125) " " |
112 | NAME@[125; 126) | 112 | BIND_PAT@[125; 126) |
113 | IDENT@[125; 126) "Y" | 113 | NAME@[125; 126) |
114 | WHITESPACE@[126; 127) " " | 114 | IDENT@[125; 126) "Y" |
115 | MATCH_GUARD@[127; 131) | 115 | WHITESPACE@[126; 127) " " |
116 | IF_KW@[127; 129) "if" | 116 | MATCH_GUARD@[127; 131) |
117 | WHITESPACE@[129; 130) " " | 117 | IF_KW@[127; 129) "if" |
118 | PATH_EXPR@[130; 131) | 118 | WHITESPACE@[129; 130) " " |
119 | PATH@[130; 131) | 119 | PATH_EXPR@[130; 131) |
120 | PATH_SEGMENT@[130; 131) | 120 | PATH@[130; 131) |
121 | NAME_REF@[130; 131) | 121 | PATH_SEGMENT@[130; 131) |
122 | IDENT@[130; 131) "Z" | 122 | NAME_REF@[130; 131) |
123 | WHITESPACE@[131; 132) " " | 123 | IDENT@[130; 131) "Z" |
124 | FAT_ARROW@[132; 134) "=>" | 124 | WHITESPACE@[131; 132) " " |
125 | WHITESPACE@[134; 135) " " | 125 | FAT_ARROW@[132; 134) "=>" |
126 | TUPLE_EXPR@[135; 137) | 126 | WHITESPACE@[134; 135) " " |
127 | L_PAREN@[135; 136) "(" | 127 | TUPLE_EXPR@[135; 137) |
128 | R_PAREN@[136; 137) ")" | 128 | L_PAREN@[135; 136) "(" |
129 | COMMA@[137; 138) "," | 129 | R_PAREN@[136; 137) ")" |
130 | WHITESPACE@[138; 147) "\n " | 130 | COMMA@[137; 138) "," |
131 | MATCH_ARM@[147; 156) | 131 | WHITESPACE@[138; 147) "\n " |
132 | PIPE@[147; 148) "|" | 132 | MATCH_ARM@[147; 156) |
133 | WHITESPACE@[148; 149) " " | 133 | PIPE@[147; 148) "|" |
134 | BIND_PAT@[149; 150) | 134 | WHITESPACE@[148; 149) " " |
135 | NAME@[149; 150) | 135 | BIND_PAT@[149; 150) |
136 | IDENT@[149; 150) "X" | 136 | NAME@[149; 150) |
137 | WHITESPACE@[150; 151) " " | 137 | IDENT@[149; 150) "X" |
138 | FAT_ARROW@[151; 153) "=>" | 138 | WHITESPACE@[150; 151) " " |
139 | WHITESPACE@[153; 154) " " | 139 | FAT_ARROW@[151; 153) "=>" |
140 | TUPLE_EXPR@[154; 156) | 140 | WHITESPACE@[153; 154) " " |
141 | L_PAREN@[154; 155) "(" | 141 | TUPLE_EXPR@[154; 156) |
142 | R_PAREN@[155; 156) ")" | 142 | L_PAREN@[154; 155) "(" |
143 | COMMA@[156; 157) "," | 143 | R_PAREN@[155; 156) ")" |
144 | WHITESPACE@[157; 162) "\n " | 144 | COMMA@[156; 157) "," |
145 | R_CURLY@[162; 163) "}" | 145 | WHITESPACE@[157; 162) "\n " |
146 | SEMI@[163; 164) ";" | 146 | R_CURLY@[162; 163) "}" |
147 | WHITESPACE@[164; 165) "\n" | 147 | SEMI@[163; 164) ";" |
148 | R_CURLY@[165; 166) "}" | 148 | WHITESPACE@[164; 165) "\n" |
149 | R_CURLY@[165; 166) "}" | ||
149 | WHITESPACE@[166; 167) "\n" | 150 | WHITESPACE@[166; 167) "\n" |