From 21439a470ddd7e6a467777c76f26cde82da79578 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 1 Sep 2016 18:41:03 -0700
Subject: [PATCH] Rebaseline tests to old emitter

---
 tests/baselines/reference/arrowFunctionErrorSpan.js         | 4 +---
 tests/baselines/reference/augmentExportEquals1.js           | 4 ++--
 tests/baselines/reference/augmentExportEquals1_1.js         | 4 ++--
 tests/baselines/reference/augmentExportEquals2.js           | 4 ++--
 tests/baselines/reference/augmentExportEquals2_1.js         | 4 ++--
 tests/baselines/reference/augmentedTypesExternalModule1.js  | 2 +-
 .../blockScopedFunctionDeclarationInStrictModule.js         | 2 +-
 tests/baselines/reference/callOverloads1.js                 | 2 +-
 tests/baselines/reference/callOverloads2.js                 | 2 +-
 tests/baselines/reference/callOverloads3.js                 | 2 +-
 tests/baselines/reference/callOverloads4.js                 | 2 +-
 tests/baselines/reference/callOverloads5.js                 | 2 +-
 tests/baselines/reference/collisionArgumentsFunction.js     | 1 -
 tests/baselines/reference/collisionRestParameterFunction.js | 1 -
 .../reference/collisionThisExpressionAndParameter.js        | 1 -
 tests/baselines/reference/commentInEmptyParameterList1.js   | 2 +-
 .../reference/commentOnParenthesizedExpressionOpenParen1.js | 2 +-
 .../reference/commentsArgumentsOfCallExpression2.js         | 2 +-
 tests/baselines/reference/commentsFunction.js               | 4 ++--
 tests/baselines/reference/commentsVarDecl.js                | 6 +++---
 tests/baselines/reference/computedPropertyNames48_ES5.js    | 4 ++--
 tests/baselines/reference/constructorOverloads1.js          | 4 ++--
 tests/baselines/reference/constructorOverloads2.js          | 4 ++--
 tests/baselines/reference/constructorOverloads3.js          | 2 +-
 .../baselines/reference/contextuallyTypingRestParameters.js | 4 ++--
 .../reference/declFileObjectLiteralWithAccessors.js         | 4 ++--
 .../reference/declFileObjectLiteralWithOnlyGetter.js        | 4 ++--
 .../reference/declFileObjectLiteralWithOnlySetter.js        | 4 ++--
 .../reference/es6ImportDefaultBindingWithExport.js          | 2 +-
 tests/baselines/reference/es6ImportNameSpaceImportDts.js    | 1 -
 .../reference/es6ImportNameSpaceImportNoNamedExports.js     | 1 -
 .../reference/es6ImportNamedImportIdentifiersParsing.js     | 1 -
 tests/baselines/reference/es6modulekindWithES5Target10.js   | 1 -
 .../exportSpecifierReferencingOuterDeclaration4.js          | 1 -
 tests/baselines/reference/genericConstraint3.js             | 1 -
 .../inheritedMembersAndIndexSignaturesFromDifferentBases.js | 1 -
 ...inheritedMembersAndIndexSignaturesFromDifferentBases2.js | 1 -
 .../inheritedStringIndexersFromDifferentBaseTypes.js        | 1 -
 .../inheritedStringIndexersFromDifferentBaseTypes2.js       | 1 -
 tests/baselines/reference/jsxInvalidEsprimaTestSuite.js     | 4 ++--
 .../reference/nonConflictingRecursiveBaseTypeMembers.js     | 1 -
 .../reference/objectTypesWithOptionalProperties2.js         | 3 ++-
 .../reference/parseRegularExpressionMixedWithComments.js    | 6 +++---
 .../reference/parserGreaterThanTokenAmbiguity10.js          | 1 -
 .../reference/parserGreaterThanTokenAmbiguity13.js          | 2 +-
 .../reference/parserGreaterThanTokenAmbiguity15.js          | 1 -
 .../reference/parserGreaterThanTokenAmbiguity18.js          | 2 +-
 .../reference/parserGreaterThanTokenAmbiguity20.js          | 1 -
 .../baselines/reference/parserGreaterThanTokenAmbiguity3.js | 2 +-
 .../baselines/reference/parserGreaterThanTokenAmbiguity5.js | 1 -
 .../baselines/reference/parserGreaterThanTokenAmbiguity8.js | 2 +-
 tests/baselines/reference/parserSkippedTokens5.js           | 2 +-
 tests/baselines/reference/parserSkippedTokens7.js           | 1 -
 tests/baselines/reference/parserSkippedTokens8.js           | 2 +-
 tests/baselines/reference/parserSkippedTokens9.js           | 1 -
 .../recursiveExportAssignmentAndFindAliasedType1.js         | 2 +-
 .../recursiveExportAssignmentAndFindAliasedType2.js         | 2 +-
 .../recursiveExportAssignmentAndFindAliasedType3.js         | 2 +-
 .../recursiveExportAssignmentAndFindAliasedType4.js         | 2 +-
 .../recursiveExportAssignmentAndFindAliasedType5.js         | 2 +-
 .../recursiveExportAssignmentAndFindAliasedType6.js         | 2 +-
 .../recursiveExportAssignmentAndFindAliasedType7.js         | 2 +-
 .../reference/thisInInvalidContextsExternalModule.js        | 2 +-
 tests/baselines/reference/tsxParseTests2.js                 | 2 +-
 .../reference/typeAliasDoesntMakeModuleInstantiated.js      | 1 -
 65 files changed, 62 insertions(+), 84 deletions(-)

