From 89f2af17f07e2c70bd00468d5139c3d854f80f0e Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Tue, 17 Jul 2018 13:34:56 -0700
Subject: [PATCH] Avoid using old node in import fix to use namespace import
 (#25729)

---
 src/services/codefixes/importFixes.ts                     | 2 +-
 tests/cases/fourslash/importNameCodeFixExistingImport2.ts | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/services/codefixes/importFixes.ts b/src/services/codefixes/importFixes.ts
index a745ef02fd4..38a8ab78418 100644
--- a/src/services/codefixes/importFixes.ts
+++ b/src/services/codefixes/importFixes.ts
@@ -482,7 +482,7 @@ namespace ts.codefix {
     }
 
     function addNamespaceQualifier(changes: textChanges.ChangeTracker, sourceFile: SourceFile, { namespacePrefix, symbolToken }: FixUseNamespaceImport): void {
-        changes.replaceNode(sourceFile, symbolToken, createPropertyAccess(createIdentifier(namespacePrefix), symbolToken));
+        changes.replaceNode(sourceFile, symbolToken, createPropertyAccess(createIdentifier(namespacePrefix), createIdentifier(symbolToken.text)));
     }
 
     interface ImportsCollection {
diff --git a/tests/cases/fourslash/importNameCodeFixExistingImport2.ts b/tests/cases/fourslash/importNameCodeFixExistingImport2.ts
index dbf34f4389e..e4d4edf6e0e 100644
--- a/tests/cases/fourslash/importNameCodeFixExistingImport2.ts
+++ b/tests/cases/fourslash/importNameCodeFixExistingImport2.ts
@@ -1,7 +1,8 @@
 /// <reference path="fourslash.ts" />
 
-//// [|import * as ns from "./module";
-//// f1/*0*/();|]
+////import * as ns from "./module";
+////// Comment
+////f1/*0*/();
 
 // @Filename: module.ts
 //// export function f1() {}
@@ -9,8 +10,10 @@
 
 verify.importFixAtPosition([
 `import * as ns from "./module";
+// Comment
 ns.f1();`,
 `import * as ns from "./module";
 import { f1 } from "./module";
+// Comment
 f1();`,
 ]);