From 0a75cc2926a322c74cce977db2437b117192877e Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 15 Aug 2014 15:32:43 -0700
Subject: [PATCH] Emit comments for if statement

---
 src/compiler/emitter.ts                              | 5 -----
 tests/baselines/reference/commentOnIfStatement1.js   | 1 +
 tests/baselines/reference/ifDoWhileStatements.js     | 1 +
 tests/baselines/reference/importNonExternalModule.js | 1 +
 tests/baselines/reference/literals-negative.js       | 1 +
 tests/baselines/reference/voidAsOperator.js          | 1 +
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index 025935f5de..12ed9a1727 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -924,10 +924,6 @@ module ts {
             }
 
             function emitIfStatement(node: IfStatement) {
-                // emit comments only if this is not else if statement as else if will take care of emitting the leading/trailing comments
-                if (node.parent.kind !== SyntaxKind.IfStatement || (<IfStatement>node.parent).elseStatement !== node) {
-                    emitLeadingComments(node);
-                }
                 emitLeadingComments(node);
                 var endPos = emitToken(SyntaxKind.IfKeyword, node.pos);
                 write(" ");
@@ -937,7 +933,6 @@ module ts {
                 emitEmbeddedStatement(node.thenStatement);
                 if (node.elseStatement) {
                     writeLine();
-                    emitLeadingComments(node.elseStatement);
                     emitToken(SyntaxKind.ElseKeyword, node.thenStatement.end);
                     if (node.elseStatement.kind === SyntaxKind.IfStatement) {
                         write(" ");
diff --git a/tests/baselines/reference/commentOnIfStatement1.js b/tests/baselines/reference/commentOnIfStatement1.js
index 4ac6b22d01..521bc6ff1b 100644
--- a/tests/baselines/reference/commentOnIfStatement1.js
+++ b/tests/baselines/reference/commentOnIfStatement1.js
@@ -5,5 +5,6 @@ if (true) {
 }
 
 //// [commentOnIfStatement1.js]
+// Test
 if (true) {
 }
diff --git a/tests/baselines/reference/ifDoWhileStatements.js b/tests/baselines/reference/ifDoWhileStatements.js
index 13db187c7d..613cbf6f4e 100644
--- a/tests/baselines/reference/ifDoWhileStatements.js
+++ b/tests/baselines/reference/ifDoWhileStatements.js
@@ -218,6 +218,7 @@ var N;
     }
     N.F2 = F2;
 })(N || (N = {}));
+// literals
 if (true) {
 }
 while (true) {
diff --git a/tests/baselines/reference/importNonExternalModule.js b/tests/baselines/reference/importNonExternalModule.js
index 9cdf1a6b94..002c1da7df 100644
--- a/tests/baselines/reference/importNonExternalModule.js
+++ b/tests/baselines/reference/importNonExternalModule.js
@@ -20,6 +20,7 @@ var foo;
 })(foo || (foo = {}));
 //// [foo_1.js]
 define(["require", "exports", "./foo_0"], function (require, exports, foo) {
+    // Import should fail.  foo_0 not an external module
     if (foo.answer === 42) {
     }
 });
diff --git a/tests/baselines/reference/literals-negative.js b/tests/baselines/reference/literals-negative.js
index 8dafcf0287..c0c9624e6f 100644
--- a/tests/baselines/reference/literals-negative.js
+++ b/tests/baselines/reference/literals-negative.js
@@ -19,5 +19,6 @@ var s = (null);
 var b = (n);
 function isVoid() {
 }
+// Expected error: Values of type null and void cannot be compared
 if (null === isVoid()) {
 }
diff --git a/tests/baselines/reference/voidAsOperator.js b/tests/baselines/reference/voidAsOperator.js
index 027e7dd823..ce4b78abf3 100644
--- a/tests/baselines/reference/voidAsOperator.js
+++ b/tests/baselines/reference/voidAsOperator.js
@@ -12,5 +12,6 @@ if (!null !== true) {
 //// [voidAsOperator.js]
 if (!void 0 !== true) {
 }
+//CHECK#2
 if (!null !== true) {
 }