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, 22 insertions, 0 deletions

diff --git a/crates/ra_parser/src/grammar/attributes.rs b/crates/ra_parser/src/grammar/attributes.rs
index f3158ade3..eeae37aef 100644
--- a/crates/ra_parser/src/grammar/attributes.rs
+++ b/crates/ra_parser/src/grammar/attributes.rs
@@ -8,6 +8,28 @@ pub(super) fn inner_attributes(p: &mut Parser) {
     }
 }
 
+pub(super) fn with_outer_attributes(
+    p: &mut Parser,
+    f: impl Fn(&mut Parser) -> Option<CompletedMarker>,
+) -> bool {
+    let am = p.start();
+    let has_attrs = p.at(T![#]);
+    attributes::outer_attributes(p);
+    let cm = f(p);
+    let success = cm.is_some();
+
+    match (has_attrs, cm) {
+        (true, Some(cm)) => {
+            let kind = cm.kind();
+            cm.undo_completion(p).abandon(p);
+            am.complete(p, kind);
+        }
+        _ => am.abandon(p),
+    }
+
+    success
+}
+
 pub(super) fn outer_attributes(p: &mut Parser) {
     while p.at(T![#]) {
         attribute(p, false)