6 files changed, 104 insertions, 26 deletions
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
new file mode 100644
index 000000000..d0360c467
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -0,0 +1,70 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "super"
+          [email protected] "::"
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "super"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected] "a"
+      [email protected] "::"
+      [email protected]
+        [email protected] "{"
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "super"
+            [email protected] "::"
+            [email protected]
+              [email protected]
+                [email protected] "b"
+        [email protected] "}"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..11: The `super` keyword may only be preceded by other `super`s
+error 20..25: The `super` keyword may only be preceded by other `super`s
+error 41..46: The `super` keyword may only be preceded by other `super`s
+error 56..61: The `super` keyword may only be preceded by other `super`s
diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
new file mode 100644
index 000000000..bd4d58042
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
@@ -0,0 +1,4 @@
+use ::super;
+use a::super;
+use super::a::super;
+use a::{super::b};
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
new file mode 100644
index 000000000..4f382b06c
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -0,0 +1,27 @@
+[email protected]
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected] "::"
+          [email protected] "self"
+    [email protected] ";"
+  [email protected] "\n"
+  [email protected]
+    [email protected] "use"
+    [email protected] " "
+    [email protected]
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "a"
+        [email protected] "::"
+        [email protected]
+          [email protected] "self"
+    [email protected] ";"
+  [email protected] "\n"
+error 6..10: The `self` keyword is only allowed as the first segment of a path
+error 19..23: The `self` keyword is only allowed as the first segment of a path
diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
new file mode 100644
index 000000000..b9e1d7d8b
--- /dev/null
+++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
@@ -0,0 +1,2 @@
+use ::self;
+use a::self;
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
index a5a90df7b..05d9c05ad 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -1,4 +1,4 @@
-SOURCE_FILE@0..65
+SOURCE_FILE@0..38
  [email protected]
    [email protected] "use"
    [email protected] " "
@@ -31,27 +31,3 @@ [email protected]
            [email protected] "bar"
    [email protected] ";"
  [email protected] "\n"
-  [email protected]
-    [email protected] "use"
-    [email protected] " "
-    [email protected]
-      [email protected]
-        [email protected]
-          [email protected]
-            [email protected]
-              [email protected]
-                [email protected] "::"
-                [email protected] "self"
-            [email protected] "::"
-            [email protected]
-              [email protected]
-                [email protected] "a"
-          [email protected] "::"
-          [email protected]
-            [email protected] "super"
-        [email protected] "::"
-        [email protected]
-          [email protected]
-            [email protected] "bar"
-    [email protected] ";"
-  [email protected] "\n"
diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
index faf6a42c7..9d9eb9917 100644
--- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
+++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
@@ -1,3 +1,2 @@
 use self::foo;
 use super::super::bar;
-use ::self::a::super::bar;

diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast new file mode 100644 index 000000000..d0360c467 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rast
@@ -0,0 +1,70 @@
		1	[email protected]
		2	[email protected]
		3	[email protected] "use"
		4	[email protected] " "
		5	[email protected]
		6	[email protected]
		7	[email protected]
		8	[email protected] "::"
		9	[email protected] "super"
		10	[email protected] ";"
		11	[email protected] "\n"
		12	[email protected]
		13	[email protected] "use"
		14	[email protected] " "
		15	[email protected]
		16	[email protected]
		17	[email protected]
		18	[email protected]
		19	[email protected]
		20	[email protected] "a"
		21	[email protected] "::"
		22	[email protected]
		23	[email protected] "super"
		24	[email protected] ";"
		25	[email protected] "\n"
		26	[email protected]
		27	[email protected] "use"
		28	[email protected] " "
		29	[email protected]
		30	[email protected]
		31	[email protected]
		32	[email protected]
		33	[email protected]
		34	[email protected] "super"
		35	[email protected] "::"
		36	[email protected]
		37	[email protected]
		38	[email protected] "a"
		39	[email protected] "::"
		40	[email protected]
		41	[email protected] "super"
		42	[email protected] ";"
		43	[email protected] "\n"
		44	[email protected]
		45	[email protected] "use"
		46	[email protected] " "
		47	[email protected]
		48	[email protected]
		49	[email protected]
		50	[email protected]
		51	[email protected] "a"
		52	[email protected] "::"
		53	[email protected]
		54	[email protected] "{"
		55	[email protected]
		56	[email protected]
		57	[email protected]
		58	[email protected]
		59	[email protected] "super"
		60	[email protected] "::"
		61	[email protected]
		62	[email protected]
		63	[email protected] "b"
		64	[email protected] "}"
		65	[email protected] ";"
		66	[email protected] "\n"
		67	error 6..11: The `super` keyword may only be preceded by other `super`s
		68	error 20..25: The `super` keyword may only be preceded by other `super`s
		69	error 41..46: The `super` keyword may only be preceded by other `super`s
		70	error 56..61: The `super` keyword may only be preceded by other `super`s


