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/0088_break_ambiguity.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/0088_break_ambiguity.txt')
-rw-r--r-- | crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.txt | 114 |
1 files changed, 59 insertions, 55 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.txt b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.txt index b93a10c5b..b23f43b46 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.txt +++ b/crates/ra_syntax/test_data/parser/inline/ok/0088_break_ambiguity.txt | |||
@@ -7,59 +7,63 @@ SOURCE_FILE@[0; 88) | |||
7 | PARAM_LIST@[6; 8) | 7 | PARAM_LIST@[6; 8) |
8 | L_PAREN@[6; 7) "(" | 8 | L_PAREN@[6; 7) "(" |
9 | R_PAREN@[7; 8) ")" | 9 | R_PAREN@[7; 8) ")" |
10 | BLOCK@[8; 87) | 10 | BLOCK_EXPR@[8; 87) |
11 | L_CURLY@[8; 9) "{" | 11 | BLOCK@[8; 87) |
12 | WHITESPACE@[9; 14) "\n " | 12 | L_CURLY@[8; 9) "{" |
13 | EXPR_STMT@[14; 25) | 13 | WHITESPACE@[9; 14) "\n " |
14 | IF_EXPR@[14; 25) | 14 | EXPR_STMT@[14; 25) |
15 | IF_KW@[14; 16) "if" | 15 | IF_EXPR@[14; 25) |
16 | WHITESPACE@[16; 17) " " | 16 | IF_KW@[14; 16) "if" |
17 | CONDITION@[17; 22) | 17 | WHITESPACE@[16; 17) " " |
18 | BREAK_EXPR@[17; 22) | 18 | CONDITION@[17; 22) |
19 | BREAK_KW@[17; 22) "break" | 19 | BREAK_EXPR@[17; 22) |
20 | WHITESPACE@[22; 23) " " | 20 | BREAK_KW@[17; 22) "break" |
21 | BLOCK@[23; 25) | 21 | WHITESPACE@[22; 23) " " |
22 | L_CURLY@[23; 24) "{" | 22 | BLOCK_EXPR@[23; 25) |
23 | R_CURLY@[24; 25) "}" | 23 | BLOCK@[23; 25) |
24 | WHITESPACE@[25; 30) "\n " | 24 | L_CURLY@[23; 24) "{" |
25 | EXPR_STMT@[30; 44) | 25 | R_CURLY@[24; 25) "}" |
26 | WHILE_EXPR@[30; 44) | 26 | WHITESPACE@[25; 30) "\n " |
27 | WHILE_KW@[30; 35) "while" | 27 | EXPR_STMT@[30; 44) |
28 | WHITESPACE@[35; 36) " " | 28 | WHILE_EXPR@[30; 44) |
29 | CONDITION@[36; 41) | 29 | WHILE_KW@[30; 35) "while" |
30 | BREAK_EXPR@[36; 41) | 30 | WHITESPACE@[35; 36) " " |
31 | BREAK_KW@[36; 41) "break" | 31 | CONDITION@[36; 41) |
32 | WHITESPACE@[41; 42) " " | 32 | BREAK_EXPR@[36; 41) |
33 | BLOCK@[42; 44) | 33 | BREAK_KW@[36; 41) "break" |
34 | L_CURLY@[42; 43) "{" | 34 | WHITESPACE@[41; 42) " " |
35 | R_CURLY@[43; 44) "}" | 35 | BLOCK_EXPR@[42; 44) |
36 | WHITESPACE@[44; 49) "\n " | 36 | BLOCK@[42; 44) |
37 | EXPR_STMT@[49; 66) | 37 | L_CURLY@[42; 43) "{" |
38 | FOR_EXPR@[49; 66) | 38 | R_CURLY@[43; 44) "}" |
39 | FOR_KW@[49; 52) "for" | 39 | WHITESPACE@[44; 49) "\n " |
40 | WHITESPACE@[52; 53) " " | 40 | EXPR_STMT@[49; 66) |
41 | BIND_PAT@[53; 54) | 41 | FOR_EXPR@[49; 66) |
42 | NAME@[53; 54) | 42 | FOR_KW@[49; 52) "for" |
43 | IDENT@[53; 54) "i" | 43 | WHITESPACE@[52; 53) " " |
44 | WHITESPACE@[54; 55) " " | 44 | BIND_PAT@[53; 54) |
45 | IN_KW@[55; 57) "in" | 45 | NAME@[53; 54) |
46 | WHITESPACE@[57; 58) " " | 46 | IDENT@[53; 54) "i" |
47 | BREAK_EXPR@[58; 63) | 47 | WHITESPACE@[54; 55) " " |
48 | BREAK_KW@[58; 63) "break" | 48 | IN_KW@[55; 57) "in" |
49 | WHITESPACE@[63; 64) " " | 49 | WHITESPACE@[57; 58) " " |
50 | BLOCK@[64; 66) | 50 | BREAK_EXPR@[58; 63) |
51 | L_CURLY@[64; 65) "{" | 51 | BREAK_KW@[58; 63) "break" |
52 | R_CURLY@[65; 66) "}" | 52 | WHITESPACE@[63; 64) " " |
53 | WHITESPACE@[66; 71) "\n " | 53 | BLOCK_EXPR@[64; 66) |
54 | MATCH_EXPR@[71; 85) | 54 | BLOCK@[64; 66) |
55 | MATCH_KW@[71; 76) "match" | 55 | L_CURLY@[64; 65) "{" |
56 | WHITESPACE@[76; 77) " " | 56 | R_CURLY@[65; 66) "}" |
57 | BREAK_EXPR@[77; 82) | 57 | WHITESPACE@[66; 71) "\n " |
58 | BREAK_KW@[77; 82) "break" | 58 | MATCH_EXPR@[71; 85) |
59 | WHITESPACE@[82; 83) " " | 59 | MATCH_KW@[71; 76) "match" |
60 | MATCH_ARM_LIST@[83; 85) | 60 | WHITESPACE@[76; 77) " " |
61 | L_CURLY@[83; 84) "{" | 61 | BREAK_EXPR@[77; 82) |
62 | R_CURLY@[84; 85) "}" | 62 | BREAK_KW@[77; 82) "break" |
63 | WHITESPACE@[85; 86) "\n" | 63 | WHITESPACE@[82; 83) " " |
64 | R_CURLY@[86; 87) "}" | 64 | MATCH_ARM_LIST@[83; 85) |
65 | L_CURLY@[83; 84) "{" | ||
66 | R_CURLY@[84; 85) "}" | ||
67 | WHITESPACE@[85; 86) "\n" | ||
68 | R_CURLY@[86; 87) "}" | ||
65 | WHITESPACE@[87; 88) "\n" | 69 | WHITESPACE@[87; 88) "\n" |