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/0075_block.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/0075_block.txt')
-rw-r--r-- | crates/ra_syntax/test_data/parser/inline/ok/0075_block.txt | 94 |
1 files changed, 49 insertions, 45 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.txt b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.txt index 36983590f..28d1bad97 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0075_block.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0075_block.txt | |||
@@ -8,9 +8,10 @@ SOURCE_FILE@[0; 65) | |||
8 | L_PAREN@[4; 5) "(" | 8 | L_PAREN@[4; 5) "(" |
9 | R_PAREN@[5; 6) ")" | 9 | R_PAREN@[5; 6) ")" |
10 | WHITESPACE@[6; 7) " " | 10 | WHITESPACE@[6; 7) " " |
11 | BLOCK@[7; 9) | 11 | BLOCK_EXPR@[7; 9) |
12 | L_CURLY@[7; 8) "{" | 12 | BLOCK@[7; 9) |
13 | R_CURLY@[8; 9) "}" | 13 | L_CURLY@[7; 8) "{" |
14 | R_CURLY@[8; 9) "}" | ||
14 | WHITESPACE@[9; 10) "\n" | 15 | WHITESPACE@[9; 10) "\n" |
15 | FN_DEF@[10; 31) | 16 | FN_DEF@[10; 31) |
16 | FN_KW@[10; 12) "fn" | 17 | FN_KW@[10; 12) "fn" |
@@ -21,22 +22,23 @@ SOURCE_FILE@[0; 65) | |||
21 | L_PAREN@[14; 15) "(" | 22 | L_PAREN@[14; 15) "(" |
22 | R_PAREN@[15; 16) ")" | 23 | R_PAREN@[15; 16) ")" |
23 | WHITESPACE@[16; 17) " " | 24 | WHITESPACE@[16; 17) " " |
24 | BLOCK@[17; 31) | 25 | BLOCK_EXPR@[17; 31) |
25 | L_CURLY@[17; 18) "{" | 26 | BLOCK@[17; 31) |
26 | WHITESPACE@[18; 19) " " | 27 | L_CURLY@[17; 18) "{" |
27 | LET_STMT@[19; 29) | 28 | WHITESPACE@[18; 19) " " |
28 | LET_KW@[19; 22) "let" | 29 | LET_STMT@[19; 29) |
29 | WHITESPACE@[22; 23) " " | 30 | LET_KW@[19; 22) "let" |
30 | PLACEHOLDER_PAT@[23; 24) | 31 | WHITESPACE@[22; 23) " " |
31 | UNDERSCORE@[23; 24) "_" | 32 | PLACEHOLDER_PAT@[23; 24) |
32 | WHITESPACE@[24; 25) " " | 33 | UNDERSCORE@[23; 24) "_" |
33 | EQ@[25; 26) "=" | 34 | WHITESPACE@[24; 25) " " |
34 | WHITESPACE@[26; 27) " " | 35 | EQ@[25; 26) "=" |
35 | LITERAL@[27; 28) | 36 | WHITESPACE@[26; 27) " " |
36 | INT_NUMBER@[27; 28) "1" | 37 | LITERAL@[27; 28) |
37 | SEMI@[28; 29) ";" | 38 | INT_NUMBER@[27; 28) "1" |
38 | WHITESPACE@[29; 30) " " | 39 | SEMI@[28; 29) ";" |
39 | R_CURLY@[30; 31) "}" | 40 | WHITESPACE@[29; 30) " " |
41 | R_CURLY@[30; 31) "}" | ||
40 | WHITESPACE@[31; 32) "\n" | 42 | WHITESPACE@[31; 32) "\n" |
41 | FN_DEF@[32; 48) | 43 | FN_DEF@[32; 48) |
42 | FN_KW@[32; 34) "fn" | 44 | FN_KW@[32; 34) "fn" |
@@ -47,20 +49,21 @@ SOURCE_FILE@[0; 65) | |||
47 | L_PAREN@[36; 37) "(" | 49 | L_PAREN@[36; 37) "(" |
48 | R_PAREN@[37; 38) ")" | 50 | R_PAREN@[37; 38) ")" |
49 | WHITESPACE@[38; 39) " " | 51 | WHITESPACE@[38; 39) " " |
50 | BLOCK@[39; 48) | 52 | BLOCK_EXPR@[39; 48) |
51 | L_CURLY@[39; 40) "{" | 53 | BLOCK@[39; 48) |
52 | WHITESPACE@[40; 41) " " | 54 | L_CURLY@[39; 40) "{" |
53 | EXPR_STMT@[41; 43) | 55 | WHITESPACE@[40; 41) " " |
54 | LITERAL@[41; 42) | 56 | EXPR_STMT@[41; 43) |
55 | INT_NUMBER@[41; 42) "1" | 57 | LITERAL@[41; 42) |
56 | SEMI@[42; 43) ";" | 58 | INT_NUMBER@[41; 42) "1" |
57 | WHITESPACE@[43; 44) " " | 59 | SEMI@[42; 43) ";" |
58 | EXPR_STMT@[44; 46) | 60 | WHITESPACE@[43; 44) " " |
59 | LITERAL@[44; 45) | 61 | EXPR_STMT@[44; 46) |
60 | INT_NUMBER@[44; 45) "2" | 62 | LITERAL@[44; 45) |
61 | SEMI@[45; 46) ";" | 63 | INT_NUMBER@[44; 45) "2" |
62 | WHITESPACE@[46; 47) " " | 64 | SEMI@[45; 46) ";" |
63 | R_CURLY@[47; 48) "}" | 65 | WHITESPACE@[46; 47) " " |
66 | R_CURLY@[47; 48) "}" | ||
64 | WHITESPACE@[48; 49) "\n" | 67 | WHITESPACE@[48; 49) "\n" |
65 | FN_DEF@[49; 64) | 68 | FN_DEF@[49; 64) |
66 | FN_KW@[49; 51) "fn" | 69 | FN_KW@[49; 51) "fn" |
@@ -71,16 +74,17 @@ SOURCE_FILE@[0; 65) | |||
71 | L_PAREN@[53; 54) "(" | 74 | L_PAREN@[53; 54) "(" |
72 | R_PAREN@[54; 55) ")" | 75 | R_PAREN@[54; 55) ")" |
73 | WHITESPACE@[55; 56) " " | 76 | WHITESPACE@[55; 56) " " |
74 | BLOCK@[56; 64) | 77 | BLOCK_EXPR@[56; 64) |
75 | L_CURLY@[56; 57) "{" | 78 | BLOCK@[56; 64) |
76 | WHITESPACE@[57; 58) " " | 79 | L_CURLY@[56; 57) "{" |
77 | EXPR_STMT@[58; 60) | 80 | WHITESPACE@[57; 58) " " |
78 | LITERAL@[58; 59) | 81 | EXPR_STMT@[58; 60) |
79 | INT_NUMBER@[58; 59) "1" | 82 | LITERAL@[58; 59) |
80 | SEMI@[59; 60) ";" | 83 | INT_NUMBER@[58; 59) "1" |
81 | WHITESPACE@[60; 61) " " | 84 | SEMI@[59; 60) ";" |
82 | LITERAL@[61; 62) | 85 | WHITESPACE@[60; 61) " " |
83 | INT_NUMBER@[61; 62) "2" | 86 | LITERAL@[61; 62) |
84 | WHITESPACE@[62; 63) " " | 87 | INT_NUMBER@[61; 62) "2" |
85 | R_CURLY@[63; 64) "}" | 88 | WHITESPACE@[62; 63) " " |
89 | R_CURLY@[63; 64) "}" | ||
86 | WHITESPACE@[64; 65) "\n" | 90 | WHITESPACE@[64; 65) "\n" |