diff --git a/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs new file mode 100644 index 000000000..bd4d58042 --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0041_illegal_super_keyword_location.rs
@@ -0,0 +1,4 @@
		1	use ::super;
		2	use a::super;
		3	use super::a::super;
		4	use a::{super::b};


diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast new file mode 100644 index 000000000..4f382b06c --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rast
@@ -0,0 +1,27 @@
		1	[email protected]
		2	[email protected]
		3	[email protected] "use"
		4	[email protected] " "
		5	[email protected]
		6	[email protected]
		7	[email protected]
		8	[email protected] "::"
		9	[email protected] "self"
		10	[email protected] ";"
		11	[email protected] "\n"
		12	[email protected]
		13	[email protected] "use"
		14	[email protected] " "
		15	[email protected]
		16	[email protected]
		17	[email protected]
		18	[email protected]
		19	[email protected]
		20	[email protected] "a"
		21	[email protected] "::"
		22	[email protected]
		23	[email protected] "self"
		24	[email protected] ";"
		25	[email protected] "\n"
		26	error 6..10: The `self` keyword is only allowed as the first segment of a path
		27	error 19..23: The `self` keyword is only allowed as the first segment of a path


diff --git a/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs new file mode 100644 index 000000000..b9e1d7d8b --- /dev/null +++ b/crates/ra_syntax/test_data/parser/err/0042_illegal_self_keyword_location.rs
@@ -0,0 +1,2 @@
		1	use ::self;
		2	use a::self;


diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast index a5a90df7b..05d9c05ad 100644 --- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast +++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rast
@@ -1,4 +1,4 @@
1	SOURCE_FILE@0..65	1	SOURCE_FILE@0..38
2	[email protected]	2	[email protected]
3	[email protected] "use"	3	[email protected] "use"
4	[email protected] " "	4	[email protected] " "
@@ -31,27 +31,3 @@ [email protected]
31	[email protected] "bar"	31	[email protected] "bar"
32	[email protected] ";"	32	[email protected] ";"
33	[email protected] "\n"	33	[email protected] "\n"
34	[email protected]
35	[email protected] "use"
36	[email protected] " "
37	[email protected]
38	[email protected]
39	[email protected]
40	[email protected]
41	[email protected]
42	[email protected]
43	[email protected] "::"
44	[email protected] "self"
45	[email protected] "::"
46	[email protected]
47	[email protected]
48	[email protected] "a"
49	[email protected] "::"
50	[email protected]
51	[email protected] "super"
52	[email protected] "::"
53	[email protected]
54	[email protected]
55	[email protected] "bar"
56	[email protected] ";"
57	[email protected] "\n"


diff --git a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs index faf6a42c7..9d9eb9917 100644 --- a/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs +++ b/crates/ra_syntax/test_data/parser/ok/0013_use_path_self_super.rs
@@ -1,3 +1,2 @@
1	use self::foo;	1	use self::foo;
2	use super::super::bar;	2	use super::super::bar;
3	use ::self::a::super::bar;