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/ok/0045_block_inner_attrs.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/ok/0045_block_inner_attrs.txt')
-rw-r--r-- | crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.txt | 182 |
1 files changed, 92 insertions, 90 deletions
diff --git a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.txt b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.txt index f6d3bf302..e8be8203b 100644 --- a/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.txt +++ b/crates/ra_syntax/test_data/parser/ok/0045_block_inner_attrs.txt | |||
@@ -8,78 +8,79 @@ SOURCE_FILE@[0; 686) | |||
8 | L_PAREN@[8; 9) "(" | 8 | L_PAREN@[8; 9) "(" |
9 | R_PAREN@[9; 10) ")" | 9 | R_PAREN@[9; 10) ")" |
10 | WHITESPACE@[10; 11) " " | 10 | WHITESPACE@[10; 11) " " |
11 | BLOCK@[11; 461) | 11 | BLOCK_EXPR@[11; 461) |
12 | L_CURLY@[11; 12) "{" | 12 | BLOCK@[11; 461) |
13 | WHITESPACE@[12; 17) "\n " | 13 | L_CURLY@[11; 12) "{" |
14 | ATTR@[17; 57) | 14 | WHITESPACE@[12; 17) "\n " |
15 | POUND@[17; 18) "#" | 15 | ATTR@[17; 57) |
16 | EXCL@[18; 19) "!" | 16 | POUND@[17; 18) "#" |
17 | TOKEN_TREE@[19; 57) | 17 | EXCL@[18; 19) "!" |
18 | L_BRACK@[19; 20) "[" | 18 | TOKEN_TREE@[19; 57) |
19 | IDENT@[20; 23) "doc" | 19 | L_BRACK@[19; 20) "[" |
20 | TOKEN_TREE@[23; 56) | 20 | IDENT@[20; 23) "doc" |
21 | L_PAREN@[23; 24) "(" | 21 | TOKEN_TREE@[23; 56) |
22 | STRING@[24; 55) "\"Inner attributes all ..." | 22 | L_PAREN@[23; 24) "(" |
23 | R_PAREN@[55; 56) ")" | 23 | STRING@[24; 55) "\"Inner attributes all ..." |
24 | R_BRACK@[56; 57) "]" | 24 | R_PAREN@[55; 56) ")" |
25 | WHITESPACE@[57; 62) "\n " | 25 | R_BRACK@[56; 57) "]" |
26 | COMMENT@[62; 97) "//! As are ModuleDoc ..." | 26 | WHITESPACE@[57; 62) "\n " |
27 | WHITESPACE@[97; 102) "\n " | 27 | COMMENT@[62; 97) "//! As are ModuleDoc ..." |
28 | EXPR_STMT@[102; 295) | 28 | WHITESPACE@[97; 102) "\n " |
29 | BLOCK_EXPR@[102; 294) | 29 | EXPR_STMT@[102; 295) |
30 | BLOCK@[102; 294) | 30 | BLOCK_EXPR@[102; 294) |
31 | L_CURLY@[102; 103) "{" | 31 | BLOCK@[102; 294) |
32 | WHITESPACE@[103; 112) "\n " | 32 | L_CURLY@[102; 103) "{" |
33 | ATTR@[112; 180) | 33 | WHITESPACE@[103; 112) "\n " |
34 | POUND@[112; 113) "#" | 34 | ATTR@[112; 180) |
35 | EXCL@[113; 114) "!" | 35 | POUND@[112; 113) "#" |
36 | TOKEN_TREE@[114; 180) | 36 | EXCL@[113; 114) "!" |
37 | L_BRACK@[114; 115) "[" | 37 | TOKEN_TREE@[114; 180) |
38 | IDENT@[115; 118) "doc" | 38 | L_BRACK@[114; 115) "[" |
39 | TOKEN_TREE@[118; 179) | 39 | IDENT@[115; 118) "doc" |
40 | L_PAREN@[118; 119) "(" | 40 | TOKEN_TREE@[118; 179) |
41 | STRING@[119; 178) "\"Inner attributes are ..." | 41 | L_PAREN@[118; 119) "(" |
42 | R_PAREN@[178; 179) ")" | 42 | STRING@[119; 178) "\"Inner attributes are ..." |
43 | R_BRACK@[179; 180) "]" | 43 | R_PAREN@[178; 179) ")" |
44 | WHITESPACE@[180; 189) "\n " | 44 | R_BRACK@[179; 180) "]" |
45 | ATTR@[189; 244) | 45 | WHITESPACE@[180; 189) "\n " |
46 | POUND@[189; 190) "#" | 46 | ATTR@[189; 244) |
47 | EXCL@[190; 191) "!" | 47 | POUND@[189; 190) "#" |
48 | TOKEN_TREE@[191; 244) | 48 | EXCL@[190; 191) "!" |
49 | L_BRACK@[191; 192) "[" | 49 | TOKEN_TREE@[191; 244) |
50 | IDENT@[192; 195) "doc" | 50 | L_BRACK@[191; 192) "[" |
51 | TOKEN_TREE@[195; 243) | 51 | IDENT@[192; 195) "doc" |
52 | L_PAREN@[195; 196) "(" | 52 | TOKEN_TREE@[195; 243) |
53 | STRING@[196; 242) "\"Being validated is n ..." | 53 | L_PAREN@[195; 196) "(" |
54 | R_PAREN@[242; 243) ")" | 54 | STRING@[196; 242) "\"Being validated is n ..." |
55 | R_BRACK@[243; 244) "]" | 55 | R_PAREN@[242; 243) ")" |
56 | WHITESPACE@[244; 253) "\n " | 56 | R_BRACK@[243; 244) "]" |
57 | COMMENT@[253; 288) "//! As are ModuleDoc ..." | 57 | WHITESPACE@[244; 253) "\n " |
58 | WHITESPACE@[288; 293) "\n " | 58 | COMMENT@[253; 288) "//! As are ModuleDoc ..." |
59 | R_CURLY@[293; 294) "}" | 59 | WHITESPACE@[288; 293) "\n " |
60 | SEMI@[294; 295) ";" | 60 | R_CURLY@[293; 294) "}" |
61 | WHITESPACE@[295; 300) "\n " | 61 | SEMI@[294; 295) ";" |
62 | BLOCK_EXPR@[300; 459) | 62 | WHITESPACE@[295; 300) "\n " |
63 | BLOCK@[300; 459) | 63 | BLOCK_EXPR@[300; 459) |
64 | L_CURLY@[300; 301) "{" | 64 | BLOCK@[300; 459) |
65 | WHITESPACE@[301; 310) "\n " | 65 | L_CURLY@[300; 301) "{" |
66 | ATTR@[310; 409) | 66 | WHITESPACE@[301; 310) "\n " |
67 | POUND@[310; 311) "#" | 67 | ATTR@[310; 409) |
68 | EXCL@[311; 312) "!" | 68 | POUND@[310; 311) "#" |
69 | TOKEN_TREE@[312; 409) | 69 | EXCL@[311; 312) "!" |
70 | L_BRACK@[312; 313) "[" | 70 | TOKEN_TREE@[312; 409) |
71 | IDENT@[313; 316) "doc" | 71 | L_BRACK@[312; 313) "[" |
72 | TOKEN_TREE@[316; 408) | 72 | IDENT@[313; 316) "doc" |
73 | L_PAREN@[316; 317) "(" | 73 | TOKEN_TREE@[316; 408) |
74 | STRING@[317; 407) "\"Inner attributes are ..." | 74 | L_PAREN@[316; 317) "(" |
75 | R_PAREN@[407; 408) ")" | 75 | STRING@[317; 407) "\"Inner attributes are ..." |
76 | R_BRACK@[408; 409) "]" | 76 | R_PAREN@[407; 408) ")" |
77 | WHITESPACE@[409; 418) "\n " | 77 | R_BRACK@[408; 409) "]" |
78 | COMMENT@[418; 453) "//! As are ModuleDoc ..." | 78 | WHITESPACE@[409; 418) "\n " |
79 | WHITESPACE@[453; 458) "\n " | 79 | COMMENT@[418; 453) "//! As are ModuleDoc ..." |
80 | R_CURLY@[458; 459) "}" | 80 | WHITESPACE@[453; 458) "\n " |
81 | WHITESPACE@[459; 460) "\n" | 81 | R_CURLY@[458; 459) "}" |
82 | R_CURLY@[460; 461) "}" | 82 | WHITESPACE@[459; 460) "\n" |
83 | R_CURLY@[460; 461) "}" | ||
83 | WHITESPACE@[461; 463) "\n\n" | 84 | WHITESPACE@[461; 463) "\n\n" |
84 | COMMENT@[463; 523) "// https://github.com ..." | 85 | COMMENT@[463; 523) "// https://github.com ..." |
85 | WHITESPACE@[523; 524) "\n" | 86 | WHITESPACE@[523; 524) "\n" |
@@ -146,24 +147,25 @@ SOURCE_FILE@[0; 686) | |||
146 | R_ANGLE@[599; 600) ">" | 147 | R_ANGLE@[599; 600) ">" |
147 | R_PAREN@[600; 601) ")" | 148 | R_PAREN@[600; 601) ")" |
148 | WHITESPACE@[601; 602) " " | 149 | WHITESPACE@[601; 602) " " |
149 | BLOCK@[602; 683) | 150 | BLOCK_EXPR@[602; 683) |
150 | L_CURLY@[602; 603) "{" | 151 | BLOCK@[602; 683) |
151 | WHITESPACE@[603; 612) "\n " | 152 | L_CURLY@[602; 603) "{" |
152 | ATTR@[612; 639) | 153 | WHITESPACE@[603; 612) "\n " |
153 | POUND@[612; 613) "#" | 154 | ATTR@[612; 639) |
154 | EXCL@[613; 614) "!" | 155 | POUND@[612; 613) "#" |
155 | TOKEN_TREE@[614; 639) | 156 | EXCL@[613; 614) "!" |
156 | L_BRACK@[614; 615) "[" | 157 | TOKEN_TREE@[614; 639) |
157 | IDENT@[615; 620) "allow" | 158 | L_BRACK@[614; 615) "[" |
158 | TOKEN_TREE@[620; 638) | 159 | IDENT@[615; 620) "allow" |
159 | L_PAREN@[620; 621) "(" | 160 | TOKEN_TREE@[620; 638) |
160 | IDENT@[621; 637) "unused_variables" | 161 | L_PAREN@[620; 621) "(" |
161 | R_PAREN@[637; 638) ")" | 162 | IDENT@[621; 637) "unused_variables" |
162 | R_BRACK@[638; 639) "]" | 163 | R_PAREN@[637; 638) ")" |
163 | WHITESPACE@[639; 640) " " | 164 | R_BRACK@[638; 639) "]" |
164 | COMMENT@[640; 677) "// this is `inner_at ..." | 165 | WHITESPACE@[639; 640) " " |
165 | WHITESPACE@[677; 682) "\n " | 166 | COMMENT@[640; 677) "// this is `inner_at ..." |
166 | R_CURLY@[682; 683) "}" | 167 | WHITESPACE@[677; 682) "\n " |
168 | R_CURLY@[682; 683) "}" | ||
167 | WHITESPACE@[683; 684) "\n" | 169 | WHITESPACE@[683; 684) "\n" |
168 | R_CURLY@[684; 685) "}" | 170 | R_CURLY@[684; 685) "}" |
169 | WHITESPACE@[685; 686) "\n" | 171 | WHITESPACE@[685; 686) "\n" |