Fix issue with emit flag reset in param initializers.

rbuckton · rbuckton · commit 80224d2deccb · 2016-05-16T09:43:24.000-07:00
diff --git a/src/compiler/transformer.ts b/src/compiler/transformer.ts
@@ -210,7 +210,12 @@ namespace ts {
          * Sets flags that control emit behavior of a node.
          */
         function setNodeEmitFlags<T extends Node>(node: T, flags: NodeEmitFlags) {
-            getEmitOptions(node, /*create*/ true).flags = flags;
+            const options = getEmitOptions(node, /*create*/ true);
+            if (flags & NodeEmitFlags.Merge) {
+                flags = options.flags | (flags & ~NodeEmitFlags.Merge);
+            }
+
+            options.flags = flags;
             return node;
         }
 
diff --git a/src/compiler/transformers/es6.ts b/src/compiler/transformers/es6.ts
@@ -959,7 +959,7 @@ namespace ts {
                         createStatement(
                             createAssignment(
                                 setNodeEmitFlags(getMutableClone(name), NodeEmitFlags.NoSourceMap),
-                                setNodeEmitFlags(visitNode(initializer, visitor, isExpression), NodeEmitFlags.NoSourceMap),
+                                setNodeEmitFlags(visitNode(initializer, visitor, isExpression), NodeEmitFlags.NoSourceMap | NodeEmitFlags.Merge),
                                 /*location*/ parameter
                             )
                         )

Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ namespace ts {`
`959`	`959`	`createStatement(`
`960`	`960`	`createAssignment(`
`961`	`961`	`setNodeEmitFlags(getMutableClone(name), NodeEmitFlags.NoSourceMap),`
`962`		`- setNodeEmitFlags(visitNode(initializer, visitor, isExpression), NodeEmitFlags.NoSourceMap),`
	`962`	`+ setNodeEmitFlags(visitNode(initializer, visitor, isExpression), NodeEmitFlags.NoSourceMap \| NodeEmitFlags.Merge),`
`963`	`963`	`/location/ parameter`
`964`	`964`	`)`
`965`	`965`	`)`