PR Feedback

rbuckton · rbuckton · commit 150cecbaf37b · 2016-05-19T15:39:45.000-07:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -2174,8 +2174,8 @@ namespace ts {
                 // A GetAccessor or SetAccessor is ES5 syntax.
                 excludeFlags = TransformFlags.MethodOrAccessorExcludes;
 
-                // A GetAccessor or SetAccessor is TypeScript syntax if it is either abstract,
-                // or has a decorator.
+                // A GetAccessor or SetAccessor is TypeScript syntax if it has async or abstract
+                // modifiers, or has a decorator.
                 if ((<AccessorDeclaration>node).body === undefined
                     || hasModifier(node, ModifierFlags.Async | ModifierFlags.Abstract)
                     || subtreeFlags & TransformFlags.ContainsDecorators) {
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -1176,9 +1176,6 @@ namespace ts {
             const right = getMutableClone(node.right, emitOptions && clone(emitOptions));
             return createPropertyAccess(left, right, /*location*/ node, emitOptions && clone(emitOptions));
         }
-        else if (isIdentifier(node)) {
-            return getMutableClone(node, emitOptions && clone(emitOptions));
-        }
         else {
             return getMutableClone(node, emitOptions && clone(emitOptions));
         }
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
@@ -228,9 +228,7 @@ namespace ts {
             if (hasModifier(node, ModifierFlags.Ambient) && isStatement(node)) {
                 // TypeScript ambient declarations are elided, but some comments may be preserved.
                 // See the implementation of `getLeadingComments` in comments.ts for more details.
-                return isStatement(node)
-                    ? createNotEmittedStatement(node)
-                    : undefined;
+                return createNotEmittedStatement(node);
             }
 
             switch (node.kind) {
@@ -430,16 +428,19 @@ namespace ts {
 
             const constructor = getFirstConstructorWithBody(node);
             if (constructor) {
-                for (const parameter of constructor.parameters) {
-                    if (parameter.decorators && parameter.decorators.length > 0) {
-                        return true;
-                    }
-                }
+                return forEach(constructor.parameters, shouldEmitDecorateCallForParameter);
             }
 
             return false;
         }
 
+        /**
+         * Tests whether we should emit a __decorate call for a parameter declaration.
+         */
+        function shouldEmitDecorateCallForParameter(parameter: ParameterDeclaration) {
+            return parameter.decorators !== undefined && parameter.decorators.length > 0;
+        }
+
         /**
          * Transforms a class declaration with TypeScript syntax into compatible ES6.
          *

Original file line number	Diff line number	Diff line change
`@@ -1176,9 +1176,6 @@ namespace ts {`
`1176`	`1176`	`const right = getMutableClone(node.right, emitOptions && clone(emitOptions));`
`1177`	`1177`	`return createPropertyAccess(left, right, /location/ node, emitOptions && clone(emitOptions));`
`1178`	`1178`	`}`
`1179`		`- else if (isIdentifier(node)) {`
`1180`		`- return getMutableClone(node, emitOptions && clone(emitOptions));`
`1181`		`- }`
`1182`	`1179`	`else {`
`1183`	`1180`	`return getMutableClone(node, emitOptions && clone(emitOptions));`
`1184`	`1181`	`}`