From e7ce3f9457cef58565d7ba959e27c7bb53240ffe Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Wed, 14 Mar 2018 11:46:45 -0700
Subject: [PATCH] useNonAdjustedEndPosition when replacing import node (#22517)

* useNonAdjustedEndPosition when replacing import node

* Never adjust positions, and add trivia test
---
 src/services/codefixes/useDefaultImport.ts           | 2 +-
 tests/cases/fourslash/codeFixUseDefaultImport.ts     | 6 +++---
 tests/cases/fourslash/codeFixUseDefaultImport_all.ts | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/services/codefixes/useDefaultImport.ts b/src/services/codefixes/useDefaultImport.ts
index bd0797953b9..909601ab306 100644
--- a/src/services/codefixes/useDefaultImport.ts
+++ b/src/services/codefixes/useDefaultImport.ts
@@ -38,6 +38,6 @@ namespace ts.codefix {
     }
 
     function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, info: Info): void {
-        changes.replaceNode(sourceFile, info.importNode, makeImportDeclaration(info.name, /*namedImports*/ undefined, info.moduleSpecifier));
+        changes.replaceNode(sourceFile, info.importNode, makeImportDeclaration(info.name, /*namedImports*/ undefined, info.moduleSpecifier), textChanges.useNonAdjustedPositions);
     }
 }
diff --git a/tests/cases/fourslash/codeFixUseDefaultImport.ts b/tests/cases/fourslash/codeFixUseDefaultImport.ts
index 74a71810005..103c1e08465 100644
--- a/tests/cases/fourslash/codeFixUseDefaultImport.ts
+++ b/tests/cases/fourslash/codeFixUseDefaultImport.ts
@@ -7,10 +7,10 @@
 ////export = x;
 
 // @Filename: /b.ts
-////import * as [|a|] from "./a";
+/////*com ment*/import * as [|a|] from "./a";/*tnem moc*/
 
 // @Filename: /c.ts
-////import [|a|] = require("./a");
+/////*com ment*/import [|a|] = require("./a");/*tnem moc*/
 
 // @Filename: /d.ts
 ////import "./a";
@@ -29,7 +29,7 @@ for (const file of ["/b.ts", "/c.ts"]) {
 
     verify.codeFix({
         description: "Convert to default import",
-        newFileContent: `import a from "./a";`,
+        newFileContent: `/*com ment*/import a from "./a";/*tnem moc*/`,
     });
 }
 
diff --git a/tests/cases/fourslash/codeFixUseDefaultImport_all.ts b/tests/cases/fourslash/codeFixUseDefaultImport_all.ts
index 0d02eb9b389..d3f82d7ed02 100644
--- a/tests/cases/fourslash/codeFixUseDefaultImport_all.ts
+++ b/tests/cases/fourslash/codeFixUseDefaultImport_all.ts
@@ -13,6 +13,7 @@
 goTo.file("/b.ts");
 verify.codeFixAll({
     fixId: "useDefaultImport",
-    // TODO: GH#22337
-    newFileContent: `import a1 from "./a";import a2 from "./a";`,
+    newFileContent:
+`import a1 from "./a";
+import a2 from "./a";`,
 });