3 files changed, 30 insertions, 33 deletions

diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs
index 22f64a9f4..a46e11e1d 100644
--- a/crates/ra_parser/src/grammar.rs
+++ b/crates/ra_parser/src/grammar.rs
@@ -1,7 +1,7 @@
 //! This is the actual "grammar" of the Rust language.
 //!
 //! Each function in this module and its children corresponds
-//! to a production of the format grammar. Submodules roughly
+//! to a production of the formal grammar. Submodules roughly
 //! correspond to different *areas* of the grammar. By convention,
 //! each submodule starts with `use super::*` import and exports
 //! "public" productions via `pub(super)`.
diff --git a/crates/ra_parser/src/grammar/expressions.rs b/crates/ra_parser/src/grammar/expressions.rs
index 95564b602..a31a7a08d 100644
--- a/crates/ra_parser/src/grammar/expressions.rs
+++ b/crates/ra_parser/src/grammar/expressions.rs
@@ -14,9 +14,9 @@ pub(super) enum StmtWithSemi {
 
 const EXPR_FIRST: TokenSet = LHS_FIRST;
 
-pub(super) fn expr(p: &mut Parser) -> BlockLike {
+pub(super) fn expr(p: &mut Parser) -> (Option<CompletedMarker>, BlockLike) {
     let r = Restrictions { forbid_structs: false, prefer_stmt: false };
-    expr_bp(p, r, 1).1
+    expr_bp(p, r, 1)
 }
 
 pub(super) fn expr_stmt(p: &mut Parser) -> (Option<CompletedMarker>, BlockLike) {
diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 4ac1d6334..a98a2a3ef 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -181,45 +181,42 @@ fn tuple_expr(p: &mut Parser) -> CompletedMarker {
 fn array_expr(p: &mut Parser) -> CompletedMarker {
     assert!(p.at(T!['[']));
     let m = p.start();
-    p.bump(T!['[']);
-    if p.eat(T![']']) {
-        return m.complete(p, ARRAY_EXPR);
-    }
 
-    // test first_array_member_attributes
-    // pub const A: &[i64] = &[
-    //    #[cfg(test)]
-    //    1,
-    //    2,
-    // ];
-    attributes::outer_attributes(p);
+    let mut n_exprs = 0u32;
+    let mut has_semi = false;
 
-    expr(p);
-    if p.eat(T![;]) {
-        expr(p);
-        p.expect(T![']']);
-        return m.complete(p, ARRAY_EXPR);
-    }
+    p.bump(T!['[']);
     while !p.at(EOF) && !p.at(T![']']) {
-        p.expect(T![,]);
-        if p.at(T![']']) {
-            break;
-        }
+        n_exprs += 1;
 
-        // test subsequent_array_member_attributes
-        // pub const A: &[i64] = &[
-        //    1,
-        //    #[cfg(test)]
-        //    2,
-        // ];
+        // test array_attrs
+        // const A: &[i64] = &[1, #[cfg(test)] 2];
+        let m = p.start();
+        let has_attrs = p.at(T![#]);
         attributes::outer_attributes(p);
-        if !p.at_ts(EXPR_FIRST) {
-            p.error("expected expression");
+
+        let cm = expr(p).0;
+
+        match (has_attrs, cm) {
+            (true, Some(cm)) => {
+                let kind = cm.kind();
+                cm.undo_completion(p).abandon(p);
+                m.complete(p, kind);
+            }
+            _ => m.abandon(p),
+        }
+
+        if n_exprs == 1 && p.eat(T![;]) {
+            has_semi = true;
+            continue;
+        }
+
+        if has_semi || !p.at(T![']']) && !p.expect(T![,]) {
             break;
         }
-        expr(p);
     }
     p.expect(T![']']);
+
     m.complete(p, ARRAY_EXPR)
 }