From 5030d0f468f7dcfd4bbc2f0031e9787e933ef5b6 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 1 Jun 2017 10:49:08 -0700
Subject: [PATCH] Use factory for all fixes

---
 src/services/codefixes/fixAddMissingMember.ts | 37 ++++++++++++-------
 .../fourslash/codeFixAddMissingMember5.ts     |  6 ++-
 .../fourslash/codeFixAddMissingMember7.ts     |  6 ++-
 3 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index 358c2255789..0859500e2d2 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -82,15 +82,19 @@ namespace ts.codefix {
 
                 const className = classDeclaration.name.getText();
 
+                const staticInitialization = createStatement(createAssignment(
+                    createPropertyAccess(createIdentifier(className), tokenName),
+                    createIdentifier("undefined")));
+
+                const staticInitializationChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+                staticInitializationChangeTracker.insertNodeAfter(
+                    classDeclarationSourceFile,
+                    classDeclaration,
+                    staticInitialization,
+                    { suffix: context.newLineCharacter });
                 const initializeStaticAction = {
                     description: formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Initialize_static_property_0), [tokenName]),
-                    changes: [{
-                        fileName: classDeclarationSourceFile.fileName,
-                        textChanges: [{
-                            span: { start: classDeclaration.getEnd(), length: 0 },
-                            newText: `${context.newLineCharacter}${className}.${tokenName} = undefined;${context.newLineCharacter}`
-                        }]
-                    }]
+                    changes: staticInitializationChangeTracker.getChanges()
                 };
 
                 (actions || (actions = [])).push(initializeStaticAction);
@@ -102,15 +106,20 @@ namespace ts.codefix {
                     return actions;
                 }
 
+                const propertyInitialization = createStatement(createAssignment(
+                    createPropertyAccess(createThis(), tokenName),
+                    createIdentifier("undefined")));
+
+                const propertyInitializationChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
+                propertyInitializationChangeTracker.insertNodeAt(
+                    classDeclarationSourceFile,
+                    classConstructor.body.getEnd() - 1,
+                    propertyInitialization,
+                    { prefix: context.newLineCharacter, suffix: context.newLineCharacter });
+
                 const initializeAction = {
                     description: formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Initialize_property_0_in_the_constructor), [tokenName]),
-                    changes: [{
-                        fileName: classDeclarationSourceFile.fileName,
-                        textChanges: [{
-                            span: { start: classConstructor.body.getEnd() - 1, length: 0 },
-                            newText: `this.${tokenName} = undefined;${context.newLineCharacter}`
-                        }]
-                    }]
+                    changes: propertyInitializationChangeTracker.getChanges()
                 };
 
                 (actions || (actions = [])).push(initializeAction);
diff --git a/tests/cases/fourslash/codeFixAddMissingMember5.ts b/tests/cases/fourslash/codeFixAddMissingMember5.ts
index cbabc0ba6c5..53d47e9a8d3 100644
--- a/tests/cases/fourslash/codeFixAddMissingMember5.ts
+++ b/tests/cases/fourslash/codeFixAddMissingMember5.ts
@@ -11,9 +11,11 @@
 ////}
 ////|]
 
-verify.rangeAfterCodeFix(`class C {
+verify.applyCodeFix(/*errorCode*/ undefined, /*index*/ 0);
+verify.currentFileContentIs(`class C {
     static method() {
         ()=>{ this.foo === 10 };
     }
 }
-C.foo = undefined;`, /*includeWhiteSpace*/false, /*errorCode*/ undefined, /*index*/ 0);
\ No newline at end of file
+C.foo = undefined;
+`);
\ No newline at end of file
diff --git a/tests/cases/fourslash/codeFixAddMissingMember7.ts b/tests/cases/fourslash/codeFixAddMissingMember7.ts
index 0e937a3ab6e..04c3efc86b8 100644
--- a/tests/cases/fourslash/codeFixAddMissingMember7.ts
+++ b/tests/cases/fourslash/codeFixAddMissingMember7.ts
@@ -9,7 +9,9 @@
 ////}
 ////|]
 
-verify.rangeAfterCodeFix(`class C {
+verify.applyCodeFix(/*errorCode*/ undefined, /*index*/ 2)
+verify.currentFileContentIs(`class C {
     static p = ()=>{ this.foo === 10 };
 }
-C.foo = undefined;`, /*includeWhiteSpace*/false, /*errorCode*/ undefined, /*index*/ 2);
\ No newline at end of file
+C.foo = undefined;
+`);