From 692f6c425e10740438c4614acfe6aa887a35c560 Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Tue, 13 Mar 2018 14:42:45 -0700 Subject: [PATCH 1/2] useNonAdjustedEndPosition when replacing import node --- src/services/codefixes/useDefaultImport.ts | 2 +- tests/cases/fourslash/codeFixUseDefaultImport_all.ts | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/services/codefixes/useDefaultImport.ts b/src/services/codefixes/useDefaultImport.ts index bd0797953b96a..e230f8739a7d4 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), { useNonAdjustedEndPosition: true }); } } diff --git a/tests/cases/fourslash/codeFixUseDefaultImport_all.ts b/tests/cases/fourslash/codeFixUseDefaultImport_all.ts index 0d02eb9b38996..d3f82d7ed020b 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";`, }); From 51f0b39c74a0853779f635b917f9152bfef53cda Mon Sep 17 00:00:00 2001 From: Andy Hanson Date: Wed, 14 Mar 2018 11:13:53 -0700 Subject: [PATCH 2/2] Never adjust positions, and add trivia test --- src/services/codefixes/useDefaultImport.ts | 2 +- tests/cases/fourslash/codeFixUseDefaultImport.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/services/codefixes/useDefaultImport.ts b/src/services/codefixes/useDefaultImport.ts index e230f8739a7d4..909601ab3068b 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), { useNonAdjustedEndPosition: true }); + 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 74a7181000572..103c1e084650d 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*/`, }); }