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/0126_attr_on_expr_stmt.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/0126_attr_on_expr_stmt.txt')
-rw-r--r-- | crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.txt | 155 |
1 files changed, 78 insertions, 77 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.txt b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.txt index c15c7573a..6bc0db077 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0126_attr_on_expr_stmt.txt | |||
@@ -8,81 +8,82 @@ SOURCE_FILE@[0; 82) | |||
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; 81) | 11 | BLOCK_EXPR@[9; 81) |
12 | L_CURLY@[9; 10) "{" | 12 | BLOCK@[9; 81) |
13 | WHITESPACE@[10; 15) "\n " | 13 | L_CURLY@[9; 10) "{" |
14 | EXPR_STMT@[15; 26) | 14 | WHITESPACE@[10; 15) "\n " |
15 | ATTR@[15; 19) | 15 | EXPR_STMT@[15; 26) |
16 | POUND@[15; 16) "#" | 16 | ATTR@[15; 19) |
17 | TOKEN_TREE@[16; 19) | 17 | POUND@[15; 16) "#" |
18 | L_BRACK@[16; 17) "[" | 18 | TOKEN_TREE@[16; 19) |
19 | IDENT@[17; 18) "A" | 19 | L_BRACK@[16; 17) "[" |
20 | R_BRACK@[18; 19) "]" | 20 | IDENT@[17; 18) "A" |
21 | WHITESPACE@[19; 20) " " | 21 | R_BRACK@[18; 19) "]" |
22 | CALL_EXPR@[20; 25) | 22 | WHITESPACE@[19; 20) " " |
23 | PATH_EXPR@[20; 23) | 23 | CALL_EXPR@[20; 25) |
24 | PATH@[20; 23) | 24 | PATH_EXPR@[20; 23) |
25 | PATH_SEGMENT@[20; 23) | 25 | PATH@[20; 23) |
26 | NAME_REF@[20; 23) | 26 | PATH_SEGMENT@[20; 23) |
27 | IDENT@[20; 23) "foo" | 27 | NAME_REF@[20; 23) |
28 | ARG_LIST@[23; 25) | 28 | IDENT@[20; 23) "foo" |
29 | L_PAREN@[23; 24) "(" | 29 | ARG_LIST@[23; 25) |
30 | R_PAREN@[24; 25) ")" | 30 | L_PAREN@[23; 24) "(" |
31 | SEMI@[25; 26) ";" | 31 | R_PAREN@[24; 25) ")" |
32 | WHITESPACE@[26; 31) "\n " | 32 | SEMI@[25; 26) ";" |
33 | EXPR_STMT@[31; 42) | 33 | WHITESPACE@[26; 31) "\n " |
34 | ATTR@[31; 35) | 34 | EXPR_STMT@[31; 42) |
35 | POUND@[31; 32) "#" | 35 | ATTR@[31; 35) |
36 | TOKEN_TREE@[32; 35) | 36 | POUND@[31; 32) "#" |
37 | L_BRACK@[32; 33) "[" | 37 | TOKEN_TREE@[32; 35) |
38 | IDENT@[33; 34) "B" | 38 | L_BRACK@[32; 33) "[" |
39 | R_BRACK@[34; 35) "]" | 39 | IDENT@[33; 34) "B" |
40 | WHITESPACE@[35; 36) " " | 40 | R_BRACK@[34; 35) "]" |
41 | MACRO_CALL@[36; 42) | 41 | WHITESPACE@[35; 36) " " |
42 | PATH@[36; 39) | 42 | MACRO_CALL@[36; 42) |
43 | PATH_SEGMENT@[36; 39) | 43 | PATH@[36; 39) |
44 | NAME_REF@[36; 39) | 44 | PATH_SEGMENT@[36; 39) |
45 | IDENT@[36; 39) "bar" | 45 | NAME_REF@[36; 39) |
46 | EXCL@[39; 40) "!" | 46 | IDENT@[36; 39) "bar" |
47 | TOKEN_TREE@[40; 42) | 47 | EXCL@[39; 40) "!" |
48 | L_CURLY@[40; 41) "{" | 48 | TOKEN_TREE@[40; 42) |
49 | R_CURLY@[41; 42) "}" | 49 | L_CURLY@[40; 41) "{" |
50 | WHITESPACE@[42; 47) "\n " | 50 | R_CURLY@[41; 42) "}" |
51 | EXPR_STMT@[47; 59) | 51 | WHITESPACE@[42; 47) "\n " |
52 | ATTR@[47; 51) | 52 | EXPR_STMT@[47; 59) |
53 | POUND@[47; 48) "#" | 53 | ATTR@[47; 51) |
54 | TOKEN_TREE@[48; 51) | 54 | POUND@[47; 48) "#" |
55 | L_BRACK@[48; 49) "[" | 55 | TOKEN_TREE@[48; 51) |
56 | IDENT@[49; 50) "C" | 56 | L_BRACK@[48; 49) "[" |
57 | R_BRACK@[50; 51) "]" | 57 | IDENT@[49; 50) "C" |
58 | WHITESPACE@[51; 52) " " | 58 | R_BRACK@[50; 51) "]" |
59 | ATTR@[52; 56) | 59 | WHITESPACE@[51; 52) " " |
60 | POUND@[52; 53) "#" | 60 | ATTR@[52; 56) |
61 | TOKEN_TREE@[53; 56) | 61 | POUND@[52; 53) "#" |
62 | L_BRACK@[53; 54) "[" | 62 | TOKEN_TREE@[53; 56) |
63 | IDENT@[54; 55) "D" | 63 | L_BRACK@[53; 54) "[" |
64 | R_BRACK@[55; 56) "]" | 64 | IDENT@[54; 55) "D" |
65 | WHITESPACE@[56; 57) " " | 65 | R_BRACK@[55; 56) "]" |
66 | BLOCK_EXPR@[57; 59) | 66 | WHITESPACE@[56; 57) " " |
67 | BLOCK@[57; 59) | 67 | BLOCK_EXPR@[57; 59) |
68 | L_CURLY@[57; 58) "{" | 68 | BLOCK@[57; 59) |
69 | R_CURLY@[58; 59) "}" | 69 | L_CURLY@[57; 58) "{" |
70 | WHITESPACE@[59; 64) "\n " | 70 | R_CURLY@[58; 59) "}" |
71 | EXPR_STMT@[64; 79) | 71 | WHITESPACE@[59; 64) "\n " |
72 | ATTR@[64; 68) | 72 | EXPR_STMT@[64; 79) |
73 | POUND@[64; 65) "#" | 73 | ATTR@[64; 68) |
74 | TOKEN_TREE@[65; 68) | 74 | POUND@[64; 65) "#" |
75 | L_BRACK@[65; 66) "[" | 75 | TOKEN_TREE@[65; 68) |
76 | IDENT@[66; 67) "D" | 76 | L_BRACK@[65; 66) "[" |
77 | R_BRACK@[67; 68) "]" | 77 | IDENT@[66; 67) "D" |
78 | WHITESPACE@[68; 69) " " | 78 | R_BRACK@[67; 68) "]" |
79 | RETURN_EXPR@[69; 78) | 79 | WHITESPACE@[68; 69) " " |
80 | RETURN_KW@[69; 75) "return" | 80 | RETURN_EXPR@[69; 78) |
81 | WHITESPACE@[75; 76) " " | 81 | RETURN_KW@[69; 75) "return" |
82 | TUPLE_EXPR@[76; 78) | 82 | WHITESPACE@[75; 76) " " |
83 | L_PAREN@[76; 77) "(" | 83 | TUPLE_EXPR@[76; 78) |
84 | R_PAREN@[77; 78) ")" | 84 | L_PAREN@[76; 77) "(" |
85 | SEMI@[78; 79) ";" | 85 | R_PAREN@[77; 78) ")" |
86 | WHITESPACE@[79; 80) "\n" | 86 | SEMI@[78; 79) ";" |
87 | R_CURLY@[80; 81) "}" | 87 | WHITESPACE@[79; 80) "\n" |
88 | R_CURLY@[80; 81) "}" | ||
88 | WHITESPACE@[81; 82) "\n" | 89 | WHITESPACE@[81; 82) "\n" |