Merge #4246

4246: Validate uses of self and super r=matklad a=djrenren This change follows on the validation of the `crate` keyword in paths. It verifies the following things: `super`: - May only be preceded by other `super` segments - If in a `UseItem` then all semantically preceding paths also consist only of `super` `self` - May only be the start of a path Just a note, a couple times while working on this I found myself really wanting a Visitor of some sort so that I could traverse descendants while skipping sub-trees that are unimportant. Iterators don't really work for this, so as you can see I reached for recursion. Considering paths are generally small a fancy debounced visitor probably isn't important but figured I'd say something in case we had something like this lying around and I wasn't using it. Co-authored-by: John Renner <john@jrenner.net>
author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2020-05-01 20:24:25 +0100
committer: GitHub <noreply@github.com> 2020-05-01 20:24:25 +0100
commit: 21588e15dfa8b117b503769119320e718bade351 (patch)
tree: c10be6c66f2d6220d98c316c44bb3f9677ad1a1d /crates/ra_syntax/test_data
parent: 302777f0041540bf6790fde2acc3bb5b04e72427 (diff)
parent: 3bb46042fb5b8ee421e350c54079cb68b4edc996 (diff)
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 @@
+SOURCE_FILE@0..67
+  USE_ITEM@0..12
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..11
+      PATH@4..11
+        PATH_SEGMENT@4..11
+          COLON2@4..6 "::"
+          SUPER_KW@6..11 "super"
+    SEMICOLON@11..12 ";"
+  WHITESPACE@12..13 "\n"
+  USE_ITEM@13..26
+    USE_KW@13..16 "use"
+    WHITESPACE@16..17 " "
+    USE_TREE@17..25
+      PATH@17..25
+        PATH@17..18
+          PATH_SEGMENT@17..18
+            NAME_REF@17..18
+              IDENT@17..18 "a"
+        COLON2@18..20 "::"
+        PATH_SEGMENT@20..25
+          SUPER_KW@20..25 "super"
+    SEMICOLON@25..26 ";"
+  WHITESPACE@26..27 "\n"
+  USE_ITEM@27..47
+    USE_KW@27..30 "use"
+    WHITESPACE@30..31 " "
+    USE_TREE@31..46
+      PATH@31..46
+        PATH@31..39
+          PATH@31..36
+            PATH_SEGMENT@31..36
+              SUPER_KW@31..36 "super"
+          COLON2@36..38 "::"
+          PATH_SEGMENT@38..39
+            NAME_REF@38..39
+              IDENT@38..39 "a"
+        COLON2@39..41 "::"
+        PATH_SEGMENT@41..46
+          SUPER_KW@41..46 "super"
+    SEMICOLON@46..47 ";"
+  WHITESPACE@47..48 "\n"
+  USE_ITEM@48..66
+    USE_KW@48..51 "use"
+    WHITESPACE@51..52 " "
+    USE_TREE@52..65
+      PATH@52..53
+        PATH_SEGMENT@52..53
+          NAME_REF@52..53
+            IDENT@52..53 "a"
+      COLON2@53..55 "::"
+      USE_TREE_LIST@55..65
+        L_CURLY@55..56 "{"
+        USE_TREE@56..64
+          PATH@56..64
+            PATH@56..61
+              PATH_SEGMENT@56..61
+                SUPER_KW@56..61 "super"
+            COLON2@61..63 "::"
+            PATH_SEGMENT@63..64
+              NAME_REF@63..64
+                IDENT@63..64 "b"
+        R_CURLY@64..65 "}"
+    SEMICOLON@65..66 ";"
+  WHITESPACE@66..67 "\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 @@
+SOURCE_FILE@0..25
+  USE_ITEM@0..11
+    USE_KW@0..3 "use"
+    WHITESPACE@3..4 " "
+    USE_TREE@4..10
+      PATH@4..10
+        PATH_SEGMENT@4..10
+          COLON2@4..6 "::"
+          SELF_KW@6..10 "self"
+    SEMICOLON@10..11 ";"
+  WHITESPACE@11..12 "\n"
+  USE_ITEM@12..24
+    USE_KW@12..15 "use"
+    WHITESPACE@15..16 " "
+    USE_TREE@16..23
+      PATH@16..23
+        PATH@16..17
+          PATH_SEGMENT@16..17
+            NAME_REF@16..17
+              IDENT@16..17 "a"
+        COLON2@17..19 "::"
+        PATH_SEGMENT@19..23
+          SELF_KW@19..23 "self"
+    SEMICOLON@23..24 ";"
+  WHITESPACE@24..25 "\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
  USE_ITEM@0..14
    USE_KW@0..3 "use"
    WHITESPACE@3..4 " "
@@ -31,27 +31,3 @@ SOURCE_FILE@0..65
            IDENT@33..36 "bar"
    SEMICOLON@36..37 ";"
  WHITESPACE@37..38 "\n"
