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/err/0008_item_block_recovery.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/err/0008_item_block_recovery.txt')
-rw-r--r-- | crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt index 9a8871579..1a4b40a2b 100644 --- a/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt +++ b/crates/ra_syntax/test_data/parser/err/0008_item_block_recovery.txt | |||
@@ -8,10 +8,11 @@ SOURCE_FILE@[0; 95) | |||
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; 12) | 11 | BLOCK_EXPR@[9; 12) |
12 | L_CURLY@[9; 10) "{" | 12 | BLOCK@[9; 12) |
13 | WHITESPACE@[10; 11) "\n" | 13 | L_CURLY@[9; 10) "{" |
14 | R_CURLY@[11; 12) "}" | 14 | WHITESPACE@[10; 11) "\n" |
15 | R_CURLY@[11; 12) "}" | ||
15 | WHITESPACE@[12; 14) "\n\n" | 16 | WHITESPACE@[12; 14) "\n\n" |
16 | MACRO_CALL@[14; 19) | 17 | MACRO_CALL@[14; 19) |
17 | PATH@[14; 17) | 18 | PATH@[14; 17) |
@@ -32,29 +33,31 @@ SOURCE_FILE@[0; 95) | |||
32 | LITERAL@[29; 33) | 33 | LITERAL@[29; 33) |
33 | TRUE_KW@[29; 33) "true" | 34 | TRUE_KW@[29; 33) "true" |
34 | WHITESPACE@[33; 34) " " | 35 | WHITESPACE@[33; 34) " " |
35 | BLOCK@[34; 51) | 36 | BLOCK_EXPR@[34; 51) |
36 | L_CURLY@[34; 35) "{" | 37 | BLOCK@[34; 51) |
37 | WHITESPACE@[35; 44) "\n " | 38 | L_CURLY@[34; 35) "{" |
38 | LITERAL@[44; 45) | 39 | WHITESPACE@[35; 44) "\n " |
39 | INT_NUMBER@[44; 45) "1" | 40 | LITERAL@[44; 45) |
40 | WHITESPACE@[45; 50) "\n " | 41 | INT_NUMBER@[44; 45) "1" |
41 | R_CURLY@[50; 51) "}" | 42 | WHITESPACE@[45; 50) "\n " |
43 | R_CURLY@[50; 51) "}" | ||
42 | WHITESPACE@[51; 52) " " | 44 | WHITESPACE@[51; 52) " " |
43 | ELSE_KW@[52; 56) "else" | 45 | ELSE_KW@[52; 56) "else" |
44 | WHITESPACE@[56; 57) " " | 46 | WHITESPACE@[56; 57) " " |
45 | BLOCK@[57; 78) | 47 | BLOCK_EXPR@[57; 78) |
46 | L_CURLY@[57; 58) "{" | 48 | BLOCK@[57; 78) |
47 | WHITESPACE@[58; 67) "\n " | 49 | L_CURLY@[57; 58) "{" |
48 | BIN_EXPR@[67; 72) | 50 | WHITESPACE@[58; 67) "\n " |
49 | LITERAL@[67; 68) | 51 | BIN_EXPR@[67; 72) |
50 | INT_NUMBER@[67; 68) "2" | 52 | LITERAL@[67; 68) |
51 | WHITESPACE@[68; 69) " " | 53 | INT_NUMBER@[67; 68) "2" |
52 | PLUS@[69; 70) "+" | 54 | WHITESPACE@[68; 69) " " |
53 | WHITESPACE@[70; 71) " " | 55 | PLUS@[69; 70) "+" |
54 | LITERAL@[71; 72) | 56 | WHITESPACE@[70; 71) " " |
55 | INT_NUMBER@[71; 72) "3" | 57 | LITERAL@[71; 72) |
56 | WHITESPACE@[72; 77) "\n " | 58 | INT_NUMBER@[71; 72) "3" |
57 | R_CURLY@[77; 78) "}" | 59 | WHITESPACE@[72; 77) "\n " |
60 | R_CURLY@[77; 78) "}" | ||
58 | WHITESPACE@[78; 79) "\n" | 61 | WHITESPACE@[78; 79) "\n" |
59 | R_CURLY@[79; 80) "}" | 62 | R_CURLY@[79; 80) "}" |
60 | WHITESPACE@[80; 82) "\n\n" | 63 | WHITESPACE@[80; 82) "\n\n" |
@@ -67,10 +70,11 @@ SOURCE_FILE@[0; 95) | |||
67 | L_PAREN@[88; 89) "(" | 70 | L_PAREN@[88; 89) "(" |
68 | R_PAREN@[89; 90) ")" | 71 | R_PAREN@[89; 90) ")" |
69 | WHITESPACE@[90; 91) " " | 72 | WHITESPACE@[90; 91) " " |
70 | BLOCK@[91; 94) | 73 | BLOCK_EXPR@[91; 94) |
71 | L_CURLY@[91; 92) "{" | 74 | BLOCK@[91; 94) |
72 | WHITESPACE@[92; 93) "\n" | 75 | L_CURLY@[91; 92) "{" |
73 | R_CURLY@[93; 94) "}" | 76 | WHITESPACE@[92; 93) "\n" |
77 | R_CURLY@[93; 94) "}" | ||
74 | WHITESPACE@[94; 95) "\n" | 78 | WHITESPACE@[94; 95) "\n" |
75 | error 17: expected EXCL | 79 | error 17: expected EXCL |
76 | error 19: expected SEMI | 80 | error 19: expected SEMI |