From 686fd1e62d0ac8ed06a77029821a9bcf21329a48 Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Wed, 4 Oct 2017 11:23:58 -0700
Subject: [PATCH 1/2] Fix whitespace around inserted static property

Fixes #18743
---
 src/services/codefixes/fixAddMissingMember.ts     | 2 +-
 tests/cases/fourslash/codeFixAddMissingMember5.ts | 5 +++--
 tests/cases/fourslash/codeFixAddMissingMember7.ts | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index a9583106fc6..9aba4c37f68 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -92,7 +92,7 @@ namespace ts.codefix {
                     classDeclarationSourceFile,
                     classDeclaration,
                     staticInitialization,
-                    { suffix: context.newLineCharacter });
+                    { prefix: context.newLineCharacter, suffix: context.newLineCharacter });
                 const initializeStaticAction = {
                     description: formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Initialize_static_property_0), [tokenName]),
                     changes: staticInitializationChangeTracker.getChanges()
diff --git a/tests/cases/fourslash/codeFixAddMissingMember5.ts b/tests/cases/fourslash/codeFixAddMissingMember5.ts
index 804a3910a8c..562c4a10f21 100644
--- a/tests/cases/fourslash/codeFixAddMissingMember5.ts
+++ b/tests/cases/fourslash/codeFixAddMissingMember5.ts
@@ -13,11 +13,12 @@
 verify.codeFix({
     description: "Initialize static property 'foo'.",
     index: 0,
-    // TODO: GH#18743 and GH#18445
+    // TODO: GH#18445
     newFileContent: `class C {
     static method() {
         ()=>{ this.foo === 10 };
     }
-}C.foo = undefined;\r
+}\r
+C.foo = undefined;\r
 `
 });
diff --git a/tests/cases/fourslash/codeFixAddMissingMember7.ts b/tests/cases/fourslash/codeFixAddMissingMember7.ts
index 4ed9c9293d7..014ab6102dd 100644
--- a/tests/cases/fourslash/codeFixAddMissingMember7.ts
+++ b/tests/cases/fourslash/codeFixAddMissingMember7.ts
@@ -11,9 +11,10 @@
 verify.codeFix({
     description: "Initialize static property 'foo'.",
     index: 2,
-    // TODO: GH#18743 and GH#18445
+    // TODO: GH#18445
     newFileContent: `class C {
     static p = ()=>{ this.foo === 10 };
-}C.foo = undefined;\r
+}\r
+C.foo = undefined;\r
 `
 });

From 4cf289e1a57b7ff32d73efc7d9b36b932df926ec Mon Sep 17 00:00:00 2001
From: Andrew Casey <andrew.casey@microsoft.com>
Date: Wed, 4 Oct 2017 11:26:41 -0700
Subject: [PATCH 2/2] Fix whitespace around inserted property initializer

Fixes #18741
---
 src/services/codefixes/fixAddMissingMember.ts     | 6 +++---
 tests/cases/fourslash/codeFixAddMissingMember4.ts | 7 +++----
 tests/cases/fourslash/codeFixAddMissingMember6.ts | 7 +++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
index 9aba4c37f68..19bd592b7a7 100644
--- a/src/services/codefixes/fixAddMissingMember.ts
+++ b/src/services/codefixes/fixAddMissingMember.ts
@@ -112,11 +112,11 @@ namespace ts.codefix {
                     createIdentifier("undefined")));
 
                 const propertyInitializationChangeTracker = textChanges.ChangeTracker.fromContext(context);
-                propertyInitializationChangeTracker.insertNodeAt(
+                propertyInitializationChangeTracker.insertNodeBefore(
                     classDeclarationSourceFile,
-                    classConstructor.body.getEnd() - 1,
+                    classConstructor.body.getLastToken(),
                     propertyInitialization,
-                    { prefix: context.newLineCharacter, suffix: context.newLineCharacter });
+                    { suffix: context.newLineCharacter });
 
                 const initializeAction = {
                     description: formatStringFromArgs(getLocaleSpecificMessage(Diagnostics.Initialize_property_0_in_the_constructor), [tokenName]),
diff --git a/tests/cases/fourslash/codeFixAddMissingMember4.ts b/tests/cases/fourslash/codeFixAddMissingMember4.ts
index cfbec8977f6..a17b777ae5f 100644
--- a/tests/cases/fourslash/codeFixAddMissingMember4.ts
+++ b/tests/cases/fourslash/codeFixAddMissingMember4.ts
@@ -15,12 +15,11 @@
 verify.codeFix({
     description: "Initialize property 'foo' in the constructor.",
     index: 0,
-    // TODO: GH#18741 and GH#18445
+    // TODO: GH#18445
     newFileContent: `class C {
     constructor() {
-    \r
-this.foo = undefined;\r
-}
+        this.foo = undefined;\r
+    }
     method() {
         this.foo === 10;
     }
diff --git a/tests/cases/fourslash/codeFixAddMissingMember6.ts b/tests/cases/fourslash/codeFixAddMissingMember6.ts
index 2598014dde5..32525066657 100644
--- a/tests/cases/fourslash/codeFixAddMissingMember6.ts
+++ b/tests/cases/fourslash/codeFixAddMissingMember6.ts
@@ -13,12 +13,11 @@
 verify.codeFix({
     description: "Initialize property 'foo' in the constructor.",
     index: 0,
-    // TODO: GH#18741 and GH#18445
+    // TODO: GH#18445
     newFileContent: `class C {
     constructor() {
-    \r
-this.foo = undefined;\r
-}
+        this.foo = undefined;\r
+    }
     prop = ()=>{ this.foo === 10 };
 }`
 });