-  USE_ITEM@38..64
-    USE_KW@38..41 "use"
-    WHITESPACE@41..42 " "
-    USE_TREE@42..63
-      PATH@42..63
-        PATH@42..58
-          PATH@42..51
-            PATH@42..48
-              PATH_SEGMENT@42..48
-                COLON2@42..44 "::"
-                SELF_KW@44..48 "self"
-            COLON2@48..50 "::"
-            PATH_SEGMENT@50..51
-              NAME_REF@50..51
-                IDENT@50..51 "a"
-          COLON2@51..53 "::"
-          PATH_SEGMENT@53..58
-            SUPER_KW@53..58 "super"
-        COLON2@58..60 "::"
-        PATH_SEGMENT@60..63
-          NAME_REF@60..63
-            IDENT@60..63 "bar"
-    SEMICOLON@63..64 ";"
-  WHITESPACE@64..65 "\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;
author	bors[bot] <26634292+bors[bot]@users.noreply.github.com>	2020-05-01 20:24:25 +0100
committer	GitHub <noreply@github.com>	2020-05-01 20:24:25 +0100
commit	21588e15dfa8b117b503769119320e718bade351 (patch)
tree	c10be6c66f2d6220d98c316c44bb3f9677ad1a1d /crates/ra_syntax/test_data
parent	302777f0041540bf6790fde2acc3bb5b04e72427 (diff)
parent	3bb46042fb5b8ee421e350c54079cb68b4edc996 (diff)

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	SOURCE_FILE@0..67
		2	USE_ITEM@0..12
		3	USE_KW@0..3 "use"
		4	WHITESPACE@3..4 " "
		5	USE_TREE@4..11
		6	PATH@4..11
		7	PATH_SEGMENT@4..11
		8	COLON2@4..6 "::"
		9	SUPER_KW@6..11 "super"
		10	SEMICOLON@11..12 ";"
		11	WHITESPACE@12..13 "\n"
		12	USE_ITEM@13..26
		13	USE_KW@13..16 "use"
		14	WHITESPACE@16..17 " "
		15	USE_TREE@17..25
		16	PATH@17..25
		17	PATH@17..18
		18	PATH_SEGMENT@17..18
		19	NAME_REF@17..18
		20	IDENT@17..18 "a"
		21	COLON2@18..20 "::"
		22	PATH_SEGMENT@20..25
		23	SUPER_KW@20..25 "super"
		24	SEMICOLON@25..26 ";"
		25	WHITESPACE@26..27 "\n"
		26	USE_ITEM@27..47
		27	USE_KW@27..30 "use"
		28	WHITESPACE@30..31 " "
		29	USE_TREE@31..46
		30	PATH@31..46
		31	PATH@31..39
		32	PATH@31..36
		33	PATH_SEGMENT@31..36
		34	SUPER_KW@31..36 "super"
		35	COLON2@36..38 "::"
		36	PATH_SEGMENT@38..39
		37	NAME_REF@38..39
		38	IDENT@38..39 "a"
		39	COLON2@39..41 "::"
		40	PATH_SEGMENT@41..46
		41	SUPER_KW@41..46 "super"
		42	SEMICOLON@46..47 ";"
		43	WHITESPACE@47..48 "\n"
		44	USE_ITEM@48..66
		45	USE_KW@48..51 "use"
		46	WHITESPACE@51..52 " "
		47	USE_TREE@52..65
		48	PATH@52..53
		49	PATH_SEGMENT@52..53
		50	NAME_REF@52..53
		51	IDENT@52..53 "a"
		52	COLON2@53..55 "::"
		53	USE_TREE_LIST@55..65
		54	L_CURLY@55..56 "{"
		55	USE_TREE@56..64
		56	PATH@56..64
		57	PATH@56..61
		58	PATH_SEGMENT@56..61
		59	SUPER_KW@56..61 "super"
		60	COLON2@61..63 "::"
		61	PATH_SEGMENT@63..64
		62	NAME_REF@63..64
		63	IDENT@63..64 "b"
		64	R_CURLY@64..65 "}"
		65	SEMICOLON@65..66 ";"
		66	WHITESPACE@66..67 "\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	SOURCE_FILE@0..25
		2	USE_ITEM@0..11
		3	USE_KW@0..3 "use"
		4	WHITESPACE@3..4 " "
		5	USE_TREE@4..10
		6	PATH@4..10
		7	PATH_SEGMENT@4..10
		8	COLON2@4..6 "::"
		9	SELF_KW@6..10 "self"
		10	SEMICOLON@10..11 ";"
		11	WHITESPACE@11..12 "\n"
		12	USE_ITEM@12..24
		13	USE_KW@12..15 "use"
		14	WHITESPACE@15..16 " "
		15	USE_TREE@16..23
		16	PATH@16..23
		17	PATH@16..17
		18	PATH_SEGMENT@16..17
		19	NAME_REF@16..17
		20	IDENT@16..17 "a"
		21	COLON2@17..19 "::"
		22	PATH_SEGMENT@19..23
		23	SELF_KW@19..23 "self"
		24	SEMICOLON@23..24 ";"
		25	WHITESPACE@24..25 "\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	USE_ITEM@0..14	2	USE_ITEM@0..14
3	USE_KW@0..3 "use"	3	USE_KW@0..3 "use"
4	WHITESPACE@3..4 " "	4	WHITESPACE@3..4 " "
@@ -31,27 +31,3 @@ SOURCE_FILE@0..65
31	IDENT@33..36 "bar"	31	IDENT@33..36 "bar"
32	SEMICOLON@36..37 ";"	32	SEMICOLON@36..37 ";"
33	WHITESPACE@37..38 "\n"	33	WHITESPACE@37..38 "\n"
34	USE_ITEM@38..64
35	USE_KW@38..41 "use"
36	WHITESPACE@41..42 " "
37	USE_TREE@42..63
38	PATH@42..63
39	PATH@42..58
40	PATH@42..51
41	PATH@42..48
42	PATH_SEGMENT@42..48
43	COLON2@42..44 "::"
44	SELF_KW@44..48 "self"
45	COLON2@48..50 "::"
46	PATH_SEGMENT@50..51
47	NAME_REF@50..51
48	IDENT@50..51 "a"
49	COLON2@51..53 "::"
50	PATH_SEGMENT@53..58
51	SUPER_KW@53..58 "super"
52	COLON2@58..60 "::"
53	PATH_SEGMENT@60..63
54	NAME_REF@60..63
55	IDENT@60..63 "bar"
56	SEMICOLON@63..64 ";"
57	WHITESPACE@64..65 "\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;