Skip to content

Commit

Permalink
Do not record trailing comma pos when maybeAsyncArrow: false (#10940)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JLHwung
JLHwung committed Aug 23, 2023
1 parent 0c8dfc1 commit c3f03f6
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 53 deletions.
12 changes: 4 additions & 8 deletions packages/babel-parser/src/parser/expression.ts
View file
Expand Up @@ -887,8 +887,7 @@ export default abstract class ExpressionParser extends LValParser {
tt.parenR,
base.type === "Import",
base.type !== "Super",
// @ts-expect-error todo(flow->ts)
node,
maybeAsyncArrow ? node : null,
refExpressionErrors,
);
}
Expand Down Expand Up @@ -1008,7 +1007,7 @@ export default abstract class ExpressionParser extends LValParser {
close: TokenType,
dynamicImport?: boolean,
allowPlaceholder?: boolean,
nodeForExtra?: N.Node | null,
nodeForExtra?: Undone<N.Node> | null,
refExpressionErrors?: ExpressionErrors | null,
): Array<N.Expression | undefined | null> {
const elts: N.Expression[] = [];
Expand Down Expand Up @@ -2029,10 +2028,7 @@ export default abstract class ExpressionParser extends LValParser {
} else {
this.expect(tt.comma);
if (this.match(close)) {
this.addTrailingCommaExtraToNode(
// @ts-expect-error todo(flow->ts) improve node types
node,
);
this.addTrailingCommaExtraToNode(node);
break;
}
}
Expand Down Expand Up @@ -2075,7 +2071,7 @@ export default abstract class ExpressionParser extends LValParser {
return this.finishNode(node, type);
}

addTrailingCommaExtraToNode(node: N.Node): void {
addTrailingCommaExtraToNode(node: Undone<N.Node>): void {
this.addExtra(node, "trailingComma", this.state.lastTokStart);
this.addExtra(node, "trailingCommaLoc", this.state.lastTokStartLoc, false);
}
Expand Down
3 changes: 0 additions & 3 deletions .../test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json
View file
Expand Up @@ -18,9 +18,6 @@
"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",
Expand Down
3 changes: 0 additions & 3 deletions ...ages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma/output.json
View file
Expand Up @@ -18,9 +18,6 @@
"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",
Expand Down
3 changes: 0 additions & 3 deletions packages/babel-parser/test/fixtures/es2017/trailing-function-commas/1/output.json
View file
Expand Up @@ -18,9 +18,6 @@
"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",
Expand Down
3 changes: 0 additions & 3 deletions packages/babel-parser/test/fixtures/es2017/trailing-function-commas/5/output.json
View file
Expand Up @@ -21,9 +21,6 @@
"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
]
Expand Down
3 changes: 0 additions & 3 deletions packages/babel-parser/test/fixtures/es2020/dynamic-import/invalid-trailing-comma/output.json
View file
Expand Up @@ -20,9 +20,6 @@
"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",
Expand Down
6 changes: 0 additions & 6 deletions ...t/fixtures/experimental/import-assertions-with-keyword/trailing-comma-dynamic/output.json
View file
Expand Up @@ -17,9 +17,6 @@
"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",
Expand All @@ -43,9 +40,6 @@
"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",
Expand Down
6 changes: 0 additions & 6 deletions ...el-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json
View file
Expand Up @@ -17,9 +17,6 @@
"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",
Expand All @@ -43,9 +40,6 @@
"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",
Expand Down
6 changes: 0 additions & 6 deletions ...experimental/import-attributes-deprecatedAssertKeyword/trailing-comma-dynamic/output.json
View file
Expand Up @@ -17,9 +17,6 @@
"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",
Expand All @@ -43,9 +40,6 @@
"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",
Expand Down
6 changes: 0 additions & 6 deletions ...el-parser/test/fixtures/experimental/import-attributes/trailing-comma-dynamic/output.json
View file
Expand Up @@ -17,9 +17,6 @@
"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",
Expand All @@ -43,9 +40,6 @@
"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",
Expand Down
6 changes: 0 additions & 6 deletions ...ages/babel-parser/test/fixtures/experimental/module-attributes/trailing-comma/output.json
View file
Expand Up @@ -17,9 +17,6 @@
"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",
Expand All @@ -43,9 +40,6 @@
"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",
Expand Down

0 comments on commit c3f03f6

Please sign in to comment.