Throw unexpected for different binary match pattern operators at the …

…same level
babel · Sep 3, 2021 · 04cb052 · 04cb052
1 parent 5078ace
commit 04cb052
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/packages/babel-parser/src/parser/error-message.js b/packages/babel-parser/src/parser/error-message.js
@@ -77,6 +77,8 @@ export const ErrorMessages = makeErrorTemplates(
     ImportCallNotNewExpression: "Cannot use new with import(...).",
     ImportCallSpreadArgument: "`...` is not allowed in `import()`.",
     InvalidBigIntLiteral: "Invalid BigIntLiteral.",
+    InvalidBinaryMatchPattern:
+      "Different binary match pattern operators cannot be at the same level.",
     InvalidCodePoint: "Code point out of bounds.",
     InvalidDecimal: "Invalid decimal.",
     InvalidDigit: "Expected number in radix %0.",

diff --git a/packages/babel-parser/src/parser/expression.js b/packages/babel-parser/src/parser/expression.js
@@ -3082,14 +3082,20 @@ export default class ExpressionParser extends LValParser {
     return this.finishNode(node, "UnaryExpression");
   }
 
-  parseMaybeBinaryMatchPattern(): N.BinaryMatchPattern | N.MatchPattern {
+  parseMaybeBinaryMatchPattern(
+    previousOp?: "and" | "or",
+  ): N.BinaryMatchPattern | N.MatchPattern {
     const node = this.startNode<N.BinaryMatchPattern>();
     const lhs = this.parseMatchPattern();
     if (this.match(tt.bitwiseOR) || this.match(tt.bitwiseAND)) {
+      const operator = this.match(tt.bitwiseOR) ? "or" : "and";
+      if (previousOp && previousOp !== operator) {
+        this.unexpected(this.state.start, Errors.InvalidBinaryMatchPattern);
+      }
+      this.next(); // skip "or" or "and"
       node.left = lhs;
-      node.operator = this.match(tt.bitwiseOR) ? "or" : "and";
-      this.next();
-      node.right = this.parseMaybeBinaryMatchPattern();
+      node.operator = operator;
+      node.right = this.parseMaybeBinaryMatchPattern(operator);
       return this.finishNode(node, "BinaryMatchPattern");
     } else {
       return lhs;

diff --git a/...-parser/test/fixtures/experimental/pattern-matching/invalid-binary-match-pattern/input.js b/...-parser/test/fixtures/experimental/pattern-matching/invalid-binary-match-pattern/input.js
@@ -0,0 +1,3 @@
+match (x) {
+  when ({ v: 200 | 300 & 400 }) {}
+}
diff --git a/...ser/test/fixtures/experimental/pattern-matching/invalid-binary-match-pattern/options.json b/...ser/test/fixtures/experimental/pattern-matching/invalid-binary-match-pattern/options.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    [
+      "patternMatching"
+    ]
+  ],
+  "throws": "Different binary match pattern operators cannot be at the same level. (2:23)"
+}