From 4d779bfbd555fc220e2cc202a154b08b2cb53ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Sat, 28 Dec 2019 23:02:49 -0500 Subject: [PATCH] refactor: remove unecessary trailing comma record --- packages/babel-parser/src/parser/expression.ts | 7 +++---- .../output.json | 3 --- .../basic/call-expression-trailing-comma/output.json | 3 --- .../fixtures/es2017/trailing-function-commas/1/output.json | 3 --- .../fixtures/es2017/trailing-function-commas/5/output.json | 3 --- .../dynamic-import/invalid-trailing-comma/output.json | 3 --- .../trailing-comma-dynamic/output.json | 6 ------ .../import-assertions/trailing-comma-dynamic/output.json | 6 ------ .../trailing-comma-dynamic/output.json | 6 ------ .../import-attributes/trailing-comma-dynamic/output.json | 6 ------ .../module-attributes/trailing-comma/output.json | 6 ------ 11 files changed, 3 insertions(+), 49 deletions(-) diff --git a/packages/babel-parser/src/parser/expression.ts b/packages/babel-parser/src/parser/expression.ts index 8301791d04b0..ddc3eda645f8 100644 --- a/packages/babel-parser/src/parser/expression.ts +++ b/packages/babel-parser/src/parser/expression.ts @@ -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, ); } @@ -1008,7 +1007,7 @@ export default abstract class ExpressionParser extends LValParser { close: TokenType, dynamicImport?: boolean, allowPlaceholder?: boolean, - nodeForExtra?: N.Node | null, + nodeForExtra?: Undone | null, refExpressionErrors?: ExpressionErrors | null, ): Array { const elts: N.Expression[] = []; @@ -2075,7 +2074,7 @@ export default abstract class ExpressionParser extends LValParser { return this.finishNode(node, type); } - addTrailingCommaExtraToNode(node: N.Node): void { + addTrailingCommaExtraToNode(node: Undone): void { this.addExtra(node, "trailingComma", this.state.lastTokStart); this.addExtra(node, "trailingCommaLoc", this.state.lastTokStartLoc, false); } diff --git a/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json b/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json index 5e5cfab65df8..c154cdfbf133 100644 --- a/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json +++ b/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma-object-shorthand/output.json @@ -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", diff --git a/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma/output.json b/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma/output.json index e3df550ec597..2e22b7a378ea 100644 --- a/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma/output.json +++ b/packages/babel-parser/test/fixtures/comments/basic/call-expression-trailing-comma/output.json @@ -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", 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 index 6d0c4427fd2f..3198458b4e0a 100644 --- 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,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", 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 index cd4d6c7fd3f6..fcd59b92aed9 100644 --- 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,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 ] 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 index 6bf99acd2b58..96eb7e1caffd 100644 --- 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,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", diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions-with-keyword/trailing-comma-dynamic/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions-with-keyword/trailing-comma-dynamic/output.json index c532394181e4..042210c2ba97 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-assertions-with-keyword/trailing-comma-dynamic/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions-with-keyword/trailing-comma-dynamic/output.json @@ -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", @@ -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", diff --git a/packages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json b/packages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json index e484d6873f0f..9cb1b2c3510b 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-assertions/trailing-comma-dynamic/output.json @@ -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", @@ -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", diff --git a/packages/babel-parser/test/fixtures/experimental/import-attributes-deprecatedAssertKeyword/trailing-comma-dynamic/output.json b/packages/babel-parser/test/fixtures/experimental/import-attributes-deprecatedAssertKeyword/trailing-comma-dynamic/output.json index e484d6873f0f..9cb1b2c3510b 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-attributes-deprecatedAssertKeyword/trailing-comma-dynamic/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-attributes-deprecatedAssertKeyword/trailing-comma-dynamic/output.json @@ -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", @@ -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", diff --git a/packages/babel-parser/test/fixtures/experimental/import-attributes/trailing-comma-dynamic/output.json b/packages/babel-parser/test/fixtures/experimental/import-attributes/trailing-comma-dynamic/output.json index c532394181e4..042210c2ba97 100644 --- a/packages/babel-parser/test/fixtures/experimental/import-attributes/trailing-comma-dynamic/output.json +++ b/packages/babel-parser/test/fixtures/experimental/import-attributes/trailing-comma-dynamic/output.json @@ -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", @@ -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", diff --git a/packages/babel-parser/test/fixtures/experimental/module-attributes/trailing-comma/output.json b/packages/babel-parser/test/fixtures/experimental/module-attributes/trailing-comma/output.json index c532394181e4..042210c2ba97 100644 --- a/packages/babel-parser/test/fixtures/experimental/module-attributes/trailing-comma/output.json +++ b/packages/babel-parser/test/fixtures/experimental/module-attributes/trailing-comma/output.json @@ -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", @@ -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",