diff --git a/tests/baselines/reference/arrowFunctionErrorSpan.js b/tests/baselines/reference/arrowFunctionErrorSpan.js
index 3ead7ed3b31..2557113e89b 100644
--- a/tests/baselines/reference/arrowFunctionErrorSpan.js
+++ b/tests/baselines/reference/arrowFunctionErrorSpan.js
@@ -83,9 +83,7 @@ f(// comment 1
 // comment 2
 function () {
     // comment 4
-}
- // comment 5
-);
+});
 // body is not a block
 f(function (_) { return 1 +
     2; });
diff --git a/tests/baselines/reference/augmentExportEquals1.js b/tests/baselines/reference/augmentExportEquals1.js
index 6f7aab92692..98322c01a34 100644
--- a/tests/baselines/reference/augmentExportEquals1.js
+++ b/tests/baselines/reference/augmentExportEquals1.js
@@ -32,5 +32,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a;
-}); // should not work
+    var a; // should not work
+});
diff --git a/tests/baselines/reference/augmentExportEquals1_1.js b/tests/baselines/reference/augmentExportEquals1_1.js
index 70239663441..08f032ff33f 100644
--- a/tests/baselines/reference/augmentExportEquals1_1.js
+++ b/tests/baselines/reference/augmentExportEquals1_1.js
@@ -29,5 +29,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a;
-}); // should not work
+    var a; // should not work
+});
diff --git a/tests/baselines/reference/augmentExportEquals2.js b/tests/baselines/reference/augmentExportEquals2.js
index b444c16b6fc..fc373173e3c 100644
--- a/tests/baselines/reference/augmentExportEquals2.js
+++ b/tests/baselines/reference/augmentExportEquals2.js
@@ -31,5 +31,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a;
-}); // should not work
+    var a; // should not work
+});
diff --git a/tests/baselines/reference/augmentExportEquals2_1.js b/tests/baselines/reference/augmentExportEquals2_1.js
index afa78d1d981..9046157bb26 100644
--- a/tests/baselines/reference/augmentExportEquals2_1.js
+++ b/tests/baselines/reference/augmentExportEquals2_1.js
@@ -29,5 +29,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a;
-}); // should not work
+    var a; // should not work
+});
diff --git a/tests/baselines/reference/augmentedTypesExternalModule1.js b/tests/baselines/reference/augmentedTypesExternalModule1.js
index 01358a9e4af..65525e8187e 100644
--- a/tests/baselines/reference/augmentedTypesExternalModule1.js
+++ b/tests/baselines/reference/augmentedTypesExternalModule1.js
@@ -13,4 +13,4 @@ define(["require", "exports"], function (require, exports) {
         c5.prototype.foo = function () { };
         return c5;
     }());
-}); // should be ok everywhere
+});
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
index 6d460158478..d1a8091871c 100644
--- a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js
@@ -14,4 +14,4 @@ define(["require", "exports"], function (require, exports) {
         foo(); // ok
     }
     return foo;
-}); // not ok
+});
diff --git a/tests/baselines/reference/callOverloads1.js b/tests/baselines/reference/callOverloads1.js
index d441deb41d7..756a9099e44 100644
--- a/tests/baselines/reference/callOverloads1.js
+++ b/tests/baselines/reference/callOverloads1.js
@@ -22,7 +22,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
+    Foo.prototype.bar1 = function () { };
     return Foo;
 }());
 function F1(a) { return a; }
