2 files changed, 11 insertions, 2 deletions

diff --git a/crates/libsyntax2/src/grammar/expressions/atom.rs b/crates/libsyntax2/src/grammar/expressions/atom.rs
index f8b50b355..2536bac80 100644
--- a/crates/libsyntax2/src/grammar/expressions/atom.rs
+++ b/crates/libsyntax2/src/grammar/expressions/atom.rs
@@ -140,9 +140,14 @@ fn array_expr(p: &mut Parser) -> CompletedMarker {
     }
     while !p.at(EOF) && !p.at(R_BRACK) {
         p.expect(COMMA);
-        if !p.at(R_BRACK) {
-            expr(p);
+        if p.at(R_BRACK) {
+            break;
+        }
+        if !EXPR_FIRST.contains(p.current()) {
+            p.error("expected expression");
+            break;
         }
+        expr(p);
     }
     p.expect(R_BRACK);
     m.complete(p, ARRAY_EXPR)
diff --git a/crates/libsyntax2/src/grammar/expressions/mod.rs b/crates/libsyntax2/src/grammar/expressions/mod.rs
index 9379ed938..f7b9f7086 100644
--- a/crates/libsyntax2/src/grammar/expressions/mod.rs
+++ b/crates/libsyntax2/src/grammar/expressions/mod.rs
@@ -376,6 +376,10 @@ fn arg_list(p: &mut Parser) {
     let m = p.start();
     p.bump();
     while !p.at(R_PAREN) && !p.at(EOF) {
+        if !EXPR_FIRST.contains(p.current()) {
+            p.error("expected expression");
+            break;
+        }
         expr(p);
         if !p.at(R_PAREN) && !p.expect(COMMA) {
             break;