2 files changed, 65 insertions, 50 deletions
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
index 8306f7361..d2a549273 100644
--- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -1,4 +1,4 @@
-[email protected]3
+SOURCE_FILE@0..98
  [email protected]
    [email protected] "use"
    [email protected] " "
@@ -9,11 +9,11 @@ [email protected]
          [email protected] "crate"
    [email protected] ";"
  [email protected] "\n"
-  USE_ITEM@13..39
+  USE_ITEM@13..54
    [email protected] "use"
    [email protected] " "
-    [email protected]8
+    USE_TREE@17..53
-      [email protected]8
+      USE_TREE_LIST@17..53
        [email protected] "{"
        [email protected]
          [email protected]
@@ -21,56 +21,71 @@ [email protected]
              [email protected] "crate"
        [email protected] ","
        [email protected] " "
-        USE_TREE@25..37
+        USE_TREE@25..52
          [email protected]
            [email protected]
              [email protected]
                [email protected] "foo"
          [email protected] "::"
-          USE_TREE_LIST@30..37
+          USE_TREE_LIST@30..52
            [email protected] "{"
-            [email protected]
+            [email protected]
-              [email protected]
+              [email protected]
-                [email protected]
+                [email protected]
-                  [email protected] "crate"
+                  [email protected]
-            [email protected] "}"
+                    [email protected]
-        [email protected] "}"
+                      [email protected]
-    [email protected] ";"
+                        [email protected] "crate"
-  [email protected] "\n"
+                    [email protected] "::"
-  [email protected]
+                    [email protected]
-    [email protected] "use"
+                      [email protected]
-    [email protected] " "
+                        [email protected] "foo"
-    [email protected]
+                  [email protected] "::"
-      [email protected]
+                  [email protected]
-        [email protected]
+                    [email protected]
-          [email protected]
+                      [email protected] "bar"
-            [email protected]
+                [email protected] "::"
-              [email protected] "hello"
+                [email protected]
-        [email protected] "::"
+                  [email protected]
-        [email protected]
+                    [email protected] "baz"
-          [email protected] "crate"
+            [email protected] "}"
-    [email protected] ";"
+        [email protected] "}"
-  [email protected] "\n"
+    [email protected] ";"
-  [email protected]
+  [email protected] "\n"
-    [email protected] "use"
+  [email protected]
-    [email protected] " "
+    [email protected] "use"
-    [email protected]
+    [email protected] " "
-      [email protected]
+    [email protected]
-        [email protected]
+      [email protected]
-          [email protected]
+        [email protected]
-            [email protected]
+          [email protected]
-              [email protected]
+            [email protected]
-                [email protected] "hello"
+              [email protected] "hello"
-          [email protected] "::"
+        [email protected] "::"
-          [email protected]
+        [email protected]
-            [email protected] "crate"
+          [email protected] "crate"
-        [email protected] "::"
+    [email protected] ";"
-        [email protected]
+  [email protected] "\n"
-          [email protected]
+  [email protected]
-            [email protected] "there"
+    [email protected] "use"
-    [email protected] ";"
+    [email protected] " "
-  [email protected] "\n"
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "hello"
+          [email protected] "::"
+          [email protected]
+            [email protected] "crate"
+        [email protected] "::"
+        [email protected]
+          [email protected]
+            [email protected] "there"
+    [email protected] ";"
+  [email protected] "\n"
 error 6..11: The `crate` keyword is only allowed as the first segment of a path
 error 31..36: The `crate` keyword is only allowed as the first segment of a path
-error 51..56: The `crate` keyword is only allowed as the first segment of a path
+error 66..71: The `crate` keyword is only allowed as the first segment of a path
-error 69..74: The `crate` keyword is only allowed as the first segment of a path
+error 84..89: The `crate` keyword is only allowed as the first segment of a path
diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
index bead4c0b6..508def2c7 100644
--- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
+++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
@@ -1,4 +1,4 @@
 use ::crate;
-use {crate, foo::{crate}};
+use {crate, foo::{crate::foo::bar::baz}};
 use hello::crate;
 use hello::crate::there;

diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast index 8306f7361..d2a549273 100644 --- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast +++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rast
@@ -1,4 +1,4 @@
1	[email protected]3	1	SOURCE_FILE@0..98
2	[email protected]	2	[email protected]
3	[email protected] "use"	3	[email protected] "use"
4	[email protected] " "	4	[email protected] " "
@@ -9,11 +9,11 @@ [email protected]
9	[email protected] "crate"	9	[email protected] "crate"
10	[email protected] ";"	10	[email protected] ";"
11	[email protected] "\n"	11	[email protected] "\n"
12	USE_ITEM@13..39	12	USE_ITEM@13..54
13	[email protected] "use"	13	[email protected] "use"
14	[email protected] " "	14	[email protected] " "
15	[email protected]8	15	USE_TREE@17..53
16	[email protected]8	16	USE_TREE_LIST@17..53
17	[email protected] "{"	17	[email protected] "{"
18	[email protected]	18	[email protected]
19	[email protected]	19	[email protected]
@@ -21,56 +21,71 @@ [email protected]
21	[email protected] "crate"	21	[email protected] "crate"
22	[email protected] ","	22	[email protected] ","
23	[email protected] " "	23	[email protected] " "
24	USE_TREE@25..37	24	USE_TREE@25..52
25	[email protected]	25	[email protected]
26	[email protected]	26	[email protected]
27	[email protected]	27	[email protected]
28	[email protected] "foo"	28	[email protected] "foo"
29	[email protected] "::"	29	[email protected] "::"
30	USE_TREE_LIST@30..37	30	USE_TREE_LIST@30..52
31	[email protected] "{"	31	[email protected] "{"
32	[email protected]	32	[email protected]
33	[email protected]	33	[email protected]
34	[email protected]	34	[email protected]
35	[email protected] "crate"	35	[email protected]
36	[email protected] "}"	36	[email protected]
37	[email protected] "}"	37	[email protected]
38	[email protected] ";"	38	[email protected] "crate"
39	[email protected] "\n"	39	[email protected] "::"
40	[email protected]	40	[email protected]
41	[email protected] "use"	41	[email protected]
42	[email protected] " "	42	[email protected] "foo"
43	[email protected]	43	[email protected] "::"
44	[email protected]	44	[email protected]
45	[email protected]	45	[email protected]
46	[email protected]	46	[email protected] "bar"
47	[email protected]	47	[email protected] "::"
48	[email protected] "hello"	48	[email protected]
49	[email protected] "::"	49	[email protected]
50	[email protected]	50	[email protected] "baz"
51	[email protected] "crate"	51	[email protected] "}"
52	[email protected] ";"	52	[email protected] "}"
53	[email protected] "\n"	53	[email protected] ";"
54	[email protected]	54	[email protected] "\n"
55	[email protected] "use"	55	[email protected]
56	[email protected] " "	56	[email protected] "use"
57	[email protected]	57	[email protected] " "
58	[email protected]	58	[email protected]
59	[email protected]	59	[email protected]
60	[email protected]	60	[email protected]
61	[email protected]	61	[email protected]
62	[email protected]	62	[email protected]
63	[email protected] "hello"	63	[email protected] "hello"
64	[email protected] "::"	64	[email protected] "::"
65	[email protected]	65	[email protected]
66	[email protected] "crate"	66	[email protected] "crate"
67	[email protected] "::"	67	[email protected] ";"
68	[email protected]	68	[email protected] "\n"
69	[email protected]	69	[email protected]
70	[email protected] "there"	70	[email protected] "use"
71	[email protected] ";"	71	[email protected] " "
72	[email protected] "\n"	72	[email protected]
		73	[email protected]
		74	[email protected]
		75	[email protected]
		76	[email protected]
		77	[email protected]
		78	[email protected] "hello"
		79	[email protected] "::"
		80	[email protected]
		81	[email protected] "crate"
		82	[email protected] "::"
		83	[email protected]
		84	[email protected]
		85	[email protected] "there"
		86	[email protected] ";"
		87	[email protected] "\n"
73	error 6..11: The `crate` keyword is only allowed as the first segment of a path	88	error 6..11: The `crate` keyword is only allowed as the first segment of a path
74	error 31..36: The `crate` keyword is only allowed as the first segment of a path	89	error 31..36: The `crate` keyword is only allowed as the first segment of a path
75	error 51..56: The `crate` keyword is only allowed as the first segment of a path	90	error 66..71: The `crate` keyword is only allowed as the first segment of a path
76	error 69..74: The `crate` keyword is only allowed as the first segment of a path	91	error 84..89: The `crate` keyword is only allowed as the first segment of a path


diff --git a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs index bead4c0b6..508def2c7 100644 --- a/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs +++ b/crates/ra_syntax/test_data/parser/err/0040_illegal_crate_kw_location.rs
@@ -1,4 +1,4 @@
1	use ::crate;	1	use ::crate;
2	use {crate, foo::{crate}};	2	use {crate, foo::{crate::foo::bar::baz}};
3	use hello::crate;	3	use hello::crate;
4	use hello::crate::there;	4	use hello::crate::there;