importFixes: Fix bug by using replaceNode and removing changeIdentifierToPropertyAccess (microsoft#21898)

Andy · web-flow · commit 458c12fa78a2 · 2018-02-12T13:05:40.000-08:00
diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
@@ -637,7 +637,7 @@ namespace ts.codefix {
          * become "ns.foo"
          */
         const changes = ChangeTracker.with(context, tracker =>
-            tracker.changeIdentifierToPropertyAccess(sourceFile, namespacePrefix, symbolToken));
+            tracker.replaceNode(sourceFile, symbolToken, createPropertyAccess(createIdentifier(namespacePrefix), symbolToken)));
         return createCodeAction(Diagnostics.Change_0_to_1, [symbolName, `${namespacePrefix}.${symbolName}`], changes);
     }
 
diff --git a/src/services/textChanges.ts b/src/services/textChanges.ts
@@ -344,11 +344,6 @@ namespace ts.textChanges {
             this.replaceRange(sourceFile, { pos, end: pos }, createToken(modifier), { suffix: " " });
         }
 
-        public changeIdentifierToPropertyAccess(sourceFile: SourceFile, prefix: string, node: Identifier): void {
-            const pos = getAdjustedStartPosition(sourceFile, node, {}, Position.Start);
-            this.replaceRange(sourceFile, { pos, end: pos }, createPropertyAccess(createIdentifier(prefix), ""), {});
-        }
-
         private getOptionsForInsertNodeBefore(before: Node, doubleNewlines: boolean): ChangeNodeOptions {
             if (isStatement(before) || isClassElement(before)) {
                 return { suffix: doubleNewlines ? this.newLineCharacter + this.newLineCharacter : this.newLineCharacter };
diff --git a/tests/cases/fourslash/importNameCodeFixIndentedIdentifier.ts b/tests/cases/fourslash/importNameCodeFixIndentedIdentifier.ts
@@ -0,0 +1,22 @@
+/// <reference path="fourslash.ts" />
+
+// @Filename: /a.ts
+////[|import * as b from "./b";
+////{
+////    x/**/
+////}|]
+
+// @Filename: /b.ts
+////export const x = 0;
+
+verify.importFixAtPosition([
+`import * as b from "./b";
+{
+    b.x
+}`,
+`import * as b from "./b";
+import { x } from "./b";
+{
+    x
+}`,
+]);

Original file line number	Diff line number	Diff line change
`@@ -637,7 +637,7 @@ namespace ts.codefix {`
`637`	`637`	`* become "ns.foo"`
`638`	`638`	`*/`
`639`	`639`	`const changes = ChangeTracker.with(context, tracker =>`
`640`		`- tracker.changeIdentifierToPropertyAccess(sourceFile, namespacePrefix, symbolToken));`
	`640`	`+ tracker.replaceNode(sourceFile, symbolToken, createPropertyAccess(createIdentifier(namespacePrefix), symbolToken)));`
`641`	`641`	return createCodeAction(Diagnostics.Change_0_to_1, [symbolName, `${namespacePrefix}.${symbolName}`], changes);
`642`	`642`	`}`
`643`	`643`