Skip to content

Commit e7ce3f9

Browse files
author
Andy
authored
useNonAdjustedEndPosition when replacing import node (#22517)
* useNonAdjustedEndPosition when replacing import node * Never adjust positions, and add trivia test
1 parent 6efc679 commit e7ce3f9

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/services/codefixes/useDefaultImport.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ namespace ts.codefix {
3838
}
3939

4040
function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, info: Info): void {
41-
changes.replaceNode(sourceFile, info.importNode, makeImportDeclaration(info.name, /*namedImports*/ undefined, info.moduleSpecifier));
41+
changes.replaceNode(sourceFile, info.importNode, makeImportDeclaration(info.name, /*namedImports*/ undefined, info.moduleSpecifier), textChanges.useNonAdjustedPositions);
4242
}
4343
}

tests/cases/fourslash/codeFixUseDefaultImport.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
////export = x;
88

99
// @Filename: /b.ts
10-
////import * as [|a|] from "./a";
10+
/////*com ment*/import * as [|a|] from "./a";/*tnem moc*/
1111

1212
// @Filename: /c.ts
13-
////import [|a|] = require("./a");
13+
/////*com ment*/import [|a|] = require("./a");/*tnem moc*/
1414

1515
// @Filename: /d.ts
1616
////import "./a";
@@ -29,7 +29,7 @@ for (const file of ["/b.ts", "/c.ts"]) {
2929

3030
verify.codeFix({
3131
description: "Convert to default import",
32-
newFileContent: `import a from "./a";`,
32+
newFileContent: `/*com ment*/import a from "./a";/*tnem moc*/`,
3333
});
3434
}
3535

tests/cases/fourslash/codeFixUseDefaultImport_all.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
goTo.file("/b.ts");
1414
verify.codeFixAll({
1515
fixId: "useDefaultImport",
16-
// TODO: GH#22337
17-
newFileContent: `import a1 from "./a";import a2 from "./a";`,
16+
newFileContent:
17+
`import a1 from "./a";
18+
import a2 from "./a";`,
1819
});

0 commit comments

Comments
 (0)