Merge #2827

2827: Fix array element attribute position r=matklad a=edwin0cheng

This PR fixed a bug which an ATTR node insert in the wrong place in array element. ~~And introduce `precede_next` for allow outer attributes to insert into a parsed `expr`.~~  

related #2783

Co-authored-by: Edwin Cheng <[email protected]>

2 files changed, 28 insertions, 28 deletions

diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.txt b/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.txt
index 8f2e91bdf..2e3a13005 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0135_first_array_member_attributes.txt
@@ -27,20 +27,20 @@ SOURCE_FILE@[0; 56)
       ARRAY_EXPR@[23; 54)
         L_BRACK@[23; 24) "["
         WHITESPACE@[24; 28) "\n   "
-        ATTR@[28; 40)
-          POUND@[28; 29) "#"
-          L_BRACK@[29; 30) "["
-          PATH@[30; 33)
-            PATH_SEGMENT@[30; 33)
-              NAME_REF@[30; 33)
-                IDENT@[30; 33) "cfg"
-          TOKEN_TREE@[33; 39)
-            L_PAREN@[33; 34) "("
-            IDENT@[34; 38) "test"
-            R_PAREN@[38; 39) ")"
-          R_BRACK@[39; 40) "]"
-        WHITESPACE@[40; 44) "\n   "
-        LITERAL@[44; 45)
+        LITERAL@[28; 45)
+          ATTR@[28; 40)
+            POUND@[28; 29) "#"
+            L_BRACK@[29; 30) "["
+            PATH@[30; 33)
+              PATH_SEGMENT@[30; 33)
+                NAME_REF@[30; 33)
+                  IDENT@[30; 33) "cfg"
+            TOKEN_TREE@[33; 39)
+              L_PAREN@[33; 34) "("
+              IDENT@[34; 38) "test"
+              R_PAREN@[38; 39) ")"
+            R_BRACK@[39; 40) "]"
+          WHITESPACE@[40; 44) "\n   "
           INT_NUMBER@[44; 45) "1"
         COMMA@[45; 46) ","
         WHITESPACE@[46; 50) "\n   "
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.txt b/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.txt
index 41914eb8e..1bb8a0afc 100644
--- a/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.txt
+++ b/crates/ra_syntax/test_data/parser/inline/ok/0136_subsequent_array_member_attributes.txt
@@ -31,20 +31,20 @@ SOURCE_FILE@[0; 56)
           INT_NUMBER@[28; 29) "1"
         COMMA@[29; 30) ","
         WHITESPACE@[30; 34) "\n   "
-        ATTR@[34; 46)
-          POUND@[34; 35) "#"
-          L_BRACK@[35; 36) "["
-          PATH@[36; 39)
-            PATH_SEGMENT@[36; 39)
-              NAME_REF@[36; 39)
-                IDENT@[36; 39) "cfg"
-          TOKEN_TREE@[39; 45)
-            L_PAREN@[39; 40) "("
-            IDENT@[40; 44) "test"
-            R_PAREN@[44; 45) ")"
-          R_BRACK@[45; 46) "]"
-        WHITESPACE@[46; 50) "\n   "
-        LITERAL@[50; 51)
+        LITERAL@[34; 51)
+          ATTR@[34; 46)
+            POUND@[34; 35) "#"
+            L_BRACK@[35; 36) "["
+            PATH@[36; 39)
+              PATH_SEGMENT@[36; 39)
+                NAME_REF@[36; 39)
+                  IDENT@[36; 39) "cfg"
+            TOKEN_TREE@[39; 45)
+              L_PAREN@[39; 40) "("
+              IDENT@[40; 44) "test"
+              R_PAREN@[44; 45) ")"
+            R_BRACK@[45; 46) "]"
+          WHITESPACE@[46; 50) "\n   "
           INT_NUMBER@[50; 51) "2"
         COMMA@[51; 52) ","
         WHITESPACE@[52; 53) "\n"