Merge branch 'transforms-transformer' into transforms-printer

rbuckton · rbuckton · commit 75b2181e17c8 · 2016-02-23T15:41:14.000-08:00
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
@@ -502,8 +502,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) {

Original file line number	Diff line number	Diff line change
`@@ -502,8 +502,8 @@ namespace ts {`
`502`	`502`	`return node;`
`503`	`503`	`}`
`504`	`504`
`505`		`- if (lift !== undefined && visited !== undefined && isNodeArrayNode(visited)) {`
`506`		`- visited = lift((<NodeArrayNode<Node>>visited).nodes);`
	`505`	`+ if (visited !== undefined && isNodeArrayNode(visited)) {`
	`506`	`+ visited = (lift \|\| extractSingleNode)((<NodeArrayNode<Node>>visited).nodes);`
`507`	`507`	`}`
`508`	`508`
`509`	`509`	`if (parenthesize !== undefined && visited !== undefined) {`