1 files changed, 132 insertions, 132 deletions
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
index df24ae189..5e1b4cc68 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -1,132 +1,132 @@
-SOURCE_FILE@[0; 137)
+SOURCE_FILE@0..137
-  FN_DEF@[0; 136)
+  FN_DEF@0..136
-    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; 136)
+    BLOCK_EXPR@9..136
-      BLOCK@[9; 136)
+      BLOCK@9..136
-        L_CURLY@[9; 10) "{"
+        L_CURLY@9..10 "{"
-        WHITESPACE@[10; 15) "\n    "
+        WHITESPACE@10..15 "\n    "
-        EXPR_STMT@[15; 26)
+        EXPR_STMT@15..26
-          IF_EXPR@[15; 25)
+          IF_EXPR@15..25
-            IF_KW@[15; 17) "if"
+            IF_KW@15..17 "if"
-            WHITESPACE@[17; 18) " "
+            WHITESPACE@17..18 " "
-            CONDITION@[18; 22)
+            CONDITION@18..22
-              LITERAL@[18; 22)
+              LITERAL@18..22
-                TRUE_KW@[18; 22) "true"
+                TRUE_KW@18..22 "true"
-            WHITESPACE@[22; 23) " "
+            WHITESPACE@22..23 " "
-            BLOCK_EXPR@[23; 25)
+            BLOCK_EXPR@23..25
-              BLOCK@[23; 25)
+              BLOCK@23..25
-                L_CURLY@[23; 24) "{"
+                L_CURLY@23..24 "{"
-                R_CURLY@[24; 25) "}"
+                R_CURLY@24..25 "}"
-          SEMICOLON@[25; 26) ";"
+          SEMICOLON@25..26 ";"
-        WHITESPACE@[26; 31) "\n    "
+        WHITESPACE@26..31 "\n    "
-        EXPR_STMT@[31; 50)
+        EXPR_STMT@31..50
-          IF_EXPR@[31; 49)
+          IF_EXPR@31..49
-            IF_KW@[31; 33) "if"
+            IF_KW@31..33 "if"
-            WHITESPACE@[33; 34) " "
+            WHITESPACE@33..34 " "
-            CONDITION@[34; 38)
+            CONDITION@34..38
-              LITERAL@[34; 38)
+              LITERAL@34..38
-                TRUE_KW@[34; 38) "true"
+                TRUE_KW@34..38 "true"
-            WHITESPACE@[38; 39) " "
+            WHITESPACE@38..39 " "
-            BLOCK_EXPR@[39; 41)
+            BLOCK_EXPR@39..41
-              BLOCK@[39; 41)
+              BLOCK@39..41
-                L_CURLY@[39; 40) "{"
+                L_CURLY@39..40 "{"
-                R_CURLY@[40; 41) "}"
+                R_CURLY@40..41 "}"
-            WHITESPACE@[41; 42) " "
+            WHITESPACE@41..42 " "
-            ELSE_KW@[42; 46) "else"
+            ELSE_KW@42..46 "else"
-            WHITESPACE@[46; 47) " "
+            WHITESPACE@46..47 " "
-            BLOCK_EXPR@[47; 49)
+            BLOCK_EXPR@47..49
-              BLOCK@[47; 49)
+              BLOCK@47..49
-                L_CURLY@[47; 48) "{"
+                L_CURLY@47..48 "{"
-                R_CURLY@[48; 49) "}"
+                R_CURLY@48..49 "}"
-          SEMICOLON@[49; 50) ";"
+          SEMICOLON@49..50 ";"
-        WHITESPACE@[50; 55) "\n    "
+        WHITESPACE@50..55 "\n    "
-        EXPR_STMT@[55; 91)
+        EXPR_STMT@55..91
-          IF_EXPR@[55; 90)
+          IF_EXPR@55..90
-            IF_KW@[55; 57) "if"
+            IF_KW@55..57 "if"
-            WHITESPACE@[57; 58) " "
+            WHITESPACE@57..58 " "
-            CONDITION@[58; 62)
+            CONDITION@58..62
-              LITERAL@[58; 62)
+              LITERAL@58..62
-                TRUE_KW@[58; 62) "true"
+                TRUE_KW@58..62 "true"
-            WHITESPACE@[62; 63) " "
+            WHITESPACE@62..63 " "
-            BLOCK_EXPR@[63; 65)
+            BLOCK_EXPR@63..65
-              BLOCK@[63; 65)
+              BLOCK@63..65
-                L_CURLY@[63; 64) "{"
+                L_CURLY@63..64 "{"
-                R_CURLY@[64; 65) "}"
+                R_CURLY@64..65 "}"
-            WHITESPACE@[65; 66) " "
+            WHITESPACE@65..66 " "
-            ELSE_KW@[66; 70) "else"
+            ELSE_KW@66..70 "else"
-            WHITESPACE@[70; 71) " "
+            WHITESPACE@70..71 " "
-            IF_EXPR@[71; 90)
+            IF_EXPR@71..90
-              IF_KW@[71; 73) "if"
+              IF_KW@71..73 "if"
-              WHITESPACE@[73; 74) " "
+              WHITESPACE@73..74 " "
-              CONDITION@[74; 79)
+              CONDITION@74..79
-                LITERAL@[74; 79)
+                LITERAL@74..79
-                  FALSE_KW@[74; 79) "false"
+                  FALSE_KW@74..79 "false"
-              WHITESPACE@[79; 80) " "
+              WHITESPACE@79..80 " "
-              BLOCK_EXPR@[80; 82)
+              BLOCK_EXPR@80..82
-                BLOCK@[80; 82)
+                BLOCK@80..82
-                  L_CURLY@[80; 81) "{"
+                  L_CURLY@80..81 "{"
-                  R_CURLY@[81; 82) "}"
+                  R_CURLY@81..82 "}"
-              WHITESPACE@[82; 83) " "
+              WHITESPACE@82..83 " "
-              ELSE_KW@[83; 87) "else"
+              ELSE_KW@83..87 "else"
-              WHITESPACE@[87; 88) " "
+              WHITESPACE@87..88 " "
-              BLOCK_EXPR@[88; 90)
+              BLOCK_EXPR@88..90
-                BLOCK@[88; 90)
+                BLOCK@88..90
-                  L_CURLY@[88; 89) "{"
+                  L_CURLY@88..89 "{"
-                  R_CURLY@[89; 90) "}"
+                  R_CURLY@89..90 "}"
-          SEMICOLON@[90; 91) ";"
+          SEMICOLON@90..91 ";"
-        WHITESPACE@[91; 96) "\n    "
+        WHITESPACE@91..96 "\n    "
-        EXPR_STMT@[96; 104)
+        EXPR_STMT@96..104
-          IF_EXPR@[96; 103)
+          IF_EXPR@96..103
-            IF_KW@[96; 98) "if"
+            IF_KW@96..98 "if"
-            WHITESPACE@[98; 99) " "
+            WHITESPACE@98..99 " "
-            CONDITION@[99; 100)
+            CONDITION@99..100
-              PATH_EXPR@[99; 100)
+              PATH_EXPR@99..100
-                PATH@[99; 100)
+                PATH@99..100
-                  PATH_SEGMENT@[99; 100)
+                  PATH_SEGMENT@99..100
-                    NAME_REF@[99; 100)
+                    NAME_REF@99..100
-                      IDENT@[99; 100) "S"
+                      IDENT@99..100 "S"
-            WHITESPACE@[100; 101) " "
+            WHITESPACE@100..101 " "
-            BLOCK_EXPR@[101; 103)
+            BLOCK_EXPR@101..103
-              BLOCK@[101; 103)
+              BLOCK@101..103
-                L_CURLY@[101; 102) "{"
+                L_CURLY@101..102 "{"
-                R_CURLY@[102; 103) "}"
+                R_CURLY@102..103 "}"
-          SEMICOLON@[103; 104) ";"
+          SEMICOLON@103..104 ";"
-        WHITESPACE@[104; 109) "\n    "
+        WHITESPACE@104..109 "\n    "
-        EXPR_STMT@[109; 134)
+        EXPR_STMT@109..134
-          IF_EXPR@[109; 133)
+          IF_EXPR@109..133
-            IF_KW@[109; 111) "if"
+            IF_KW@109..111 "if"
-            WHITESPACE@[111; 112) " "
+            WHITESPACE@111..112 " "
-            CONDITION@[112; 120)
+            CONDITION@112..120
-              BLOCK_EXPR@[112; 120)
+              BLOCK_EXPR@112..120
-                BLOCK@[112; 120)
+                BLOCK@112..120
-                  L_CURLY@[112; 113) "{"
+                  L_CURLY@112..113 "{"
-                  WHITESPACE@[113; 114) " "
+                  WHITESPACE@113..114 " "
-                  LITERAL@[114; 118)
+                  LITERAL@114..118
-                    TRUE_KW@[114; 118) "true"
+                    TRUE_KW@114..118 "true"
-                  WHITESPACE@[118; 119) " "
+                  WHITESPACE@118..119 " "
-                  R_CURLY@[119; 120) "}"
+                  R_CURLY@119..120 "}"
-            WHITESPACE@[120; 121) " "
+            WHITESPACE@120..121 " "
-            BLOCK_EXPR@[121; 124)
+            BLOCK_EXPR@121..124
-              BLOCK@[121; 124)
+              BLOCK@121..124
-                L_CURLY@[121; 122) "{"
+                L_CURLY@121..122 "{"
-                WHITESPACE@[122; 123) " "
+                WHITESPACE@122..123 " "
-                R_CURLY@[123; 124) "}"
+                R_CURLY@123..124 "}"
-            WHITESPACE@[124; 125) " "
+            WHITESPACE@124..125 " "
-            ELSE_KW@[125; 129) "else"
+            ELSE_KW@125..129 "else"
-            WHITESPACE@[129; 130) " "
+            WHITESPACE@129..130 " "
-            BLOCK_EXPR@[130; 133)
+            BLOCK_EXPR@130..133
-              BLOCK@[130; 133)
+              BLOCK@130..133
-                L_CURLY@[130; 131) "{"
+                L_CURLY@130..131 "{"
-                WHITESPACE@[131; 132) " "
+                WHITESPACE@131..132 " "
-                R_CURLY@[132; 133) "}"
+                R_CURLY@132..133 "}"
-          SEMICOLON@[133; 134) ";"
+          SEMICOLON@133..134 ";"
-        WHITESPACE@[134; 135) "\n"
+        WHITESPACE@134..135 "\n"
-        R_CURLY@[135; 136) "}"
+        R_CURLY@135..136 "}"
-  WHITESPACE@[136; 137) "\n"
+  WHITESPACE@136..137 "\n"

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast index df24ae189..5e1b4cc68 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0064_if_expr.rast
@@ -1,132 +1,132 @@
1	SOURCE_FILE@[0; 137)	1	SOURCE_FILE@0..137
2	FN_DEF@[0; 136)	2	FN_DEF@0..136
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; 136)	11	BLOCK_EXPR@9..136
12	BLOCK@[9; 136)	12	BLOCK@9..136
13	L_CURLY@[9; 10) "{"	13	L_CURLY@9..10 "{"
14	WHITESPACE@[10; 15) "\n "	14	WHITESPACE@10..15 "\n "
15	EXPR_STMT@[15; 26)	15	EXPR_STMT@15..26
16	IF_EXPR@[15; 25)	16	IF_EXPR@15..25
17	IF_KW@[15; 17) "if"	17	IF_KW@15..17 "if"
18	WHITESPACE@[17; 18) " "	18	WHITESPACE@17..18 " "
19	CONDITION@[18; 22)	19	CONDITION@18..22
20	LITERAL@[18; 22)	20	LITERAL@18..22
21	TRUE_KW@[18; 22) "true"	21	TRUE_KW@18..22 "true"
22	WHITESPACE@[22; 23) " "	22	WHITESPACE@22..23 " "
23	BLOCK_EXPR@[23; 25)	23	BLOCK_EXPR@23..25
24	BLOCK@[23; 25)	24	BLOCK@23..25
25	L_CURLY@[23; 24) "{"	25	L_CURLY@23..24 "{"
26	R_CURLY@[24; 25) "}"	26	R_CURLY@24..25 "}"
27	SEMICOLON@[25; 26) ";"	27	SEMICOLON@25..26 ";"
28	WHITESPACE@[26; 31) "\n "	28	WHITESPACE@26..31 "\n "
29	EXPR_STMT@[31; 50)	29	EXPR_STMT@31..50
30	IF_EXPR@[31; 49)	30	IF_EXPR@31..49
31	IF_KW@[31; 33) "if"	31	IF_KW@31..33 "if"
32	WHITESPACE@[33; 34) " "	32	WHITESPACE@33..34 " "
33	CONDITION@[34; 38)	33	CONDITION@34..38
34	LITERAL@[34; 38)	34	LITERAL@34..38
35	TRUE_KW@[34; 38) "true"	35	TRUE_KW@34..38 "true"
36	WHITESPACE@[38; 39) " "	36	WHITESPACE@38..39 " "
37	BLOCK_EXPR@[39; 41)	37	BLOCK_EXPR@39..41
38	BLOCK@[39; 41)	38	BLOCK@39..41
39	L_CURLY@[39; 40) "{"	39	L_CURLY@39..40 "{"
40	R_CURLY@[40; 41) "}"	40	R_CURLY@40..41 "}"
41	WHITESPACE@[41; 42) " "	41	WHITESPACE@41..42 " "
42	ELSE_KW@[42; 46) "else"	42	ELSE_KW@42..46 "else"
43	WHITESPACE@[46; 47) " "	43	WHITESPACE@46..47 " "
44	BLOCK_EXPR@[47; 49)	44	BLOCK_EXPR@47..49
45	BLOCK@[47; 49)	45	BLOCK@47..49
46	L_CURLY@[47; 48) "{"	46	L_CURLY@47..48 "{"
47	R_CURLY@[48; 49) "}"	47	R_CURLY@48..49 "}"
48	SEMICOLON@[49; 50) ";"	48	SEMICOLON@49..50 ";"
49	WHITESPACE@[50; 55) "\n "	49	WHITESPACE@50..55 "\n "
50	EXPR_STMT@[55; 91)	50	EXPR_STMT@55..91
51	IF_EXPR@[55; 90)	51	IF_EXPR@55..90
52	IF_KW@[55; 57) "if"	52	IF_KW@55..57 "if"
53	WHITESPACE@[57; 58) " "	53	WHITESPACE@57..58 " "
54	CONDITION@[58; 62)	54	CONDITION@58..62
55	LITERAL@[58; 62)	55	LITERAL@58..62
56	TRUE_KW@[58; 62) "true"	56	TRUE_KW@58..62 "true"
57	WHITESPACE@[62; 63) " "	57	WHITESPACE@62..63 " "
58	BLOCK_EXPR@[63; 65)	58	BLOCK_EXPR@63..65
59	BLOCK@[63; 65)	59	BLOCK@63..65
60	L_CURLY@[63; 64) "{"	60	L_CURLY@63..64 "{"
61	R_CURLY@[64; 65) "}"	61	R_CURLY@64..65 "}"
62	WHITESPACE@[65; 66) " "	62	WHITESPACE@65..66 " "
63	ELSE_KW@[66; 70) "else"	63	ELSE_KW@66..70 "else"
64	WHITESPACE@[70; 71) " "	64	WHITESPACE@70..71 " "
65	IF_EXPR@[71; 90)	65	IF_EXPR@71..90
66	IF_KW@[71; 73) "if"	66	IF_KW@71..73 "if"
67	WHITESPACE@[73; 74) " "	67	WHITESPACE@73..74 " "
68	CONDITION@[74; 79)	68	CONDITION@74..79
69	LITERAL@[74; 79)	69	LITERAL@74..79
70	FALSE_KW@[74; 79) "false"	70	FALSE_KW@74..79 "false"
71	WHITESPACE@[79; 80) " "	71	WHITESPACE@79..80 " "
72	BLOCK_EXPR@[80; 82)	72	BLOCK_EXPR@80..82
73	BLOCK@[80; 82)	73	BLOCK@80..82
74	L_CURLY@[80; 81) "{"	74	L_CURLY@80..81 "{"
75	R_CURLY@[81; 82) "}"	75	R_CURLY@81..82 "}"
76	WHITESPACE@[82; 83) " "	76	WHITESPACE@82..83 " "
77	ELSE_KW@[83; 87) "else"	77	ELSE_KW@83..87 "else"
78	WHITESPACE@[87; 88) " "	78	WHITESPACE@87..88 " "
79	BLOCK_EXPR@[88; 90)	79	BLOCK_EXPR@88..90
80	BLOCK@[88; 90)	80	BLOCK@88..90
81	L_CURLY@[88; 89) "{"	81	L_CURLY@88..89 "{"
82	R_CURLY@[89; 90) "}"	82	R_CURLY@89..90 "}"
83	SEMICOLON@[90; 91) ";"	83	SEMICOLON@90..91 ";"
84	WHITESPACE@[91; 96) "\n "	84	WHITESPACE@91..96 "\n "
85	EXPR_STMT@[96; 104)	85	EXPR_STMT@96..104
86	IF_EXPR@[96; 103)	86	IF_EXPR@96..103
87	IF_KW@[96; 98) "if"	87	IF_KW@96..98 "if"
88	WHITESPACE@[98; 99) " "	88	WHITESPACE@98..99 " "
89	CONDITION@[99; 100)	89	CONDITION@99..100
90	PATH_EXPR@[99; 100)	90	PATH_EXPR@99..100
91	PATH@[99; 100)	91	PATH@99..100
92	PATH_SEGMENT@[99; 100)	92	PATH_SEGMENT@99..100
93	NAME_REF@[99; 100)	93	NAME_REF@99..100
94	IDENT@[99; 100) "S"	94	IDENT@99..100 "S"
95	WHITESPACE@[100; 101) " "	95	WHITESPACE@100..101 " "
96	BLOCK_EXPR@[101; 103)	96	BLOCK_EXPR@101..103
97	BLOCK@[101; 103)	97	BLOCK@101..103
98	L_CURLY@[101; 102) "{"	98	L_CURLY@101..102 "{"
99	R_CURLY@[102; 103) "}"	99	R_CURLY@102..103 "}"
100	SEMICOLON@[103; 104) ";"	100	SEMICOLON@103..104 ";"
101	WHITESPACE@[104; 109) "\n "	101	WHITESPACE@104..109 "\n "
102	EXPR_STMT@[109; 134)	102	EXPR_STMT@109..134
103	IF_EXPR@[109; 133)	103	IF_EXPR@109..133
104	IF_KW@[109; 111) "if"	104	IF_KW@109..111 "if"
105	WHITESPACE@[111; 112) " "	105	WHITESPACE@111..112 " "
106	CONDITION@[112; 120)	106	CONDITION@112..120
107	BLOCK_EXPR@[112; 120)	107	BLOCK_EXPR@112..120
108	BLOCK@[112; 120)	108	BLOCK@112..120
109	L_CURLY@[112; 113) "{"	109	L_CURLY@112..113 "{"
110	WHITESPACE@[113; 114) " "	110	WHITESPACE@113..114 " "
111	LITERAL@[114; 118)	111	LITERAL@114..118
112	TRUE_KW@[114; 118) "true"	112	TRUE_KW@114..118 "true"
113	WHITESPACE@[118; 119) " "	113	WHITESPACE@118..119 " "
114	R_CURLY@[119; 120) "}"	114	R_CURLY@119..120 "}"
115	WHITESPACE@[120; 121) " "	115	WHITESPACE@120..121 " "
116	BLOCK_EXPR@[121; 124)	116	BLOCK_EXPR@121..124
117	BLOCK@[121; 124)	117	BLOCK@121..124
118	L_CURLY@[121; 122) "{"	118	L_CURLY@121..122 "{"
119	WHITESPACE@[122; 123) " "	119	WHITESPACE@122..123 " "
120	R_CURLY@[123; 124) "}"	120	R_CURLY@123..124 "}"
121	WHITESPACE@[124; 125) " "	121	WHITESPACE@124..125 " "
122	ELSE_KW@[125; 129) "else"	122	ELSE_KW@125..129 "else"
123	WHITESPACE@[129; 130) " "	123	WHITESPACE@129..130 " "
124	BLOCK_EXPR@[130; 133)	124	BLOCK_EXPR@130..133
125	BLOCK@[130; 133)	125	BLOCK@130..133
126	L_CURLY@[130; 131) "{"	126	L_CURLY@130..131 "{"
127	WHITESPACE@[131; 132) " "	127	WHITESPACE@131..132 " "
128	R_CURLY@[132; 133) "}"	128	R_CURLY@132..133 "}"
129	SEMICOLON@[133; 134) ";"	129	SEMICOLON@133..134 ";"
130	WHITESPACE@[134; 135) "\n"	130	WHITESPACE@134..135 "\n"
131	R_CURLY@[135; 136) "}"	131	R_CURLY@135..136 "}"
132	WHITESPACE@[136; 137) "\n"	132	WHITESPACE@136..137 "\n"