diff --git a/tests/baselines/reference/callOverloads2.js b/tests/baselines/reference/callOverloads2.js
index 8db26c3b771..b890ee8bde9 100644
--- a/tests/baselines/reference/callOverloads2.js
+++ b/tests/baselines/reference/callOverloads2.js
@@ -30,7 +30,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
+    Foo.prototype.bar1 = function () { };
     return Foo;
 }());
 function F1(s) { return s; } // error
diff --git a/tests/baselines/reference/callOverloads3.js b/tests/baselines/reference/callOverloads3.js
index ee49f4b3297..e5d678543c6 100644
--- a/tests/baselines/reference/callOverloads3.js
+++ b/tests/baselines/reference/callOverloads3.js
@@ -23,7 +23,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
+    Foo.prototype.bar1 = function () { };
     return Foo;
 }());
 //class Foo(s: String);
diff --git a/tests/baselines/reference/callOverloads4.js b/tests/baselines/reference/callOverloads4.js
index fa7a51ae8d1..dfb274dfb6e 100644
--- a/tests/baselines/reference/callOverloads4.js
+++ b/tests/baselines/reference/callOverloads4.js
@@ -23,7 +23,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
+    Foo.prototype.bar1 = function () { };
     return Foo;
 }());
 var f1 = new Foo("hey");
diff --git a/tests/baselines/reference/callOverloads5.js b/tests/baselines/reference/callOverloads5.js
index d95485f85d7..cf159d309b0 100644
--- a/tests/baselines/reference/callOverloads5.js
+++ b/tests/baselines/reference/callOverloads5.js
@@ -24,7 +24,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function (a) { /*WScript.Echo(a);*/ };
+    Foo.prototype.bar1 = function (a) { };
     return Foo;
 }());
 //class Foo(s: String);
