Fix parsing of < after object literals with the jsx plugin (#14557)

fix: manipulate state.canStartJSXElement before eating braceR
babel · May 17, 2022 · 9156230 · 9156230
1 parent 4266fef
commit 9156230
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 19 deletions.
diff --git a/packages/babel-parser/src/plugins/jsx/index.js b/packages/babel-parser/src/plugins/jsx/index.js
@@ -353,6 +353,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       this.next(); // ellipsis
       node.expression = this.parseExpression();
       this.setContext(tc.j_oTag);
+      this.state.canStartJSXElement = true;
       this.expect(tt.braceR);
 
       return this.finishNode(node, "JSXSpreadChild");
@@ -383,6 +384,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         node.expression = expression;
       }
       this.setContext(previousContext);
+      this.state.canStartJSXElement = true;
       this.expect(tt.braceR);
 
       return this.finishNode(node, "JSXExpressionContainer");
@@ -398,6 +400,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
         this.expect(tt.ellipsis);
         node.argument = this.parseMaybeAssignAllowIn();
         this.setContext(tc.j_oTag);
+        this.state.canStartJSXElement = true;
         this.expect(tt.braceR);
         return this.finishNode(node, "JSXSpreadAttribute");
       }
@@ -413,8 +416,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       startLoc: Position,
     ): N.JSXOpeningElement {
       const node = this.startNodeAt(startPos, startLoc);
-      if (this.match(tt.jsxTagEnd)) {
-        this.expect(tt.jsxTagEnd);
+      if (this.eat(tt.jsxTagEnd)) {
         return this.finishNode(node, "JSXOpeningFragment");
       }
       node.name = this.jsxParseElementName();
@@ -441,8 +443,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
       startLoc: Position,
     ): N.JSXClosingElement {
       const node = this.startNodeAt(startPos, startLoc);
-      if (this.match(tt.jsxTagEnd)) {
-        this.expect(tt.jsxTagEnd);
+      if (this.eat(tt.jsxTagEnd)) {
         return this.finishNode(node, "JSXClosingFragment");
       }
       node.name = this.jsxParseElementName();

diff --git a/packages/babel-parser/src/tokenizer/types.js b/packages/babel-parser/src/tokenizer/types.js
@@ -142,7 +142,7 @@ export const tt: { [name: string]: TokenType } = {
   braceL: createToken("{", { beforeExpr, startsExpr }),
   braceBarL: createToken("{|", { beforeExpr, startsExpr }),
   braceHashL: createToken("#{", { beforeExpr, startsExpr }),
-  braceR: createToken("}", { beforeExpr }),
+  braceR: createToken("}"),
   braceBarR: createToken("|}"),
   parenL: createToken("(", { beforeExpr, startsExpr }),
   parenR: createToken(")"),

diff --git a/packages/babel-parser/test/fixtures/core/opts/private-name-tokens-true-babel-7/output.json b/packages/babel-parser/test/fixtures/core/opts/private-name-tokens-true-babel-7/output.json
@@ -124,7 +124,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/packages/babel-parser/test/fixtures/core/opts/private-name-tokens-true/output.json b/packages/babel-parser/test/fixtures/core/opts/private-name-tokens-true/output.json
@@ -105,7 +105,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/...rser/test/fixtures/flow/typecasts/fail-without-parens-jsx-tokens-true-babel-7/output.json b/...rser/test/fixtures/flow/typecasts/fail-without-parens-jsx-tokens-true-babel-7/output.json
@@ -234,7 +234,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/...babel-parser/test/fixtures/flow/typecasts/fail-without-parens-jsx-tokens-true/output.json b/...babel-parser/test/fixtures/flow/typecasts/fail-without-parens-jsx-tokens-true/output.json
@@ -226,7 +226,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/packages/babel-parser/test/fixtures/jsx/regression/issue-14552/input.js b/packages/babel-parser/test/fixtures/jsx/regression/issue-14552/input.js
@@ -0,0 +1 @@
+({}<x)
diff --git a/packages/babel-parser/test/fixtures/jsx/regression/issue-14552/options.json b/packages/babel-parser/test/fixtures/jsx/regression/issue-14552/options.json
@@ -0,0 +1,3 @@
+{
+  "plugins": ["jsx"]
+}
diff --git a/packages/babel-parser/test/fixtures/jsx/regression/issue-14552/output.json b/packages/babel-parser/test/fixtures/jsx/regression/issue-14552/output.json
@@ -0,0 +1,36 @@
+{
+  "type": "File",
+  "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}},
+  "program": {
+    "type": "Program",
+    "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}},
+    "sourceType": "script",
+    "interpreter": null,
+    "body": [
+      {
+        "type": "ExpressionStatement",
+        "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}},
+        "expression": {
+          "type": "BinaryExpression",
+          "start":1,"end":5,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":5,"index":5}},
+          "left": {
+            "type": "ObjectExpression",
+            "start":1,"end":3,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":3,"index":3}},
+            "properties": []
+          },
+          "operator": "<",
+          "right": {
+            "type": "Identifier",
+            "start":4,"end":5,"loc":{"start":{"line":1,"column":4,"index":4},"end":{"line":1,"column":5,"index":5},"identifierName":"x"},
+            "name": "x"
+          },
+          "extra": {
+            "parenthesized": true,
+            "parenStart": 0
+          }
+        }
+      }
+    ],
+    "directives": []
+  }
+}
diff --git a/packages/babel-parser/test/fixtures/tokens/record-and-tuple-babel-7/brace-hash/output.json b/packages/babel-parser/test/fixtures/tokens/record-and-tuple-babel-7/brace-hash/output.json
@@ -37,7 +37,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/packages/babel-parser/test/fixtures/tokens/record-and-tuple/brace-hash/output.json b/packages/babel-parser/test/fixtures/tokens/record-and-tuple/brace-hash/output.json
@@ -37,7 +37,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/packages/babel-parser/test/fixtures/tokens/template-string-babel-7/basic/output.json b/packages/babel-parser/test/fixtures/tokens/template-string-babel-7/basic/output.json
@@ -145,7 +145,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,
@@ -207,7 +207,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/packages/babel-parser/test/fixtures/tokens/template-string-babel-7/invalid-octal/output.json b/packages/babel-parser/test/fixtures/tokens/template-string-babel-7/invalid-octal/output.json
@@ -212,7 +212,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,
@@ -274,7 +274,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/...test/fixtures/tokens/template-string-babel-7/invalid-unicode-escape-codepoint/output.json b/...test/fixtures/tokens/template-string-babel-7/invalid-unicode-escape-codepoint/output.json
@@ -212,7 +212,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,
@@ -274,7 +274,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/...arser/test/fixtures/typescript/type-alias/generic-complex-tokens-true-babel-7/output.json b/...arser/test/fixtures/typescript/type-alias/generic-complex-tokens-true-babel-7/output.json
@@ -260,7 +260,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,

diff --git a/.../babel-parser/test/fixtures/typescript/type-alias/generic-complex-tokens-true/output.json b/.../babel-parser/test/fixtures/typescript/type-alias/generic-complex-tokens-true/output.json
@@ -254,7 +254,7 @@
     {
       "type": {
         "label": "}",
-        "beforeExpr": true,
+        "beforeExpr": false,
         "startsExpr": false,
         "rightAssociative": false,
         "isLoop": false,