1 files changed, 132 insertions, 132 deletions
diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
index 9a8f76673..63194f974 100644
--- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
+++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -1,132 +1,132 @@
-SOURCE_FILE@[0; 183)
+SOURCE_FILE@0..183
-  IMPL_DEF@[0; 182)
+  IMPL_DEF@0..182
-    IMPL_KW@[0; 4) "impl"
+    IMPL_KW@0..4 "impl"
-    WHITESPACE@[4; 5) " "
+    WHITESPACE@4..5 " "
-    PATH_TYPE@[5; 13)
+    PATH_TYPE@5..13
-      PATH@[5; 13)
+      PATH@5..13
-        PATH_SEGMENT@[5; 13)
+        PATH_SEGMENT@5..13
-          NAME_REF@[5; 13)
+          NAME_REF@5..13
-            IDENT@[5; 13) "FnScopes"
+            IDENT@5..13 "FnScopes"
-    WHITESPACE@[13; 14) " "
+    WHITESPACE@13..14 " "
-    ITEM_LIST@[14; 182)
+    ITEM_LIST@14..182
-      L_CURLY@[14; 15) "{"
+      L_CURLY@14..15 "{"
-      WHITESPACE@[15; 20) "\n    "
+      WHITESPACE@15..20 "\n    "
-      FN_DEF@[20; 161)
+      FN_DEF@20..161
-        FN_KW@[20; 22) "fn"
+        FN_KW@20..22 "fn"
-        WHITESPACE@[22; 23) " "
+        WHITESPACE@22..23 " "
-        NAME@[23; 32)
+        NAME@23..32
-          IDENT@[23; 32) "new_scope"
+          IDENT@23..32 "new_scope"
-        PARAM_LIST@[32; 35)
+        PARAM_LIST@32..35
-          L_PAREN@[32; 33) "("
+          L_PAREN@32..33 "("
-          PARAM@[33; 34)
+          PARAM@33..34
-            REF_PAT@[33; 34)
+            REF_PAT@33..34
-              AMP@[33; 34) "&"
+              AMP@33..34 "&"
-          R_PAREN@[34; 35) ")"
+          R_PAREN@34..35 ")"
-        WHITESPACE@[35; 36) " "
+        WHITESPACE@35..36 " "
-        RET_TYPE@[36; 46)
+        RET_TYPE@36..46
-          THIN_ARROW@[36; 38) "->"
+          THIN_ARROW@36..38 "->"
-          WHITESPACE@[38; 39) " "
+          WHITESPACE@38..39 " "
-          PATH_TYPE@[39; 46)
+          PATH_TYPE@39..46
-            PATH@[39; 46)
+            PATH@39..46
-              PATH_SEGMENT@[39; 46)
+              PATH_SEGMENT@39..46
-                NAME_REF@[39; 46)
+                NAME_REF@39..46
-                  IDENT@[39; 46) "ScopeId"
+                  IDENT@39..46 "ScopeId"
-        WHITESPACE@[46; 47) " "
+        WHITESPACE@46..47 " "
-        BLOCK_EXPR@[47; 161)
+        BLOCK_EXPR@47..161
-          BLOCK@[47; 161)
+          BLOCK@47..161
-            L_CURLY@[47; 48) "{"
+            L_CURLY@47..48 "{"
-            WHITESPACE@[48; 57) "\n        "
+            WHITESPACE@48..57 "\n        "
-            LET_STMT@[57; 85)
+            LET_STMT@57..85
-              LET_KW@[57; 60) "let"
+              LET_KW@57..60 "let"
-              WHITESPACE@[60; 61) " "
+              WHITESPACE@60..61 " "
-              BIND_PAT@[61; 64)
+              BIND_PAT@61..64
-                NAME@[61; 64)
+                NAME@61..64
-                  IDENT@[61; 64) "res"
+                  IDENT@61..64 "res"
-              WHITESPACE@[64; 65) " "
+              WHITESPACE@64..65 " "
-              EQ@[65; 66) "="
+              EQ@65..66 "="
-              WHITESPACE@[66; 67) " "
+              WHITESPACE@66..67 " "
-              METHOD_CALL_EXPR@[67; 84)
+              METHOD_CALL_EXPR@67..84
-                FIELD_EXPR@[67; 78)
+                FIELD_EXPR@67..78
-                  PATH_EXPR@[67; 71)
+                  PATH_EXPR@67..71
-                    PATH@[67; 71)
+                    PATH@67..71
-                      PATH_SEGMENT@[67; 71)
+                      PATH_SEGMENT@67..71
-                        SELF_KW@[67; 71) "self"
+                        SELF_KW@67..71 "self"
-                  DOT@[71; 72) "."
+                  DOT@71..72 "."
-                  NAME_REF@[72; 78)
+                  NAME_REF@72..78
-                    IDENT@[72; 78) "scopes"
+                    IDENT@72..78 "scopes"
-                DOT@[78; 79) "."
+                DOT@78..79 "."
-                NAME_REF@[79; 82)
+                NAME_REF@79..82
-                  IDENT@[79; 82) "len"
+                  IDENT@79..82 "len"
-                ARG_LIST@[82; 84)
+                ARG_LIST@82..84
-                  L_PAREN@[82; 83) "("
+                  L_PAREN@82..83 "("
-                  R_PAREN@[83; 84) ")"
+                  R_PAREN@83..84 ")"
-              SEMICOLON@[84; 85) ";"
+              SEMICOLON@84..85 ";"
-            WHITESPACE@[85; 94) "\n        "
+            WHITESPACE@85..94 "\n        "
-            METHOD_CALL_EXPR@[94; 155)
+            METHOD_CALL_EXPR@94..155
-              FIELD_EXPR@[94; 105)
+              FIELD_EXPR@94..105
-                PATH_EXPR@[94; 98)
+                PATH_EXPR@94..98
-                  PATH@[94; 98)
+                  PATH@94..98
-                    PATH_SEGMENT@[94; 98)
+                    PATH_SEGMENT@94..98
-                      SELF_KW@[94; 98) "self"
+                      SELF_KW@94..98 "self"
-                DOT@[98; 99) "."
+                DOT@98..99 "."
-                NAME_REF@[99; 105)
+                NAME_REF@99..105
-                  IDENT@[99; 105) "scopes"
+                  IDENT@99..105 "scopes"
-              DOT@[105; 106) "."
+              DOT@105..106 "."
-              NAME_REF@[106; 110)
+              NAME_REF@106..110
-                IDENT@[106; 110) "push"
+                IDENT@106..110 "push"
-              ARG_LIST@[110; 155)
+              ARG_LIST@110..155
-                L_PAREN@[110; 111) "("
+                L_PAREN@110..111 "("
-                RECORD_LIT@[111; 154)
+                RECORD_LIT@111..154
-                  PATH@[111; 120)
+                  PATH@111..120
-                    PATH_SEGMENT@[111; 120)
+                    PATH_SEGMENT@111..120
-                      NAME_REF@[111; 120)
+                      NAME_REF@111..120
-                        IDENT@[111; 120) "ScopeData"
+                        IDENT@111..120 "ScopeData"
-                  WHITESPACE@[120; 121) " "
+                  WHITESPACE@120..121 " "
-                  RECORD_FIELD_LIST@[121; 154)
+                  RECORD_FIELD_LIST@121..154
-                    L_CURLY@[121; 122) "{"
+                    L_CURLY@121..122 "{"
-                    WHITESPACE@[122; 123) " "
+                    WHITESPACE@122..123 " "
-                    RECORD_FIELD@[123; 135)
+                    RECORD_FIELD@123..135
-                      NAME_REF@[123; 129)
+                      NAME_REF@123..129
-                        IDENT@[123; 129) "parent"
+                        IDENT@123..129 "parent"
-                      COLON@[129; 130) ":"
+                      COLON@129..130 ":"
-                      WHITESPACE@[130; 131) " "
+                      WHITESPACE@130..131 " "
-                      PATH_EXPR@[131; 135)
+                      PATH_EXPR@131..135
-                        PATH@[131; 135)
+                        PATH@131..135
-                          PATH_SEGMENT@[131; 135)
+                          PATH_SEGMENT@131..135
-                            NAME_REF@[131; 135)
+                            NAME_REF@131..135
-                              IDENT@[131; 135) "None"
+                              IDENT@131..135 "None"
-                    COMMA@[135; 136) ","
+                    COMMA@135..136 ","
-                    WHITESPACE@[136; 137) " "
+                    WHITESPACE@136..137 " "
-                    RECORD_FIELD@[137; 152)
+                    RECORD_FIELD@137..152
-                      NAME_REF@[137; 144)
+                      NAME_REF@137..144
-                        IDENT@[137; 144) "entries"
+                        IDENT@137..144 "entries"
-                      COLON@[144; 145) ":"
+                      COLON@144..145 ":"
-                      WHITESPACE@[145; 146) " "
+                      WHITESPACE@145..146 " "
-                      MACRO_CALL@[146; 152)
+                      MACRO_CALL@146..152
-                        PATH@[146; 149)
+                        PATH@146..149
-                          PATH_SEGMENT@[146; 149)
+                          PATH_SEGMENT@146..149
-                            NAME_REF@[146; 149)
+                            NAME_REF@146..149
-                              IDENT@[146; 149) "vec"
+                              IDENT@146..149 "vec"
-                        BANG@[149; 150) "!"
+                        BANG@149..150 "!"
-                        TOKEN_TREE@[150; 152)
+                        TOKEN_TREE@150..152
-                          L_BRACK@[150; 151) "["
+                          L_BRACK@150..151 "["
-                          R_BRACK@[151; 152) "]"
+                          R_BRACK@151..152 "]"
-                    WHITESPACE@[152; 153) " "
+                    WHITESPACE@152..153 " "
-                    R_CURLY@[153; 154) "}"
+                    R_CURLY@153..154 "}"
-                R_PAREN@[154; 155) ")"
+                R_PAREN@154..155 ")"
-            WHITESPACE@[155; 160) "\n    "
+            WHITESPACE@155..160 "\n    "
-            R_CURLY@[160; 161) "}"
+            R_CURLY@160..161 "}"
-      WHITESPACE@[161; 167) "\n\n    "
+      WHITESPACE@161..167 "\n\n    "
-      FN_DEF@[167; 180)
+      FN_DEF@167..180
-        FN_KW@[167; 169) "fn"
+        FN_KW@167..169 "fn"
-        WHITESPACE@[169; 170) " "
+        WHITESPACE@169..170 " "
-        NAME@[170; 180)
+        NAME@170..180
-          IDENT@[170; 180) "set_parent"
+          IDENT@170..180 "set_parent"
-      WHITESPACE@[180; 181) "\n"
+      WHITESPACE@180..181 "\n"
-      R_CURLY@[181; 182) "}"
+      R_CURLY@181..182 "}"
-  WHITESPACE@[182; 183) "\n"
+  WHITESPACE@182..183 "\n"
-error [34; 34): expected pattern
+error 34..34: expected pattern
-error [34; 34): expected COLON
+error 34..34: expected COLON
-error [34; 34): expected type
+error 34..34: expected type
-error [180; 180): expected function arguments
+error 180..180: expected function arguments
-error [180; 180): expected a block
+error 180..180: expected a block