diff --git a/tests/baselines/reference/collisionArgumentsFunction.js b/tests/baselines/reference/collisionArgumentsFunction.js
index d59efc116ee..9ce4a5ab0e2 100644
--- a/tests/baselines/reference/collisionArgumentsFunction.js
+++ b/tests/baselines/reference/collisionArgumentsFunction.js
@@ -90,4 +90,3 @@ function f42(i) {
 function f4NoError(arguments) {
     var arguments; // No error
 }
- // no codegen no error
diff --git a/tests/baselines/reference/collisionRestParameterFunction.js b/tests/baselines/reference/collisionRestParameterFunction.js
index a9e3f510fa1..8660e8f5db0 100644
--- a/tests/baselines/reference/collisionRestParameterFunction.js
+++ b/tests/baselines/reference/collisionRestParameterFunction.js
@@ -63,4 +63,3 @@ function f4(_i) {
 }
 function f4NoError(_i) {
 }
- // no codegen no error
diff --git a/tests/baselines/reference/collisionThisExpressionAndParameter.js b/tests/baselines/reference/collisionThisExpressionAndParameter.js
index a445c35295b..bc15e4b56b5 100644
--- a/tests/baselines/reference/collisionThisExpressionAndParameter.js
+++ b/tests/baselines/reference/collisionThisExpressionAndParameter.js
@@ -167,4 +167,3 @@ function f3(_this) {
     var _this = this;
     (function (x) { console.log(_this.x); });
 }
- // no code gen - no error
diff --git a/tests/baselines/reference/commentInEmptyParameterList1.js b/tests/baselines/reference/commentInEmptyParameterList1.js
index 09b34f93536..8f4e13d82d6 100644
--- a/tests/baselines/reference/commentInEmptyParameterList1.js
+++ b/tests/baselines/reference/commentInEmptyParameterList1.js
@@ -3,5 +3,5 @@ function foo(/** nothing */) {
 }
 
 //// [commentInEmptyParameterList1.js]
-function foo( /** nothing */) {
+function foo() {
 }
diff --git a/tests/baselines/reference/commentOnParenthesizedExpressionOpenParen1.js b/tests/baselines/reference/commentOnParenthesizedExpressionOpenParen1.js
index 7a7c25a9b4c..d014043dfe0 100644
--- a/tests/baselines/reference/commentOnParenthesizedExpressionOpenParen1.js
+++ b/tests/baselines/reference/commentOnParenthesizedExpressionOpenParen1.js
@@ -7,4 +7,4 @@ var f: () => any;
 //// [commentOnParenthesizedExpressionOpenParen1.js]
 var j;
 var f;
-(/* Preserve */ j = f());
+(j = f());
diff --git a/tests/baselines/reference/commentsArgumentsOfCallExpression2.js b/tests/baselines/reference/commentsArgumentsOfCallExpression2.js
index f89e67ef3d8..a7065410ff4 100644
--- a/tests/baselines/reference/commentsArgumentsOfCallExpression2.js
+++ b/tests/baselines/reference/commentsArgumentsOfCallExpression2.js
@@ -14,7 +14,7 @@ foo(
 function foo(/*c1*/ x, /*d1*/ y, /*e1*/ w) { }
 var a, b;
 foo(/*c2*/ 1, /*d2*/ 1 + 2, /*e1*/ a + b);
-foo(/*c3*/ function () { }, /*d2*/ function () { }, /*e2*/ a + /*e3*/ b);
+foo(/*c3*/ function () { }, /*d2*/ function () { }, /*e2*/ a + b);
 foo(/*c3*/ function () { }, /*d3*/ function () { }, /*e3*/ (a + b));
 foo(
 /*c4*/ function () { }, 
diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js
index 86978d7bdf7..0ffb2714108 100644
--- a/tests/baselines/reference/commentsFunction.js
+++ b/tests/baselines/reference/commentsFunction.js
@@ -74,8 +74,8 @@ var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b) {
     return b;
 };
 /// lamdaFoo var comment
-var lambdaFoo = /** this is lambda comment*/ function (/**param a*/ a, /**param b*/ b) { return a + b; };
-var lambddaNoVarComment = /** this is lambda multiplication*/ function (/**param a*/ a, /**param b*/ b) { return a * b; };
+var lambdaFoo = function (/**param a*/ a, /**param b*/ b) { return a + b; };
+var lambddaNoVarComment = function (/**param a*/ a, /**param b*/ b) { return a * b; };
 lambdaFoo(10, 20);
 lambddaNoVarComment(10, 20);
 function blah(a /* multiline trailing comment
diff --git a/tests/baselines/reference/commentsVarDecl.js b/tests/baselines/reference/commentsVarDecl.js
index e9b6776a6d9..5ff2a3c1c6a 100644
--- a/tests/baselines/reference/commentsVarDecl.js
+++ b/tests/baselines/reference/commentsVarDecl.js
@@ -64,13 +64,13 @@ x = myVariable;
 /** jsdocstyle comment - only this comment should be in .d.ts file*/
 var n = 30;
 /** var deckaration with comment on type as well*/
-var y = /** value comment */ 20;
+var y = 20;
 /// var deckaration with comment on type as well
 var yy = 
 /// value comment
 20;
 /** comment2 */
-var z = /** lambda comment */ function (x, y) { return x + y; };
+var z = function (x, y) { return x + y; };
 var z2;
 var x2 = z2;
 var n4;
@@ -98,6 +98,6 @@ declare var y: number;
 declare var yy: number;
 /** comment2 */
 declare var z: (x: number, y: number) => number;
-declare var z2: /** type comment*/ (x: number) => string;
+declare var z2: (x: number) => string;
 declare var x2: (x: number) => string;
 declare var n4: (x: number) => string;
diff --git a/tests/baselines/reference/computedPropertyNames48_ES5.js b/tests/baselines/reference/computedPropertyNames48_ES5.js
index f2610b7272a..15123a98f30 100644
--- a/tests/baselines/reference/computedPropertyNames48_ES5.js
+++ b/tests/baselines/reference/computedPropertyNames48_ES5.js
@@ -34,5 +34,5 @@ extractIndexer((_b = {},
 extractIndexer((_c = {},
     _c["" || 0] = "",
     _c
-));
-var _a, _b, _c; // Should return any (widened form of undefined)
+)); // Should return any (widened form of undefined)
+var _a, _b, _c;
diff --git a/tests/baselines/reference/constructorOverloads1.js b/tests/baselines/reference/constructorOverloads1.js
index d62cb9530c5..47906974f6e 100644
--- a/tests/baselines/reference/constructorOverloads1.js
+++ b/tests/baselines/reference/constructorOverloads1.js
@@ -25,8 +25,8 @@ f1.bar2();
 var Foo = (function () {
     function Foo(x) {
     }
-    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
-    Foo.prototype.bar2 = function () { /*WScript.Echo("bar1");*/ };
+    Foo.prototype.bar1 = function () { };
+    Foo.prototype.bar2 = function () { };
     return Foo;
 }());
 var f1 = new Foo("hey");
diff --git a/tests/baselines/reference/constructorOverloads2.js b/tests/baselines/reference/constructorOverloads2.js
index e8d11af4056..76481ec1bc6 100644
--- a/tests/baselines/reference/constructorOverloads2.js
+++ b/tests/baselines/reference/constructorOverloads2.js
@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 var FooBase = (function () {
     function FooBase(x) {
     }
-    FooBase.prototype.bar1 = function () { /*WScript.Echo("base bar1");*/ };
+    FooBase.prototype.bar1 = function () { };
     return FooBase;
 }());
 var Foo = (function (_super) {
@@ -42,7 +42,7 @@ var Foo = (function (_super) {
     function Foo(x, y) {
         _super.call(this, x);
     }
-    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
+    Foo.prototype.bar1 = function () { };
     return Foo;
 }(FooBase));
 var f1 = new Foo("hey");
diff --git a/tests/baselines/reference/constructorOverloads3.js b/tests/baselines/reference/constructorOverloads3.js
index 7cc27fd5b42..61f0d50db03 100644
--- a/tests/baselines/reference/constructorOverloads3.js
+++ b/tests/baselines/reference/constructorOverloads3.js
@@ -32,7 +32,7 @@ var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo(x, y) {
     }
-    Foo.prototype.bar1 = function () { /*WScript.Echo("Yo");*/ };
+    Foo.prototype.bar1 = function () { };
     return Foo;
 }(FooBase));
 var f1 = new Foo("hey");
diff --git a/tests/baselines/reference/contextuallyTypingRestParameters.js b/tests/baselines/reference/contextuallyTypingRestParameters.js
index 48589ade408..17561f5d7fc 100644
--- a/tests/baselines/reference/contextuallyTypingRestParameters.js
+++ b/tests/baselines/reference/contextuallyTypingRestParameters.js
@@ -9,9 +9,9 @@ var x: (...y: string[]) => void = function (.../*3*/y) {
 
 //// [contextuallyTypingRestParameters.js]
 var x = function () {
-    var /*3*/ y = [];
+    var y = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        /*3*/ y[_i - 0] = arguments[_i];
+        y[_i - 0] = arguments[_i];
     }
     var t = y;
     var x2 = t; // This should be error
diff --git a/tests/baselines/reference/declFileObjectLiteralWithAccessors.js b/tests/baselines/reference/declFileObjectLiteralWithAccessors.js
index adc185e269f..7886736f7e4 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithAccessors.js
+++ b/tests/baselines/reference/declFileObjectLiteralWithAccessors.js
@@ -12,7 +12,7 @@ var /*2*/x = point.x;
 point./*3*/x = 30;
 
 //// [declFileObjectLiteralWithAccessors.js]
-function /*1*/ makePoint(x) {
+function makePoint(x) {
     return {
         b: 10,
         get x() { return x; },
@@ -22,7 +22,7 @@ function /*1*/ makePoint(x) {
 ;
 var /*4*/ point = makePoint(2);
 var /*2*/ x = point.x;
-point./*3*/ x = 30;
+point.x = 30;
 
 
 //// [declFileObjectLiteralWithAccessors.d.ts]
diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js
index 96b4de87bef..eb440c028d5 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js
+++ b/tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js
@@ -10,14 +10,14 @@ var /*2*/x = point./*3*/x;
 
 
 //// [declFileObjectLiteralWithOnlyGetter.js]
-function /*1*/ makePoint(x) {
+function makePoint(x) {
     return {
         get x() { return x; },
     };
 }
 ;
 var /*4*/ point = makePoint(2);
-var /*2*/ x = point./*3*/ x;
+var /*2*/ x = point.x;
 
 
 //// [declFileObjectLiteralWithOnlyGetter.d.ts]
diff --git a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js
index 44b28a9bdb2..f7a48fe810c 100644
--- a/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js
+++ b/tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js
@@ -10,7 +10,7 @@ var /*3*/point = makePoint(2);
 point./*2*/x = 30;
 
 //// [declFileObjectLiteralWithOnlySetter.js]
-function /*1*/ makePoint(x) {
+function makePoint(x) {
     return {
         b: 10,
         set x(a) { this.b = a; }
@@ -18,7 +18,7 @@ function /*1*/ makePoint(x) {
 }
 ;
 var /*3*/ point = makePoint(2);
-point./*2*/ x = 30;
+point.x = 30;
 
 
 //// [declFileObjectLiteralWithOnlySetter.d.ts]
diff --git a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
index 1e6f49e2414..cc90d280914 100644
--- a/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
+++ b/tests/baselines/reference/es6ImportDefaultBindingWithExport.js
@@ -21,7 +21,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = server_1.default;
-}); // non referenced
+});
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportDts.js b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
index 0b522776c4b..cf66c08331e 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportDts.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportDts.js
@@ -22,7 +22,6 @@ exports.c = c;
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
- // unreferenced
 
 
 //// [server.d.ts]
diff --git a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
index 79c588dc277..8ece816fd3b 100644
--- a/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
+++ b/tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js
@@ -14,4 +14,3 @@ var a = 10;
 module.exports = a;
 //// [es6ImportNameSpaceImportNoNamedExports_1.js]
 "use strict";
- // error
diff --git a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.js b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.js
index a9a843f3cc9..8db7fcd6f9c 100644
--- a/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.js
+++ b/tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.js
@@ -7,4 +7,3 @@ import { default as yield } from "somemodule"; // no error
 import { default as default } from "somemodule"; // default as is ok, error of default binding name
 
 //// [es6ImportNamedImportIdentifiersParsing.js]
- // default as is ok, error of default binding name
diff --git a/tests/baselines/reference/es6modulekindWithES5Target10.js b/tests/baselines/reference/es6modulekindWithES5Target10.js
index 015a64c3bc0..b8a66241780 100644
--- a/tests/baselines/reference/es6modulekindWithES5Target10.js
+++ b/tests/baselines/reference/es6modulekindWithES5Target10.js
@@ -8,4 +8,3 @@ namespace N {
 export = N; // Error
 
 //// [es6modulekindWithES5Target10.js]
- // Error
diff --git a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
index 1b8e4dd5c4b..1badf469996 100644
--- a/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
+++ b/tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js
@@ -12,4 +12,3 @@ export declare function bar(): X.bar; // error
 //// [exportSpecifierReferencingOuterDeclaration2_A.js]
 //// [exportSpecifierReferencingOuterDeclaration2_B.js]
 "use strict";
- // error
diff --git a/tests/baselines/reference/genericConstraint3.js b/tests/baselines/reference/genericConstraint3.js
index 657600ba41a..59548c4f4d7 100644
--- a/tests/baselines/reference/genericConstraint3.js
+++ b/tests/baselines/reference/genericConstraint3.js
@@ -4,4 +4,3 @@ interface A<T, U extends C<T>> { x: U; }
 interface B extends A<{}, { x: {} }> { } // Should not produce an error
 
 //// [genericConstraint3.js]
- // Should not produce an error
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.js b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.js
index 26ef7ca7759..f4ea5f07eb9 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.js
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.js
@@ -28,4 +28,3 @@ interface G extends A, B, C, E { } // should only report one error
 interface H extends A, F { } // Should report no error at all because error is internal to F
 
 //// [inheritedMembersAndIndexSignaturesFromDifferentBases.js]
- // Should report no error at all because error is internal to F
diff --git a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.js b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.js
index 9291ab53c1c..8a3b2f8d032 100644
--- a/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.js
+++ b/tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.js
@@ -10,4 +10,3 @@ interface B {
 interface C extends B, A<string> { } // Should succeed
 
 //// [inheritedMembersAndIndexSignaturesFromDifferentBases2.js]
- // Should succeed
diff --git a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.js b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.js
index c7a008f01fb..1645dd10a55 100644
--- a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.js
+++ b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.js
@@ -29,4 +29,3 @@ interface D2 {
 interface E2 extends A2, D2 { } // error
 
 //// [inheritedStringIndexersFromDifferentBaseTypes.js]
- // error
diff --git a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.js b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.js
index 0580b145901..aa837b5cf2e 100644
--- a/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.js
+++ b/tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.js
@@ -25,4 +25,3 @@ interface F extends A, D {
 } // ok because we overrode D's number index signature
 
 //// [inheritedStringIndexersFromDifferentBaseTypes2.js]
- // ok because we overrode D's number index signature
diff --git a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js
index 85d0d3687be..7f01666bd78 100644
--- a/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js
+++ b/tests/baselines/reference/jsxInvalidEsprimaTestSuite.js
@@ -62,7 +62,7 @@ a['foo'] > ;
 <a><a />;
 <a b=>;
 var x = <div>one</div><div>two</div>;;
-var x = <div>one</div>/* intervening comment */  /* intervening comment */ <div>two</div>;;
+var x = <div>one</div> /* intervening comment */ /* intervening comment */ <div>two</div>;;
 <a>{"str"}}</a>;
 <span className="a"/> id="b" />;
 <div className/>>;
@@ -76,4 +76,4 @@ var x = <div>one</div>/* intervening comment */  /* intervening comment */ <div>
 <a b=>;
 <a b={ < }>;
 <a>}</a>;
-<a />/*hai*/ /*hai*/asdf/>;</></></></>;
+<a /> /*hai*//*hai*/asdf/>;</></></></>;
diff --git a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.js b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.js
index 9663da873b8..6e77029fa94 100644
--- a/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.js
+++ b/tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.js
@@ -10,4 +10,3 @@ interface B<T> {
 interface C<T> extends A<T>, B<T> { } // Should not be an error
 
 //// [nonConflictingRecursiveBaseTypeMembers.js]
- // Should not be an error
diff --git a/tests/baselines/reference/objectTypesWithOptionalProperties2.js b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
index 28470e04983..eabb1a153a6 100644
--- a/tests/baselines/reference/objectTypesWithOptionalProperties2.js
+++ b/tests/baselines/reference/objectTypesWithOptionalProperties2.js
@@ -42,5 +42,6 @@ var C2 = (function () {
     return C2;
 }());
 var b = {
-    x: function () { }, 1:  // error
+    x: function () { }, 1: // error
+     // error
 };
diff --git a/tests/baselines/reference/parseRegularExpressionMixedWithComments.js b/tests/baselines/reference/parseRegularExpressionMixedWithComments.js
index 0ef42cf2ce1..78752a77f75 100644
--- a/tests/baselines/reference/parseRegularExpressionMixedWithComments.js
+++ b/tests/baselines/reference/parseRegularExpressionMixedWithComments.js
@@ -8,7 +8,7 @@ var regex5 = /**// asdf/**/ /;
 
 //// [parseRegularExpressionMixedWithComments.js]
 var regex1 = / asdf /;
-var regex2 = /**/ / asdf /;
+var regex2 = / asdf /;
 var regex3 = 1;
-var regex4 = /**/ Math.pow(/ /, /asdf /);
-var regex5 = /**/ Math.pow(/ asdf/, / /);
+var regex4 = Math.pow(/ /, /asdf /);
+var regex5 = Math.pow(/ asdf/, / /);
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js
index eb76d7e0d7c..862722b1a73 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js
@@ -6,6 +6,5 @@
 
 //// [parserGreaterThanTokenAmbiguity10.js]
 1
- // before
     >>>
         2;
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity13.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity13.js
index 5be4da1c04e..49130a9dd13 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity13.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity13.js
@@ -2,5 +2,5 @@
 1 >>/**/= 2;
 
 //// [parserGreaterThanTokenAmbiguity13.js]
-1 >> /**/ ;
+1 >> ; /**/
 2;
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js
index 8fadea77fdc..b6f905e12e7 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js
@@ -6,6 +6,5 @@
 
 //// [parserGreaterThanTokenAmbiguity15.js]
 1
- // before
     >>=
         2;
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity18.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity18.js
index 4cf227f2748..71527689b2c 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity18.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity18.js
@@ -2,5 +2,5 @@
 1 >>>/**/= 2;
 
 //// [parserGreaterThanTokenAmbiguity18.js]
-1 >>> /**/ ;
+1 >>> ; /**/
 2;
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js
index ab86deeb0d2..01d1d6401f2 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js
@@ -6,6 +6,5 @@
 
 //// [parserGreaterThanTokenAmbiguity20.js]
 1
- // Before
     >>>=
         2;
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.js
index f692d1a6324..79f8c139260 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity3.js
@@ -2,4 +2,4 @@
 1 >/**/> 2;
 
 //// [parserGreaterThanTokenAmbiguity3.js]
-1 > /**/  /**/ > 2;
+1 >  /**/ > 2;
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js
index 24aa9e5316a..c65b76f504a 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js
@@ -6,6 +6,5 @@
 
 //// [parserGreaterThanTokenAmbiguity5.js]
 1
- // before
     >>
         2;
diff --git a/tests/baselines/reference/parserGreaterThanTokenAmbiguity8.js b/tests/baselines/reference/parserGreaterThanTokenAmbiguity8.js
index d8ea6134a58..0006c03219a 100644
--- a/tests/baselines/reference/parserGreaterThanTokenAmbiguity8.js
+++ b/tests/baselines/reference/parserGreaterThanTokenAmbiguity8.js
@@ -2,4 +2,4 @@
 1 >>/**/> 2;
 
 //// [parserGreaterThanTokenAmbiguity8.js]
-1 >> /**/  /**/ > 2;
+1 >>  /**/ > 2;
diff --git a/tests/baselines/reference/parserSkippedTokens5.js b/tests/baselines/reference/parserSkippedTokens5.js
index 665db1ef70d..359a98a5969 100644
--- a/tests/baselines/reference/parserSkippedTokens5.js
+++ b/tests/baselines/reference/parserSkippedTokens5.js
@@ -2,4 +2,4 @@
 \ /*foo*/ ;
 
 //// [parserSkippedTokens5.js]
-/*foo*/ ;
+;
diff --git a/tests/baselines/reference/parserSkippedTokens7.js b/tests/baselines/reference/parserSkippedTokens7.js
index b3aa40d9057..2115614ea1f 100644
--- a/tests/baselines/reference/parserSkippedTokens7.js
+++ b/tests/baselines/reference/parserSkippedTokens7.js
@@ -2,4 +2,3 @@
 /*foo*/ \ /*bar*/
 
 //// [parserSkippedTokens7.js]
- /*bar*/
diff --git a/tests/baselines/reference/parserSkippedTokens8.js b/tests/baselines/reference/parserSkippedTokens8.js
index d8433bbd34c..c9f00f4b85b 100644
--- a/tests/baselines/reference/parserSkippedTokens8.js
+++ b/tests/baselines/reference/parserSkippedTokens8.js
@@ -3,4 +3,4 @@
 /*foo*/ \ /*bar*/
 
 //// [parserSkippedTokens8.js]
-; /*bar*/
+;
diff --git a/tests/baselines/reference/parserSkippedTokens9.js b/tests/baselines/reference/parserSkippedTokens9.js
index cabf3a48e56..d693b99b2ea 100644
--- a/tests/baselines/reference/parserSkippedTokens9.js
+++ b/tests/baselines/reference/parserSkippedTokens9.js
@@ -4,4 +4,3 @@
 
 //// [parserSkippedTokens9.js]
 ; // existing trivia
- /*bar*/
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
index 96fff1f8f33..d759bc2f296 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js
@@ -29,4 +29,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-}); // This should result in type ClassB
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
index e8262c86b4f..7704b38f68d 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js
@@ -33,4 +33,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-}); // This should result in type ClassB
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
index 39303b463ba..a46be3bdafc 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js
@@ -37,4 +37,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-}); // This should result in type ClassB
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
index 80a4408b10d..8ccd6ecf560 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js
@@ -31,4 +31,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-}); // This should result in type ClassB
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
index 69f6ff07bd8..4602ed554e5 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js
@@ -40,4 +40,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-}); // This should result in type ClassB
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
index 277a8a168da..d3487519218 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js
@@ -49,4 +49,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-}); // This should result in type ClassB
+});
diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
index fcab82802b2..9a29c2bf949 100644
--- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
+++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js
@@ -51,4 +51,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-}); // This should result in type ClassB
+});
diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.js b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
index 00553a3fbba..2e7e6d8b47c 100644
--- a/tests/baselines/reference/thisInInvalidContextsExternalModule.js
+++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.js
@@ -107,4 +107,4 @@ var SomeEnum;
     SomeEnum[SomeEnum["A"] = this] = "A";
     SomeEnum[SomeEnum["B"] = this.spaaaace] = "B"; // Also should not be allowed
 })(SomeEnum || (SomeEnum = {}));
-module.exports = this; // Should be an error
+module.exports = this;
diff --git a/tests/baselines/reference/tsxParseTests2.js b/tests/baselines/reference/tsxParseTests2.js
index c09e9d2c3cb..b0cf54f8d1f 100644
--- a/tests/baselines/reference/tsxParseTests2.js
+++ b/tests/baselines/reference/tsxParseTests2.js
@@ -8,4 +8,4 @@ var x = </**/div></div>;
 
 
 //// [file.jsx]
-var x = </**/ div></div>;
+var x = <div></div>;
diff --git a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js
index af2287ef27f..861e20cb0d1 100644
--- a/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js
+++ b/tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js
@@ -11,4 +11,3 @@ declare module m {
 declare var m: m.IStatic; // Should be ok to have var 'm' as module is non instantiated
 
 //// [typeAliasDoesntMakeModuleInstantiated.js]
- // Should be ok to have var 'm' as module is non instantiated