Merge pull request microsoft#29556 from fuafa/trailing-comma

RyanCavanaugh · web-flow · commit d782a546a5e5 · 2019-01-24T10:20:26.000-08:00
fix trailing comma should not allowed in dynamic import argument
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -31178,7 +31178,7 @@ namespace ts {
             if (nodeArguments.length !== 1) {
                 return grammarErrorOnNode(node, Diagnostics.Dynamic_import_must_have_one_specifier_as_an_argument);
             }
-
+            checkGrammarForDisallowedTrailingComma(nodeArguments);
             // see: parseArgumentOrArrayLiteralElement...we use this function which parse arguments of callExpression to parse specifier for dynamic import.
             // parseArgumentOrArrayLiteralElement allows spread element to be in an argument list which is not allowed as specifier in dynamic import.
             if (isSpreadElement(nodeArguments[0])) {
diff --git a/tests/baselines/reference/dynamicImportTrailingComma.errors.txt b/tests/baselines/reference/dynamicImportTrailingComma.errors.txt
@@ -0,0 +1,8 @@
+tests/cases/compiler/dynamicImportTrailingComma.ts(2,12): error TS1009: Trailing comma not allowed.
+
+
+==== tests/cases/compiler/dynamicImportTrailingComma.ts (1 errors) ====
+    const path = './foo';
+    import(path,);
+               ~
+!!! error TS1009: Trailing comma not allowed.
diff --git a/tests/baselines/reference/dynamicImportTrailingComma.js b/tests/baselines/reference/dynamicImportTrailingComma.js
@@ -0,0 +1,7 @@
+//// [dynamicImportTrailingComma.ts]
+const path = './foo';
+import(path,);
+
+//// [dynamicImportTrailingComma.js]
+var path = './foo';
+Promise.resolve().then(function () { return require(path); });
diff --git a/tests/baselines/reference/dynamicImportTrailingComma.symbols b/tests/baselines/reference/dynamicImportTrailingComma.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/dynamicImportTrailingComma.ts ===
+const path = './foo';
+>path : Symbol(path, Decl(dynamicImportTrailingComma.ts, 0, 5))
+
+import(path,);
+>path : Symbol(path, Decl(dynamicImportTrailingComma.ts, 0, 5))
+
diff --git a/tests/baselines/reference/dynamicImportTrailingComma.types b/tests/baselines/reference/dynamicImportTrailingComma.types
@@ -0,0 +1,9 @@
+=== tests/cases/compiler/dynamicImportTrailingComma.ts ===
+const path = './foo';
+>path : "./foo"
+>'./foo' : "./foo"
+
+import(path,);
+>import(path,) : Promise<any>
+>path : "./foo"
+
diff --git a/tests/cases/compiler/dynamicImportTrailingComma.ts b/tests/cases/compiler/dynamicImportTrailingComma.ts
@@ -0,0 +1,4 @@
+// @skipLibCheck: true
+// @lib: es6
+const path = './foo';
+import(path,);

Original file line number	Diff line number	Diff line change
`@@ -31178,7 +31178,7 @@ namespace ts {`
`31178`	`31178`	`if (nodeArguments.length !== 1) {`
`31179`	`31179`	`return grammarErrorOnNode(node, Diagnostics.Dynamic_import_must_have_one_specifier_as_an_argument);`
`31180`	`31180`	`}`
`31181`		`-`
	`31181`	`+ checkGrammarForDisallowedTrailingComma(nodeArguments);`
`31182`	`31182`	`// see: parseArgumentOrArrayLiteralElement...we use this function which parse arguments of callExpression to parse specifier for dynamic import.`
`31183`	`31183`	`// parseArgumentOrArrayLiteralElement allows spread element to be in an argument list which is not allowed as specifier in dynamic import.`
`31184`	`31184`	`if (isSpreadElement(nodeArguments[0])) {`