Revert "Do not record trailing comma pos when maybeAsyncArrow: false (

#10940)" This reverts commit c3f03f6.
babel · Aug 28, 2023 · f8a00d6 · f8a00d6
1 parent e43d8e7
commit f8a00d6
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 4 deletions.
diff --git a/packages/babel-parser/src/parser/expression.ts b/packages/babel-parser/src/parser/expression.ts
@@ -887,7 +887,8 @@ export default abstract class ExpressionParser extends LValParser {
         tt.parenR,
         base.type === "Import",
         base.type !== "Super",
-        maybeAsyncArrow ? node : null,
+        // @ts-expect-error todo(flow->ts)
+        node,
         refExpressionErrors,
       );
     }
@@ -1007,7 +1008,7 @@ export default abstract class ExpressionParser extends LValParser {
     close: TokenType,
     dynamicImport?: boolean,
     allowPlaceholder?: boolean,
-    nodeForExtra?: Undone<N.Node> | null,
+    nodeForExtra?: N.Node | null,
     refExpressionErrors?: ExpressionErrors | null,
   ): Array<N.Expression | undefined | null> {
     const elts: N.Expression[] = [];
@@ -2028,7 +2029,10 @@ export default abstract class ExpressionParser extends LValParser {
       } else {
         this.expect(tt.comma);
         if (this.match(close)) {
-          this.addTrailingCommaExtraToNode(node);
+          this.addTrailingCommaExtraToNode(
+            // @ts-expect-error todo(flow->ts) improve node types
+            node,
+          );
           break;
         }
       }
@@ -2071,7 +2075,7 @@ export default abstract class ExpressionParser extends LValParser {
     return this.finishNode(node, type);
   }
 
-  addTrailingCommaExtraToNode(node: Undone<N.Node>): void {
+  addTrailingCommaExtraToNode(node: N.Node): void {
     this.addExtra(node, "trailingComma", this.state.lastTokStart);
     this.addExtra(node, "trailingCommaLoc", this.state.lastTokStartLoc, false);
   }

diff --git a/.../test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json b/.../test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json
@@ -18,6 +18,9 @@
             "start":0,"end":2,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":2,"index":2},"identifierName":"fn"},
             "name": "fn"
           },
+          "extra": {
+            "trailingComma": 11
+          },
           "arguments": [
             {
               "type": "Identifier",

diff --git a/...ages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma/output.json b/...ages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma/output.json
@@ -18,6 +18,9 @@
             "start":0,"end":2,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":2,"index":2},"identifierName":"fn"},
             "name": "fn"
           },
+          "extra": {
+            "trailingComma": 7
+          },
           "arguments": [
             {
               "type": "Identifier",

diff --git a/packages/babel-parser/test/fixtures/es2017/trailing-function-commas/1/output.json b/packages/babel-parser/test/fixtures/es2017/trailing-function-commas/1/output.json
@@ -18,6 +18,9 @@
             "start":0,"end":3,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":3,"index":3},"identifierName":"log"},
             "name": "log"
           },
+          "extra": {
+            "trailingComma": 13
+          },
           "arguments": [
             {
               "type": "Identifier",

diff --git a/packages/babel-parser/test/fixtures/es2017/trailing-function-commas/5/output.json b/packages/babel-parser/test/fixtures/es2017/trailing-function-commas/5/output.json
@@ -21,6 +21,9 @@
             "start":0,"end":3,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":3,"index":3},"identifierName":"log"},
             "name": "log"
           },
+          "extra": {
+            "trailingComma": 4
+          },
           "arguments": [
             null
           ]

diff --git a/packages/babel-parser/test/fixtures/es2020/dynamic-import/invalid-trailing-comma/output.json b/packages/babel-parser/test/fixtures/es2020/dynamic-import/invalid-trailing-comma/output.json
@@ -20,6 +20,9 @@
             "type": "Import",
             "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}}
           },
+          "extra": {
+            "trailingComma": 12
+          },
           "arguments": [
             {
               "type": "StringLiteral",

diff --git a/...t/fixtures/experimental/import-assertions-with-keyword/trailing-comma-dynamic/output.json b/...t/fixtures/experimental/import-assertions-with-keyword/trailing-comma-dynamic/output.json
@@ -17,6 +17,9 @@
             "type": "Import",
             "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}}
           },
+          "extra": {
+            "trailingComma": 15
+          },
           "arguments": [
             {
               "type": "StringLiteral",
@@ -40,6 +43,9 @@
             "type": "Import",
             "start":19,"end":25,"loc":{"start":{"line":2,"column":0,"index":19},"end":{"line":2,"column":6,"index":25}}
           },
+          "extra": {
+            "trailingComma": 64
+          },
           "arguments": [
             {
               "type": "StringLiteral",

diff --git a/...el-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json b/...el-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json
@@ -17,6 +17,9 @@
             "type": "Import",
             "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}}
           },
+          "extra": {
+            "trailingComma": 15
+          },
           "arguments": [
             {
               "type": "StringLiteral",
@@ -40,6 +43,9 @@
             "type": "Import",
             "start":19,"end":25,"loc":{"start":{"line":2,"column":0,"index":19},"end":{"line":2,"column":6,"index":25}}
           },
+          "extra": {
+            "trailingComma": 66
+          },
           "arguments": [
             {
               "type": "StringLiteral",

diff --git a/...experimental/import-attributes-deprecatedAssertKeyword/trailing-comma-dynamic/output.json b/...experimental/import-attributes-deprecatedAssertKeyword/trailing-comma-dynamic/output.json
@@ -17,6 +17,9 @@
             "type": "Import",
             "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}}
           },
+          "extra": {
+            "trailingComma": 15
+          },
           "arguments": [
             {
               "type": "StringLiteral",
@@ -40,6 +43,9 @@
             "type": "Import",
             "start":19,"end":25,"loc":{"start":{"line":2,"column":0,"index":19},"end":{"line":2,"column":6,"index":25}}
           },
+          "extra": {
+            "trailingComma": 66
+          },
           "arguments": [
             {
               "type": "StringLiteral",

diff --git a/...el-parser/test/fixtures/experimental/import-attributes/trailing-comma-dynamic/output.json b/...el-parser/test/fixtures/experimental/import-attributes/trailing-comma-dynamic/output.json
@@ -17,6 +17,9 @@
             "type": "Import",
             "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}}
           },
+          "extra": {
+            "trailingComma": 15
+          },
           "arguments": [
             {
               "type": "StringLiteral",
@@ -40,6 +43,9 @@
             "type": "Import",
             "start":19,"end":25,"loc":{"start":{"line":2,"column":0,"index":19},"end":{"line":2,"column":6,"index":25}}
           },
+          "extra": {
+            "trailingComma": 64
+          },
           "arguments": [
             {
               "type": "StringLiteral",

diff --git a/...ages/babel-parser/test/fixtures/experimental/module-attributes/trailing-comma/output.json b/...ages/babel-parser/test/fixtures/experimental/module-attributes/trailing-comma/output.json
@@ -17,6 +17,9 @@
             "type": "Import",
             "start":0,"end":6,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":6,"index":6}}
           },
+          "extra": {
+            "trailingComma": 15
+          },
           "arguments": [
             {
               "type": "StringLiteral",
@@ -40,6 +43,9 @@
             "type": "Import",
             "start":19,"end":25,"loc":{"start":{"line":2,"column":0,"index":19},"end":{"line":2,"column":6,"index":25}}
           },
+          "extra": {
+            "trailingComma": 64
+          },
           "arguments": [
             {
               "type": "StringLiteral",