From 9b3fccd5c4885fc88e40a14fac6fa761a8739cff Mon Sep 17 00:00:00 2001
From: Yui T <yuisu@microsoft.com>
Date: Mon, 16 Mar 2015 16:24:40 -0700
Subject: [PATCH] Address code review; Use for..of and use if-statement

---
 src/compiler/emitter.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 522679adb0a..4cae7d0749c 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -4706,14 +4706,11 @@ module ts {
             }
 
             function emitMemberFunctionsForES6AndHigher(node: ClassDeclaration) {
-                forEach(node.members, member => {
-                    if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) {
-                        if (!(<MethodDeclaration>member).body) {
-                            return emitPinnedOrTripleSlashComments(member);
-                        }
-
+                for (let member of node.members) {
+                    if ((member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature) && !(<MethodDeclaration>member).body) {
+                        emitPinnedOrTripleSlashComments(member);
                     }
-                    if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
+                    else if (member.kind === SyntaxKind.MethodDeclaration || node.kind === SyntaxKind.MethodSignature || member.kind === SyntaxKind.GetAccessor || member.kind === SyntaxKind.SetAccessor) {
                         writeLine();
                         emitLeadingComments(member);
                         emitStart(member);
@@ -4732,7 +4729,7 @@ module ts {
                         emitEnd(member);
                         emitTrailingComments(member);
                     }
-                });
+                }
             }
 
             function emitConstructor(node: ClassDeclaration, baseTypeNode: TypeReferenceNode) {
@@ -4822,7 +4819,12 @@ module ts {
                     if (baseTypeNode) {
                         writeLine();
                         emitStart(baseTypeNode);
-                        languageVersion < ScriptTarget.ES6 ? write("_super.apply(this, arguments);") : write("super(...args);");
+                        if (languageVersion < ScriptTarget.ES6) {
+                            write("_super.apply(this, arguments);");
+                        }
+                        else {
+                            write("super(...args);");
+                        }
                         emitEnd(baseTypeNode);
                     }
                 }