1 files changed, 136 insertions, 136 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
index c2cec89b4..b165789fd 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -1,136 +1,136 @@
-SOURCE_FILE@[0; 189)
+SOURCE_FILE@0..189
-  FN_DEF@[0; 188)
+  FN_DEF@0..188
-    FN_KW@[0; 2) "fn"
+    FN_KW@0..2 "fn"
-    WHITESPACE@[2; 3) " "
+    WHITESPACE@2..3 " "
-    NAME@[3; 6)
+    NAME@3..6
-      IDENT@[3; 6) "foo"
+      IDENT@3..6 "foo"
-    PARAM_LIST@[6; 8)
+    PARAM_LIST@6..8
-      L_PAREN@[6; 7) "("
+      L_PAREN@6..7 "("
-      R_PAREN@[7; 8) ")"
+      R_PAREN@7..8 ")"
-    WHITESPACE@[8; 9) " "
+    WHITESPACE@8..9 " "
-    BLOCK_EXPR@[9; 188)
+    BLOCK_EXPR@9..188
-      BLOCK@[9; 188)
+      BLOCK@9..188
-        L_CURLY@[9; 10) "{"
+        L_CURLY@9..10 "{"
-        WHITESPACE@[10; 15) "\n    "
+        WHITESPACE@10..15 "\n    "
-        LET_STMT@[15; 28)
+        LET_STMT@15..28
-          LET_KW@[15; 18) "let"
+          LET_KW@15..18 "let"
-          WHITESPACE@[18; 19) " "
+          WHITESPACE@18..19 " "
-          PLACEHOLDER_PAT@[19; 20)
+          PLACEHOLDER_PAT@19..20
-            UNDERSCORE@[19; 20) "_"
+            UNDERSCORE@19..20 "_"
-          WHITESPACE@[20; 21) " "
+          WHITESPACE@20..21 " "
-          EQ@[21; 22) "="
+          EQ@21..22 "="
-          WHITESPACE@[22; 23) " "
+          WHITESPACE@22..23 " "
-          LITERAL@[23; 27)
+          LITERAL@23..27
-            TRUE_KW@[23; 27) "true"
+            TRUE_KW@23..27 "true"
-          SEMICOLON@[27; 28) ";"
+          SEMICOLON@27..28 ";"
-        WHITESPACE@[28; 33) "\n    "
+        WHITESPACE@28..33 "\n    "
-        LET_STMT@[33; 47)
+        LET_STMT@33..47
-          LET_KW@[33; 36) "let"
+          LET_KW@33..36 "let"
-          WHITESPACE@[36; 37) " "
+          WHITESPACE@36..37 " "
-          PLACEHOLDER_PAT@[37; 38)
+          PLACEHOLDER_PAT@37..38
-            UNDERSCORE@[37; 38) "_"
+            UNDERSCORE@37..38 "_"
-          WHITESPACE@[38; 39) " "
+          WHITESPACE@38..39 " "
-          EQ@[39; 40) "="
+          EQ@39..40 "="
-          WHITESPACE@[40; 41) " "
+          WHITESPACE@40..41 " "
-          LITERAL@[41; 46)
+          LITERAL@41..46
-            FALSE_KW@[41; 46) "false"
+            FALSE_KW@41..46 "false"
-          SEMICOLON@[46; 47) ";"
+          SEMICOLON@46..47 ";"
-        WHITESPACE@[47; 52) "\n    "
+        WHITESPACE@47..52 "\n    "
-        LET_STMT@[52; 62)
+        LET_STMT@52..62
-          LET_KW@[52; 55) "let"
+          LET_KW@52..55 "let"
-          WHITESPACE@[55; 56) " "
+          WHITESPACE@55..56 " "
-          PLACEHOLDER_PAT@[56; 57)
+          PLACEHOLDER_PAT@56..57
-            UNDERSCORE@[56; 57) "_"
+            UNDERSCORE@56..57 "_"
-          WHITESPACE@[57; 58) " "
+          WHITESPACE@57..58 " "
-          EQ@[58; 59) "="
+          EQ@58..59 "="
-          WHITESPACE@[59; 60) " "
+          WHITESPACE@59..60 " "
-          LITERAL@[60; 61)
+          LITERAL@60..61
-            INT_NUMBER@[60; 61) "1"
+            INT_NUMBER@60..61 "1"
-          SEMICOLON@[61; 62) ";"
+          SEMICOLON@61..62 ";"
-        WHITESPACE@[62; 67) "\n    "
+        WHITESPACE@62..67 "\n    "
-        LET_STMT@[67; 79)
+        LET_STMT@67..79
-          LET_KW@[67; 70) "let"
+          LET_KW@67..70 "let"
-          WHITESPACE@[70; 71) " "
+          WHITESPACE@70..71 " "
-          PLACEHOLDER_PAT@[71; 72)
+          PLACEHOLDER_PAT@71..72
-            UNDERSCORE@[71; 72) "_"
+            UNDERSCORE@71..72 "_"
-          WHITESPACE@[72; 73) " "
+          WHITESPACE@72..73 " "
-          EQ@[73; 74) "="
+          EQ@73..74 "="
-          WHITESPACE@[74; 75) " "
+          WHITESPACE@74..75 " "
-          LITERAL@[75; 78)
+          LITERAL@75..78
-            FLOAT_NUMBER@[75; 78) "2.0"
+            FLOAT_NUMBER@75..78 "2.0"
-          SEMICOLON@[78; 79) ";"
+          SEMICOLON@78..79 ";"
-        WHITESPACE@[79; 84) "\n    "
+        WHITESPACE@79..84 "\n    "
-        LET_STMT@[84; 97)
+        LET_STMT@84..97
-          LET_KW@[84; 87) "let"
+          LET_KW@84..87 "let"
-          WHITESPACE@[87; 88) " "
+          WHITESPACE@87..88 " "
-          PLACEHOLDER_PAT@[88; 89)
+          PLACEHOLDER_PAT@88..89
-            UNDERSCORE@[88; 89) "_"
+            UNDERSCORE@88..89 "_"
-          WHITESPACE@[89; 90) " "
+          WHITESPACE@89..90 " "
-          EQ@[90; 91) "="
+          EQ@90..91 "="
-          WHITESPACE@[91; 92) " "
+          WHITESPACE@91..92 " "
-          LITERAL@[92; 96)
+          LITERAL@92..96
-            BYTE@[92; 96) "b\'a\'"
+            BYTE@92..96 "b\'a\'"
-          SEMICOLON@[96; 97) ";"
+          SEMICOLON@96..97 ";"
-        WHITESPACE@[97; 102) "\n    "
+        WHITESPACE@97..102 "\n    "
-        LET_STMT@[102; 114)
+        LET_STMT@102..114
-          LET_KW@[102; 105) "let"
+          LET_KW@102..105 "let"
-          WHITESPACE@[105; 106) " "
+          WHITESPACE@105..106 " "
-          PLACEHOLDER_PAT@[106; 107)
+          PLACEHOLDER_PAT@106..107
-            UNDERSCORE@[106; 107) "_"
+            UNDERSCORE@106..107 "_"
-          WHITESPACE@[107; 108) " "
+          WHITESPACE@107..108 " "
-          EQ@[108; 109) "="
+          EQ@108..109 "="
-          WHITESPACE@[109; 110) " "
+          WHITESPACE@109..110 " "
-          LITERAL@[110; 113)
+          LITERAL@110..113
-            CHAR@[110; 113) "\'b\'"
+            CHAR@110..113 "\'b\'"
-          SEMICOLON@[113; 114) ";"
+          SEMICOLON@113..114 ";"
-        WHITESPACE@[114; 119) "\n    "
+        WHITESPACE@114..119 "\n    "
-        LET_STMT@[119; 131)
+        LET_STMT@119..131
-          LET_KW@[119; 122) "let"
+          LET_KW@119..122 "let"
-          WHITESPACE@[122; 123) " "
+          WHITESPACE@122..123 " "
-          PLACEHOLDER_PAT@[123; 124)
+          PLACEHOLDER_PAT@123..124
-            UNDERSCORE@[123; 124) "_"
+            UNDERSCORE@123..124 "_"
-          WHITESPACE@[124; 125) " "
+          WHITESPACE@124..125 " "
-          EQ@[125; 126) "="
+          EQ@125..126 "="
-          WHITESPACE@[126; 127) " "
+          WHITESPACE@126..127 " "
-          LITERAL@[127; 130)
+          LITERAL@127..130
-            STRING@[127; 130) "\"c\""
+            STRING@127..130 "\"c\""
-          SEMICOLON@[130; 131) ";"
+          SEMICOLON@130..131 ";"
-        WHITESPACE@[131; 136) "\n    "
+        WHITESPACE@131..136 "\n    "
-        LET_STMT@[136; 149)
+        LET_STMT@136..149
-          LET_KW@[136; 139) "let"
+          LET_KW@136..139 "let"
-          WHITESPACE@[139; 140) " "
+          WHITESPACE@139..140 " "
-          PLACEHOLDER_PAT@[140; 141)
+          PLACEHOLDER_PAT@140..141
-            UNDERSCORE@[140; 141) "_"
+            UNDERSCORE@140..141 "_"
-          WHITESPACE@[141; 142) " "
+          WHITESPACE@141..142 " "
-          EQ@[142; 143) "="
+          EQ@142..143 "="
-          WHITESPACE@[143; 144) " "
+          WHITESPACE@143..144 " "
-          LITERAL@[144; 148)
+          LITERAL@144..148
-            RAW_STRING@[144; 148) "r\"d\""
+            RAW_STRING@144..148 "r\"d\""
-          SEMICOLON@[148; 149) ";"
+          SEMICOLON@148..149 ";"
-        WHITESPACE@[149; 154) "\n    "
+        WHITESPACE@149..154 "\n    "
-        LET_STMT@[154; 167)
+        LET_STMT@154..167
-          LET_KW@[154; 157) "let"
+          LET_KW@154..157 "let"
-          WHITESPACE@[157; 158) " "
+          WHITESPACE@157..158 " "
-          PLACEHOLDER_PAT@[158; 159)
+          PLACEHOLDER_PAT@158..159
-            UNDERSCORE@[158; 159) "_"
+            UNDERSCORE@158..159 "_"
-          WHITESPACE@[159; 160) " "
+          WHITESPACE@159..160 " "
-          EQ@[160; 161) "="
+          EQ@160..161 "="
-          WHITESPACE@[161; 162) " "
+          WHITESPACE@161..162 " "
-          LITERAL@[162; 166)
+          LITERAL@162..166
-            BYTE_STRING@[162; 166) "b\"e\""
+            BYTE_STRING@162..166 "b\"e\""
-          SEMICOLON@[166; 167) ";"
+          SEMICOLON@166..167 ";"
-        WHITESPACE@[167; 172) "\n    "
+        WHITESPACE@167..172 "\n    "
-        LET_STMT@[172; 186)
+        LET_STMT@172..186
-          LET_KW@[172; 175) "let"
+          LET_KW@172..175 "let"
-          WHITESPACE@[175; 176) " "
+          WHITESPACE@175..176 " "
-          PLACEHOLDER_PAT@[176; 177)
+          PLACEHOLDER_PAT@176..177
-            UNDERSCORE@[176; 177) "_"
+            UNDERSCORE@176..177 "_"
-          WHITESPACE@[177; 178) " "
+          WHITESPACE@177..178 " "
-          EQ@[178; 179) "="
+          EQ@178..179 "="
-          WHITESPACE@[179; 180) " "
+          WHITESPACE@179..180 " "
-          LITERAL@[180; 185)
+          LITERAL@180..185
-            RAW_BYTE_STRING@[180; 185) "br\"f\""
+            RAW_BYTE_STRING@180..185 "br\"f\""
-          SEMICOLON@[185; 186) ";"
+          SEMICOLON@185..186 ";"
-        WHITESPACE@[186; 187) "\n"
+        WHITESPACE@186..187 "\n"
-        R_CURLY@[187; 188) "}"
+        R_CURLY@187..188 "}"
-  WHITESPACE@[188; 189) "\n"
+  WHITESPACE@188..189 "\n"

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast index c2cec89b4..b165789fd 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0085_expr_literals.rast
@@ -1,136 +1,136 @@
1	SOURCE_FILE@[0; 189)	1	SOURCE_FILE@0..189
2	FN_DEF@[0; 188)	2	FN_DEF@0..188
3	FN_KW@[0; 2) "fn"	3	FN_KW@0..2 "fn"
4	WHITESPACE@[2; 3) " "	4	WHITESPACE@2..3 " "
5	NAME@[3; 6)	5	NAME@3..6
6	IDENT@[3; 6) "foo"	6	IDENT@3..6 "foo"
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	WHITESPACE@[8; 9) " "	10	WHITESPACE@8..9 " "
11	BLOCK_EXPR@[9; 188)	11	BLOCK_EXPR@9..188
12	BLOCK@[9; 188)	12	BLOCK@9..188
13	L_CURLY@[9; 10) "{"	13	L_CURLY@9..10 "{"
14	WHITESPACE@[10; 15) "\n "	14	WHITESPACE@10..15 "\n "
15	LET_STMT@[15; 28)	15	LET_STMT@15..28
16	LET_KW@[15; 18) "let"	16	LET_KW@15..18 "let"
17	WHITESPACE@[18; 19) " "	17	WHITESPACE@18..19 " "
18	PLACEHOLDER_PAT@[19; 20)	18	PLACEHOLDER_PAT@19..20
19	UNDERSCORE@[19; 20) "_"	19	UNDERSCORE@19..20 "_"
20	WHITESPACE@[20; 21) " "	20	WHITESPACE@20..21 " "
21	EQ@[21; 22) "="	21	EQ@21..22 "="
22	WHITESPACE@[22; 23) " "	22	WHITESPACE@22..23 " "
23	LITERAL@[23; 27)	23	LITERAL@23..27
24	TRUE_KW@[23; 27) "true"	24	TRUE_KW@23..27 "true"
25	SEMICOLON@[27; 28) ";"	25	SEMICOLON@27..28 ";"
26	WHITESPACE@[28; 33) "\n "	26	WHITESPACE@28..33 "\n "
27	LET_STMT@[33; 47)	27	LET_STMT@33..47
28	LET_KW@[33; 36) "let"	28	LET_KW@33..36 "let"
29	WHITESPACE@[36; 37) " "	29	WHITESPACE@36..37 " "
30	PLACEHOLDER_PAT@[37; 38)	30	PLACEHOLDER_PAT@37..38
31	UNDERSCORE@[37; 38) "_"	31	UNDERSCORE@37..38 "_"
32	WHITESPACE@[38; 39) " "	32	WHITESPACE@38..39 " "
33	EQ@[39; 40) "="	33	EQ@39..40 "="
34	WHITESPACE@[40; 41) " "	34	WHITESPACE@40..41 " "
35	LITERAL@[41; 46)	35	LITERAL@41..46
36	FALSE_KW@[41; 46) "false"	36	FALSE_KW@41..46 "false"
37	SEMICOLON@[46; 47) ";"	37	SEMICOLON@46..47 ";"
38	WHITESPACE@[47; 52) "\n "	38	WHITESPACE@47..52 "\n "
39	LET_STMT@[52; 62)	39	LET_STMT@52..62
40	LET_KW@[52; 55) "let"	40	LET_KW@52..55 "let"
41	WHITESPACE@[55; 56) " "	41	WHITESPACE@55..56 " "
42	PLACEHOLDER_PAT@[56; 57)	42	PLACEHOLDER_PAT@56..57
43	UNDERSCORE@[56; 57) "_"	43	UNDERSCORE@56..57 "_"
44	WHITESPACE@[57; 58) " "	44	WHITESPACE@57..58 " "
45	EQ@[58; 59) "="	45	EQ@58..59 "="
46	WHITESPACE@[59; 60) " "	46	WHITESPACE@59..60 " "
47	LITERAL@[60; 61)	47	LITERAL@60..61
48	INT_NUMBER@[60; 61) "1"	48	INT_NUMBER@60..61 "1"
49	SEMICOLON@[61; 62) ";"	49	SEMICOLON@61..62 ";"
50	WHITESPACE@[62; 67) "\n "	50	WHITESPACE@62..67 "\n "
51	LET_STMT@[67; 79)	51	LET_STMT@67..79
52	LET_KW@[67; 70) "let"	52	LET_KW@67..70 "let"
53	WHITESPACE@[70; 71) " "	53	WHITESPACE@70..71 " "
54	PLACEHOLDER_PAT@[71; 72)	54	PLACEHOLDER_PAT@71..72
55	UNDERSCORE@[71; 72) "_"	55	UNDERSCORE@71..72 "_"
56	WHITESPACE@[72; 73) " "	56	WHITESPACE@72..73 " "
57	EQ@[73; 74) "="	57	EQ@73..74 "="
58	WHITESPACE@[74; 75) " "	58	WHITESPACE@74..75 " "
59	LITERAL@[75; 78)	59	LITERAL@75..78
60	FLOAT_NUMBER@[75; 78) "2.0"	60	FLOAT_NUMBER@75..78 "2.0"
61	SEMICOLON@[78; 79) ";"	61	SEMICOLON@78..79 ";"
62	WHITESPACE@[79; 84) "\n "	62	WHITESPACE@79..84 "\n "
63	LET_STMT@[84; 97)	63	LET_STMT@84..97
64	LET_KW@[84; 87) "let"	64	LET_KW@84..87 "let"
65	WHITESPACE@[87; 88) " "	65	WHITESPACE@87..88 " "
66	PLACEHOLDER_PAT@[88; 89)	66	PLACEHOLDER_PAT@88..89
67	UNDERSCORE@[88; 89) "_"	67	UNDERSCORE@88..89 "_"
68	WHITESPACE@[89; 90) " "	68	WHITESPACE@89..90 " "
69	EQ@[90; 91) "="	69	EQ@90..91 "="
70	WHITESPACE@[91; 92) " "	70	WHITESPACE@91..92 " "
71	LITERAL@[92; 96)	71	LITERAL@92..96
72	BYTE@[92; 96) "b\'a\'"	72	BYTE@92..96 "b\'a\'"
73	SEMICOLON@[96; 97) ";"	73	SEMICOLON@96..97 ";"
74	WHITESPACE@[97; 102) "\n "	74	WHITESPACE@97..102 "\n "
75	LET_STMT@[102; 114)	75	LET_STMT@102..114
76	LET_KW@[102; 105) "let"	76	LET_KW@102..105 "let"
77	WHITESPACE@[105; 106) " "	77	WHITESPACE@105..106 " "
78	PLACEHOLDER_PAT@[106; 107)	78	PLACEHOLDER_PAT@106..107
79	UNDERSCORE@[106; 107) "_"	79	UNDERSCORE@106..107 "_"
80	WHITESPACE@[107; 108) " "	80	WHITESPACE@107..108 " "
81	EQ@[108; 109) "="	81	EQ@108..109 "="
82	WHITESPACE@[109; 110) " "	82	WHITESPACE@109..110 " "
83	LITERAL@[110; 113)	83	LITERAL@110..113
84	CHAR@[110; 113) "\'b\'"	84	CHAR@110..113 "\'b\'"
85	SEMICOLON@[113; 114) ";"	85	SEMICOLON@113..114 ";"
86	WHITESPACE@[114; 119) "\n "	86	WHITESPACE@114..119 "\n "
87	LET_STMT@[119; 131)	87	LET_STMT@119..131
88	LET_KW@[119; 122) "let"	88	LET_KW@119..122 "let"
89	WHITESPACE@[122; 123) " "	89	WHITESPACE@122..123 " "
90	PLACEHOLDER_PAT@[123; 124)	90	PLACEHOLDER_PAT@123..124
91	UNDERSCORE@[123; 124) "_"	91	UNDERSCORE@123..124 "_"
92	WHITESPACE@[124; 125) " "	92	WHITESPACE@124..125 " "
93	EQ@[125; 126) "="	93	EQ@125..126 "="
94	WHITESPACE@[126; 127) " "	94	WHITESPACE@126..127 " "
95	LITERAL@[127; 130)	95	LITERAL@127..130
96	STRING@[127; 130) "\"c\""	96	STRING@127..130 "\"c\""
97	SEMICOLON@[130; 131) ";"	97	SEMICOLON@130..131 ";"
98	WHITESPACE@[131; 136) "\n "	98	WHITESPACE@131..136 "\n "
99	LET_STMT@[136; 149)	99	LET_STMT@136..149
100	LET_KW@[136; 139) "let"	100	LET_KW@136..139 "let"
101	WHITESPACE@[139; 140) " "	101	WHITESPACE@139..140 " "
102	PLACEHOLDER_PAT@[140; 141)	102	PLACEHOLDER_PAT@140..141
103	UNDERSCORE@[140; 141) "_"	103	UNDERSCORE@140..141 "_"
104	WHITESPACE@[141; 142) " "	104	WHITESPACE@141..142 " "
105	EQ@[142; 143) "="	105	EQ@142..143 "="
106	WHITESPACE@[143; 144) " "	106	WHITESPACE@143..144 " "
107	LITERAL@[144; 148)	107	LITERAL@144..148
108	RAW_STRING@[144; 148) "r\"d\""	108	RAW_STRING@144..148 "r\"d\""
109	SEMICOLON@[148; 149) ";"	109	SEMICOLON@148..149 ";"
110	WHITESPACE@[149; 154) "\n "	110	WHITESPACE@149..154 "\n "
111	LET_STMT@[154; 167)	111	LET_STMT@154..167
112	LET_KW@[154; 157) "let"	112	LET_KW@154..157 "let"
113	WHITESPACE@[157; 158) " "	113	WHITESPACE@157..158 " "
114	PLACEHOLDER_PAT@[158; 159)	114	PLACEHOLDER_PAT@158..159
115	UNDERSCORE@[158; 159) "_"	115	UNDERSCORE@158..159 "_"
116	WHITESPACE@[159; 160) " "	116	WHITESPACE@159..160 " "
117	EQ@[160; 161) "="	117	EQ@160..161 "="
118	WHITESPACE@[161; 162) " "	118	WHITESPACE@161..162 " "
119	LITERAL@[162; 166)	119	LITERAL@162..166
120	BYTE_STRING@[162; 166) "b\"e\""	120	BYTE_STRING@162..166 "b\"e\""
121	SEMICOLON@[166; 167) ";"	121	SEMICOLON@166..167 ";"
122	WHITESPACE@[167; 172) "\n "	122	WHITESPACE@167..172 "\n "
123	LET_STMT@[172; 186)	123	LET_STMT@172..186
124	LET_KW@[172; 175) "let"	124	LET_KW@172..175 "let"
125	WHITESPACE@[175; 176) " "	125	WHITESPACE@175..176 " "
126	PLACEHOLDER_PAT@[176; 177)	126	PLACEHOLDER_PAT@176..177
127	UNDERSCORE@[176; 177) "_"	127	UNDERSCORE@176..177 "_"
128	WHITESPACE@[177; 178) " "	128	WHITESPACE@177..178 " "
129	EQ@[178; 179) "="	129	EQ@178..179 "="
130	WHITESPACE@[179; 180) " "	130	WHITESPACE@179..180 " "
131	LITERAL@[180; 185)	131	LITERAL@180..185
132	RAW_BYTE_STRING@[180; 185) "br\"f\""	132	RAW_BYTE_STRING@180..185 "br\"f\""
133	SEMICOLON@[185; 186) ";"	133	SEMICOLON@185..186 ";"
134	WHITESPACE@[186; 187) "\n"	134	WHITESPACE@186..187 "\n"
135	R_CURLY@[187; 188) "}"	135	R_CURLY@187..188 "}"
136	WHITESPACE@[188; 189) "\n"	136	WHITESPACE@188..189 "\n"