diff --git a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast index 9a8f76673..63194f974 100644 --- a/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast +++ b/crates/ra_syntax/test_data/parser/err/0018_incomplete_fn.rast
@@ -1,132 +1,132 @@
1	SOURCE_FILE@[0; 183)	1	SOURCE_FILE@0..183
2	IMPL_DEF@[0; 182)	2	IMPL_DEF@0..182
3	IMPL_KW@[0; 4) "impl"	3	IMPL_KW@0..4 "impl"
4	WHITESPACE@[4; 5) " "	4	WHITESPACE@4..5 " "
5	PATH_TYPE@[5; 13)	5	PATH_TYPE@5..13
6	PATH@[5; 13)	6	PATH@5..13
7	PATH_SEGMENT@[5; 13)	7	PATH_SEGMENT@5..13
8	NAME_REF@[5; 13)	8	NAME_REF@5..13
9	IDENT@[5; 13) "FnScopes"	9	IDENT@5..13 "FnScopes"
10	WHITESPACE@[13; 14) " "	10	WHITESPACE@13..14 " "
11	ITEM_LIST@[14; 182)	11	ITEM_LIST@14..182
12	L_CURLY@[14; 15) "{"	12	L_CURLY@14..15 "{"
13	WHITESPACE@[15; 20) "\n "	13	WHITESPACE@15..20 "\n "
14	FN_DEF@[20; 161)	14	FN_DEF@20..161
15	FN_KW@[20; 22) "fn"	15	FN_KW@20..22 "fn"
16	WHITESPACE@[22; 23) " "	16	WHITESPACE@22..23 " "
17	NAME@[23; 32)	17	NAME@23..32
18	IDENT@[23; 32) "new_scope"	18	IDENT@23..32 "new_scope"
19	PARAM_LIST@[32; 35)	19	PARAM_LIST@32..35
20	L_PAREN@[32; 33) "("	20	L_PAREN@32..33 "("
21	PARAM@[33; 34)	21	PARAM@33..34
22	REF_PAT@[33; 34)	22	REF_PAT@33..34
23	AMP@[33; 34) "&"	23	AMP@33..34 "&"
24	R_PAREN@[34; 35) ")"	24	R_PAREN@34..35 ")"
25	WHITESPACE@[35; 36) " "	25	WHITESPACE@35..36 " "
26	RET_TYPE@[36; 46)	26	RET_TYPE@36..46
27	THIN_ARROW@[36; 38) "->"	27	THIN_ARROW@36..38 "->"
28	WHITESPACE@[38; 39) " "	28	WHITESPACE@38..39 " "
29	PATH_TYPE@[39; 46)	29	PATH_TYPE@39..46
30	PATH@[39; 46)	30	PATH@39..46
31	PATH_SEGMENT@[39; 46)	31	PATH_SEGMENT@39..46
32	NAME_REF@[39; 46)	32	NAME_REF@39..46
33	IDENT@[39; 46) "ScopeId"	33	IDENT@39..46 "ScopeId"
34	WHITESPACE@[46; 47) " "	34	WHITESPACE@46..47 " "
35	BLOCK_EXPR@[47; 161)	35	BLOCK_EXPR@47..161
36	BLOCK@[47; 161)	36	BLOCK@47..161
37	L_CURLY@[47; 48) "{"	37	L_CURLY@47..48 "{"
38	WHITESPACE@[48; 57) "\n "	38	WHITESPACE@48..57 "\n "
39	LET_STMT@[57; 85)	39	LET_STMT@57..85
40	LET_KW@[57; 60) "let"	40	LET_KW@57..60 "let"
41	WHITESPACE@[60; 61) " "	41	WHITESPACE@60..61 " "
42	BIND_PAT@[61; 64)	42	BIND_PAT@61..64
43	NAME@[61; 64)	43	NAME@61..64
44	IDENT@[61; 64) "res"	44	IDENT@61..64 "res"
45	WHITESPACE@[64; 65) " "	45	WHITESPACE@64..65 " "
46	EQ@[65; 66) "="	46	EQ@65..66 "="
47	WHITESPACE@[66; 67) " "	47	WHITESPACE@66..67 " "
48	METHOD_CALL_EXPR@[67; 84)	48	METHOD_CALL_EXPR@67..84
49	FIELD_EXPR@[67; 78)	49	FIELD_EXPR@67..78
50	PATH_EXPR@[67; 71)	50	PATH_EXPR@67..71
51	PATH@[67; 71)	51	PATH@67..71
52	PATH_SEGMENT@[67; 71)	52	PATH_SEGMENT@67..71
53	SELF_KW@[67; 71) "self"	53	SELF_KW@67..71 "self"
54	DOT@[71; 72) "."	54	DOT@71..72 "."
55	NAME_REF@[72; 78)	55	NAME_REF@72..78
56	IDENT@[72; 78) "scopes"	56	IDENT@72..78 "scopes"
57	DOT@[78; 79) "."	57	DOT@78..79 "."
58	NAME_REF@[79; 82)	58	NAME_REF@79..82
59	IDENT@[79; 82) "len"	59	IDENT@79..82 "len"
60	ARG_LIST@[82; 84)	60	ARG_LIST@82..84
61	L_PAREN@[82; 83) "("	61	L_PAREN@82..83 "("
62	R_PAREN@[83; 84) ")"	62	R_PAREN@83..84 ")"
63	SEMICOLON@[84; 85) ";"	63	SEMICOLON@84..85 ";"
64	WHITESPACE@[85; 94) "\n "	64	WHITESPACE@85..94 "\n "
65	METHOD_CALL_EXPR@[94; 155)	65	METHOD_CALL_EXPR@94..155
66	FIELD_EXPR@[94; 105)	66	FIELD_EXPR@94..105
67	PATH_EXPR@[94; 98)	67	PATH_EXPR@94..98
68	PATH@[94; 98)	68	PATH@94..98
69	PATH_SEGMENT@[94; 98)	69	PATH_SEGMENT@94..98
70	SELF_KW@[94; 98) "self"	70	SELF_KW@94..98 "self"
71	DOT@[98; 99) "."	71	DOT@98..99 "."
72	NAME_REF@[99; 105)	72	NAME_REF@99..105
73	IDENT@[99; 105) "scopes"	73	IDENT@99..105 "scopes"
74	DOT@[105; 106) "."	74	DOT@105..106 "."
75	NAME_REF@[106; 110)	75	NAME_REF@106..110
76	IDENT@[106; 110) "push"	76	IDENT@106..110 "push"
77	ARG_LIST@[110; 155)	77	ARG_LIST@110..155
78	L_PAREN@[110; 111) "("	78	L_PAREN@110..111 "("
79	RECORD_LIT@[111; 154)	79	RECORD_LIT@111..154
80	PATH@[111; 120)	80	PATH@111..120
81	PATH_SEGMENT@[111; 120)	81	PATH_SEGMENT@111..120
82	NAME_REF@[111; 120)	82	NAME_REF@111..120
83	IDENT@[111; 120) "ScopeData"	83	IDENT@111..120 "ScopeData"
84	WHITESPACE@[120; 121) " "	84	WHITESPACE@120..121 " "
85	RECORD_FIELD_LIST@[121; 154)	85	RECORD_FIELD_LIST@121..154
86	L_CURLY@[121; 122) "{"	86	L_CURLY@121..122 "{"
87	WHITESPACE@[122; 123) " "	87	WHITESPACE@122..123 " "
88	RECORD_FIELD@[123; 135)	88	RECORD_FIELD@123..135
89	NAME_REF@[123; 129)	89	NAME_REF@123..129
90	IDENT@[123; 129) "parent"	90	IDENT@123..129 "parent"
91	COLON@[129; 130) ":"	91	COLON@129..130 ":"
92	WHITESPACE@[130; 131) " "	92	WHITESPACE@130..131 " "
93	PATH_EXPR@[131; 135)	93	PATH_EXPR@131..135
94	PATH@[131; 135)	94	PATH@131..135
95	PATH_SEGMENT@[131; 135)	95	PATH_SEGMENT@131..135
96	NAME_REF@[131; 135)	96	NAME_REF@131..135
97	IDENT@[131; 135) "None"	97	IDENT@131..135 "None"
98	COMMA@[135; 136) ","	98	COMMA@135..136 ","
99	WHITESPACE@[136; 137) " "	99	WHITESPACE@136..137 " "
100	RECORD_FIELD@[137; 152)	100	RECORD_FIELD@137..152
101	NAME_REF@[137; 144)	101	NAME_REF@137..144
102	IDENT@[137; 144) "entries"	102	IDENT@137..144 "entries"
103	COLON@[144; 145) ":"	103	COLON@144..145 ":"
104	WHITESPACE@[145; 146) " "	104	WHITESPACE@145..146 " "
105	MACRO_CALL@[146; 152)	105	MACRO_CALL@146..152
106	PATH@[146; 149)	106	PATH@146..149
107	PATH_SEGMENT@[146; 149)	107	PATH_SEGMENT@146..149
108	NAME_REF@[146; 149)	108	NAME_REF@146..149
109	IDENT@[146; 149) "vec"	109	IDENT@146..149 "vec"
110	BANG@[149; 150) "!"	110	BANG@149..150 "!"
111	TOKEN_TREE@[150; 152)	111	TOKEN_TREE@150..152
112	L_BRACK@[150; 151) "["	112	L_BRACK@150..151 "["
113	R_BRACK@[151; 152) "]"	113	R_BRACK@151..152 "]"
114	WHITESPACE@[152; 153) " "	114	WHITESPACE@152..153 " "
115	R_CURLY@[153; 154) "}"	115	R_CURLY@153..154 "}"
116	R_PAREN@[154; 155) ")"	116	R_PAREN@154..155 ")"
117	WHITESPACE@[155; 160) "\n "	117	WHITESPACE@155..160 "\n "
118	R_CURLY@[160; 161) "}"	118	R_CURLY@160..161 "}"
119	WHITESPACE@[161; 167) "\n\n "	119	WHITESPACE@161..167 "\n\n "
120	FN_DEF@[167; 180)	120	FN_DEF@167..180
121	FN_KW@[167; 169) "fn"	121	FN_KW@167..169 "fn"
122	WHITESPACE@[169; 170) " "	122	WHITESPACE@169..170 " "
123	NAME@[170; 180)	123	NAME@170..180
124	IDENT@[170; 180) "set_parent"	124	IDENT@170..180 "set_parent"
125	WHITESPACE@[180; 181) "\n"	125	WHITESPACE@180..181 "\n"
126	R_CURLY@[181; 182) "}"	126	R_CURLY@181..182 "}"
127	WHITESPACE@[182; 183) "\n"	127	WHITESPACE@182..183 "\n"
128	error [34; 34): expected pattern	128	error 34..34: expected pattern
129	error [34; 34): expected COLON	129	error 34..34: expected COLON
130	error [34; 34): expected type	130	error 34..34: expected type
131	error [180; 180): expected function arguments	131	error 180..180: expected function arguments
132	error [180; 180): expected a block	132	error 180..180: expected a block