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]>

1 files changed, 8 insertions, 6 deletions

diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 4ac1d6334..700994e80 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -192,9 +192,8 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
     //    1,
     //    2,
     // ];
-    attributes::outer_attributes(p);
+    attributes::with_outer_attributes(p, |p| expr(p).0);
 
-    expr(p);
     if p.eat(T![;]) {
         expr(p);
         p.expect(T![']']);
@@ -212,12 +211,15 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
         //    #[cfg(test)]
         //    2,
         // ];
-        attributes::outer_attributes(p);
-        if !p.at_ts(EXPR_FIRST) {
-            p.error("expected expression");
+        if !attributes::with_outer_attributes(p, |p| {
+            if !p.at_ts(EXPR_FIRST) {
+                p.error("expected expression");
+                return None;
+            }
+            expr(p).0
+        }) {
             break;
         }
-        expr(p);
     }
     p.expect(T![']']);
     m.complete(p, ARRAY_EXPR)