From ff061a1b934406a41f0fe5f3d95be5fae5793743 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Fri, 17 Mar 2017 14:56:04 -0700
Subject: [PATCH] consolidate edits

---
 ...sDoesntImplementInheritedAbstractMember.ts |  2 +-
 .../fixClassIncorrectlyImplementsInterface.ts |  4 ++--
 src/services/codefixes/helpers.ts             | 21 ++++++++++++++-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
index 513853e4614..62f89b1a21a 100644
--- a/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
+++ b/src/services/codefixes/fixClassDoesntImplementInheritedAbstractMember.ts
@@ -31,7 +31,7 @@ namespace ts.codefix {
 
             const newNodes = createMissingMemberNodes(classDeclaration, abstractAndNonPrivateExtendsSymbols, checker);
             const changes = newNodesToChanges(newNodes, getOpenBraceOfClassLike(classDeclaration, sourceFile), context);
-            if(changes && changes.length > 0) {
+            if (changes && changes.length > 0) {
                 return [{
                     description: getLocaleSpecificMessage(Diagnostics.Implement_inherited_abstract_class),
                     changes
diff --git a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
index de34676eda0..365fd358011 100644
--- a/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
+++ b/src/services/codefixes/fixClassIncorrectlyImplementsInterface.ts
@@ -45,13 +45,13 @@ namespace ts.codefix {
 
         function createAndAddMissingIndexSignatureDeclaration(type: InterfaceType, kind: IndexKind, hasIndexSigOfKind: boolean, newNodes: Node[]): void {
             if (hasIndexSigOfKind) {
-                return undefined;
+                return;
             }
 
             const indexInfoOfKind = checker.getIndexInfoOfType(type, kind);
 
             if (!indexInfoOfKind) {
-                return undefined;
+                return;
             }
             const newIndexSignatureDeclaration = checker.createIndexSignatureFromIndexInfo(indexInfoOfKind, kind, classDeclaration);
             newNodes.push(newIndexSignatureDeclaration);
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
index 2d1d76ac8a6..4a9ee25228f 100644
--- a/src/services/codefixes/helpers.ts
+++ b/src/services/codefixes/helpers.ts
@@ -3,17 +3,28 @@ namespace ts.codefix {
 
     export function newNodesToChanges(newNodes: Node[], insertAfter: Node, context: CodeFixContext) {
         const sourceFile = context.sourceFile;
-        if (!(newNodes)) {
-            throw new Error("newNodesToChanges expects an array");
-        }
 
         const changeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
 
         for (const newNode of newNodes) {
             changeTracker.insertNodeAfter(sourceFile, insertAfter, newNode, { suffix: context.newLineCharacter });
         }
-        // TODO (aozgaa): concatenate changes into a single change.
-        return changeTracker.getChanges();
+
+        const changes = changeTracker.getChanges();
+        if (!(changes && changes.length > 0)) {
+            return changes;
+        }
+
+        Debug.assert(changes.length === 1);
+        const consolidatedChanges: FileTextChanges[] = [{
+            fileName: changes[0].fileName,
+            textChanges: [{
+                span: changes[0].textChanges[0].span,
+                newText: changes[0].textChanges.reduce((prev, cur) => prev + cur.newText, "")
+            }]
+
+        }]
+        return consolidatedChanges;
     }
 
     /**