Merge branch 'transforms-printer' into transforms-transformer-ts

rbuckton · rbuckton · commit 951ce55ded02 · 2016-02-23T15:41:28.000-08:00
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
@@ -503,8 +503,8 @@ namespace ts {
             return node;
         }
 
-        if (lift !== undefined && visited !== undefined && isNodeArrayNode(visited)) {
-            visited = lift((<NodeArrayNode<Node>>visited).nodes);
+        if (visited !== undefined && isNodeArrayNode(visited)) {
+            visited = (lift || extractSingleNode)((<NodeArrayNode<Node>>visited).nodes);
         }
 
         if (parenthesize !== undefined && visited !== undefined) {
@@ -856,26 +856,6 @@ namespace ts {
         return createNodeArray(concatenate(statements, declarations), /*location*/ statements);
     }
 
-    /**
-     * Tries to lift a NodeArrayNode to a Node. This is primarily used to
-     * lift multiple statements into a single Block.
-     *
-     * @param node The visited Node.
-     * @param options Options used to control lift behavior.
-     */
-    function liftNode(node: Node, lifter: (nodes: NodeArray<Node>) => Node): Node {
-        if (node === undefined) {
-            return undefined;
-        }
-        else if (isNodeArrayNode(node)) {
-            const lift = lifter || extractSingleNode;
-            return lift(node.nodes);
-        }
-        else {
-            return node;
-        }
-    }
-
     /**
      * Lifts a NodeArray containing only Statement nodes to a block.
      *
