convertFunctionToEs6Class: Combine deletes and deletedNodes (microsoft#22742)

Andy · web-flow · commit b6b51a4d3826 · 2018-03-22T08:22:00.000-07:00
diff --git a/src/services/codefixes/convertFunctionToEs6Class.ts b/src/services/codefixes/convertFunctionToEs6Class.ts
@@ -13,8 +13,7 @@ namespace ts.codefix {
     });
 
     function doChange(changes: textChanges.ChangeTracker, sourceFile: SourceFile, position: number, checker: TypeChecker): void {
-        const deletedNodes: Node[] = [];
-        const deletes: (() => void)[] = [];
+        const deletedNodes: { node: Node, inList: boolean }[] = [];
         const ctorSymbol = checker.getSymbolAtLocation(getTokenAtPosition(sourceFile, position, /*includeJsDocComment*/ false));
 
         if (!ctorSymbol || !(ctorSymbol.flags & (SymbolFlags.Function | SymbolFlags.Variable))) {
@@ -53,21 +52,19 @@ namespace ts.codefix {
 
         // Because the preceding node could be touched, we need to insert nodes before delete nodes.
         changes.insertNodeAfter(sourceFile, precedingNode, newClassDeclaration);
-        for (const deleteCallback of deletes) {
-            deleteCallback();
-        }
-
-        function deleteNode(node: Node, inList = false) {
-            if (deletedNodes.some(n => isNodeDescendantOf(node, n))) {
-                // Parent node has already been deleted; do nothing
-                return;
-            }
-            deletedNodes.push(node);
+        for (const { node, inList } of deletedNodes) {
             if (inList) {
-                deletes.push(() => changes.deleteNodeInList(sourceFile, node));
+                changes.deleteNodeInList(sourceFile, node);
             }
             else {
-                deletes.push(() => changes.deleteNode(sourceFile, node));
+                changes.deleteNode(sourceFile, node);
+            }
+        }
+
+        function deleteNode(node: Node, inList = false) {
+            // If parent node has already been deleted, do nothing
+            if (!deletedNodes.some(n => isNodeDescendantOf(node, n.node))) {
+                deletedNodes.push({ node, inList });
             }
         }
 
