Cherry-pick PR #40273 into release-4.0 (#40303)

Component commits: 2c0e01a Fix misplaced comma in auto imported specifier Co-authored-by: Andrew Branch <[email protected]>
microsoft · Sep 15, 2020 · 65b84e7 · 65b84e7
1 parent 3e7a8e7
commit 65b84e7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -700,7 +700,7 @@ namespace ts.codefix {
             }
             else if (existingSpecifiers?.length) {
                 for (const spec of newSpecifiers) {
-                    changes.insertNodeAtEndOfList(sourceFile, existingSpecifiers, spec);
+                    changes.insertNodeInListAfter(sourceFile, last(existingSpecifiers), spec, existingSpecifiers);
                 }
             }
             else {

diff --git a/tests/cases/fourslash/importNameCodeFix_trailingComma.ts b/tests/cases/fourslash/importNameCodeFix_trailingComma.ts
@@ -0,0 +1,24 @@
+/// <reference path="fourslash.ts" />
+
+// Bug #40219 only happens when existing import specifiers are unsorted.
+
+// @Filename: index.ts
+//// import {
+////   T2,
+////   T1,
+//// } from "./types";
+////
+//// const x: T3/**/
+
+// @Filename: types.ts
+//// export type T1 = 0;
+//// export type T2 = 0;
+//// export type T3 = 0;
+
+verify.importFixAtPosition([`import {
+  T2,
+  T1,
+  T3,
+} from "./types";
+
+const x: T3`]);