Merge #7288

7288: Handle self/super/crate in PathSegment as NameRef r=matklad a=Veykril

Wrapping self/super/crate in NameRef as per https://github.com/rust-analyzer/rust-analyzer/pull/7261#issuecomment-760023172



Co-authored-by: Lukas Wirth <[email protected]>

9 files changed, 24 insertions, 12 deletions

diff --git a/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
index e872526d9..d3c5dde58 100644
--- a/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
+++ b/crates/syntax/test_data/parser/inline/err/0015_empty_segment.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
     [email protected] ";"
   [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
index f40500e38..970826739 100644
--- a/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0002_use_tree_list.rast
@@ -11,7 +11,8 @@ [email protected]
               [email protected]
                 [email protected]
                   [email protected]
-                    [email protected] "crate"
+                    [email protected]
+                      [email protected] "crate"
                 [email protected] "::"
                 [email protected]
                   [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
index 9bc36bea7..46a103d5b 100644
--- a/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0052_path_type.rast
@@ -42,7 +42,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "self"
+            [email protected]
+              [email protected] "self"
         [email protected] "::"
         [email protected]
           [email protected]
@@ -61,7 +62,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "super"
+            [email protected]
+              [email protected] "super"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
index e4fb32de1..583dcac7e 100644
--- a/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0062_mod_contents.rast
@@ -43,7 +43,8 @@ [email protected]
     [email protected]
       [email protected]
         [email protected]
-          [email protected] "super"
+          [email protected]
+            [email protected] "super"
       [email protected] "::"
       [email protected]
         [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
index 702f2e0b0..87c0c48dc 100644
--- a/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0067_crate_path.rast
@@ -6,7 +6,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
index c4c5bc51e..192a9cca6 100644
--- a/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0069_use_tree_list_after_path.rast
@@ -5,7 +5,8 @@ [email protected]
     [email protected]
       [email protected]
         [email protected]
-          [email protected] "crate"
+          [email protected]
+            [email protected] "crate"
       [email protected] "::"
       [email protected]
         [email protected] "{"
@@ -23,7 +24,8 @@ [email protected]
     [email protected]
       [email protected]
         [email protected]
-          [email protected] "self"
+          [email protected]
+            [email protected] "self"
       [email protected] "::"
       [email protected]
         [email protected] "{"
diff --git a/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
index f3d4ad72c..3016a6574 100644
--- a/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0117_macro_call_type.rast
@@ -30,7 +30,8 @@ [email protected]
       [email protected]
         [email protected]
           [email protected]
-            [email protected] "crate"
+            [email protected]
+              [email protected] "crate"
         [email protected] "::"
         [email protected]
           [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
index aa4d7a784..0fed2d311 100644
--- a/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0125_crate_keyword_path.rast
@@ -17,7 +17,8 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected]
-                  [email protected] "crate"
+                  [email protected]
+                    [email protected] "crate"
               [email protected] "::"
               [email protected]
                 [email protected]
diff --git a/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast b/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast
index c204f0e2d..a5ee07499 100644
--- a/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast
+++ b/crates/syntax/test_data/parser/inline/ok/0153_pub_parens_typepath.rast
@@ -16,7 +16,8 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected]
-                  [email protected] "super"
+                  [email protected]
+                    [email protected] "super"
               [email protected] "::"
               [email protected]
                 [email protected]
@@ -42,7 +43,8 @@ [email protected]
             [email protected]
               [email protected]
                 [email protected]
-                  [email protected] "crate"
+                  [email protected]
+                    [email protected] "crate"
               [email protected] "::"
               [email protected]
                 [email protected]