diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
index 025a4f36d26..1fec1e9562f 100644
--- a/src/compiler/comments.ts
+++ b/src/compiler/comments.ts
@@ -260,7 +260,7 @@ namespace ts {
             }
         }
 
-        function emitLeadingComment(commentPos: number, commentEnd: number, _kind: SyntaxKind, hasTrailingNewLine: boolean, rangePos: number) {
+        function emitLeadingComment(commentPos: number, commentEnd: number, kind: SyntaxKind, hasTrailingNewLine: boolean, rangePos: number) {
             if (!hasWrittenComment) {
                 emitNewLineBeforeLeadingCommentOfPosition(currentLineMap, writer, rangePos, commentPos);
                 hasWrittenComment = true;
@@ -274,7 +274,7 @@ namespace ts {
             if (hasTrailingNewLine) {
                 writer.writeLine();
             }
-            else {
+            else if (kind === SyntaxKind.MultiLineCommentTrivia) {
                 writer.write(" ");
             }
         }
diff --git a/tests/baselines/reference/ambientDeclarationsExternal.js b/tests/baselines/reference/ambientDeclarationsExternal.js
index fb531586467..ed413fb0d8e 100644
--- a/tests/baselines/reference/ambientDeclarationsExternal.js
+++ b/tests/baselines/reference/ambientDeclarationsExternal.js
@@ -24,7 +24,7 @@ var n: number;
 
 
 //// [decls.js]
-// Ambient external import declaration referencing ambient external module using top level module name 
+// Ambient external import declaration referencing ambient external module using top level module name
 //// [consumer.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/anyAssignableToEveryType.js b/tests/baselines/reference/anyAssignableToEveryType.js
index d6b2303de48..eff97905e4f 100644
--- a/tests/baselines/reference/anyAssignableToEveryType.js
+++ b/tests/baselines/reference/anyAssignableToEveryType.js
@@ -87,4 +87,4 @@ function foo(x, y, z) {
 //    x = a;
 //    y = a;
 //    z = a;
-//} 
+//}
diff --git a/tests/baselines/reference/augmentedTypesClass3.js b/tests/baselines/reference/augmentedTypesClass3.js
index d2ad63161b5..045109f8587 100644
--- a/tests/baselines/reference/augmentedTypesClass3.js
+++ b/tests/baselines/reference/augmentedTypesClass3.js
@@ -46,4 +46,4 @@ var c5c = /** @class */ (function () {
     c5c.prototype.foo = function () { };
     return c5c;
 }());
-//import c5c = require(''); 
+//import c5c = require('');
diff --git a/tests/baselines/reference/augmentedTypesEnum.js b/tests/baselines/reference/augmentedTypesEnum.js
index ff0ad93f817..edd4a92d767 100644
--- a/tests/baselines/reference/augmentedTypesEnum.js
+++ b/tests/baselines/reference/augmentedTypesEnum.js
@@ -100,4 +100,4 @@ var e6b;
 })(e6b || (e6b = {})); // should be error
 // enum then import, messes with error reporting
 //enum e7 { One }
-//import e7 = require(''); // should be error 
+//import e7 = require(''); // should be error
diff --git a/tests/baselines/reference/augmentedTypesEnum2.js b/tests/baselines/reference/augmentedTypesEnum2.js
index 66fc96b62a0..0e6e70df263 100644
--- a/tests/baselines/reference/augmentedTypesEnum2.js
+++ b/tests/baselines/reference/augmentedTypesEnum2.js
@@ -41,4 +41,4 @@ var e2 = /** @class */ (function () {
     return e2;
 }());
 //enum then enum - covered
-//enum then import - covered 
+//enum then import - covered
diff --git a/tests/baselines/reference/augmentedTypesFunction.js b/tests/baselines/reference/augmentedTypesFunction.js
index 3c6066e5bb4..a2dd4a664a3 100644
--- a/tests/baselines/reference/augmentedTypesFunction.js
+++ b/tests/baselines/reference/augmentedTypesFunction.js
@@ -79,4 +79,4 @@ function y5b() { }
 function y5c() { }
 // function then import, messes with other errors
 //function y6() { }
-//import y6 = require(''); 
+//import y6 = require('');
diff --git a/tests/baselines/reference/augmentedTypesInterface.js b/tests/baselines/reference/augmentedTypesInterface.js
index b74da5bbfee..0409e157584 100644
--- a/tests/baselines/reference/augmentedTypesInterface.js
+++ b/tests/baselines/reference/augmentedTypesInterface.js
@@ -48,4 +48,4 @@ var i3;
     i3[i3["One"] = 0] = "One";
 })(i3 || (i3 = {}));
 ; // error
-//import i4 = require('');  // error 
+//import i4 = require('');  // error
diff --git a/tests/baselines/reference/commentEmitAtEndOfFile1.js b/tests/baselines/reference/commentEmitAtEndOfFile1.js
index 1be031fa84a..d6ba7b158d6 100644
--- a/tests/baselines/reference/commentEmitAtEndOfFile1.js
+++ b/tests/baselines/reference/commentEmitAtEndOfFile1.js
@@ -18,4 +18,4 @@ var foo;
 (function (foo) {
     function bar() { }
 })(foo || (foo = {}));
-// test #4 
+// test #4
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
index 079a1e276fb..bcd87998f83 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js
@@ -505,4 +505,4 @@ var r8b8 = b8 !== a8;
 var r8b9 = b9 !== a9;
 var r8b10 = b10 !== a10;
 var r8b11 = b11 !== a11;
-//var r8b12 = b12 !== a12; 
+//var r8b12 = b12 !== a12;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
index 38097a936e3..1721f564865 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js
@@ -431,4 +431,4 @@ var r8b6 = b6 !== a6;
 var r8b7 = b7 !== a7;
 var r8b8 = b8 !== a8;
 var r8b9 = b9 !== a9;
-//var r8b10 = b10 !== a10; 
+//var r8b10 = b10 !== a10;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
index 87359ea0074..72dd4be0afc 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js
@@ -320,4 +320,4 @@ var r8b3 = b3 !== a3;
 var r8b4 = b4 !== a4;
 var r8b5 = b5 !== a5;
 var r8b6 = b6 !== a6;
-//var r8b7 = b7 !== a7; 
+//var r8b7 = b7 !== a7;
diff --git a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
index fcfbfa4bfbc..19183773406 100644
--- a/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
+++ b/tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js
@@ -320,4 +320,4 @@ var r8b3 = b3 !== a3;
 var r8b4 = b4 !== a4;
 var r8b5 = b5 !== a5;
 var r8b6 = b6 !== a6;
-//var r8b7 = b7 !== a7; 
+//var r8b7 = b7 !== a7;
diff --git a/tests/baselines/reference/errorSupression1.js b/tests/baselines/reference/errorSupression1.js
index 2f467871434..4b635a0d660 100644
--- a/tests/baselines/reference/errorSupression1.js
+++ b/tests/baselines/reference/errorSupression1.js
@@ -17,4 +17,4 @@ var Foo = /** @class */ (function () {
 var baz = Foo.b;
 // Foo.b won't bind. 
 baz.concat("y");
-// So we don't want an error on 'concat'. 
+// So we don't want an error on 'concat'.
diff --git a/tests/baselines/reference/everyTypeAssignableToAny.js b/tests/baselines/reference/everyTypeAssignableToAny.js
index 7f02badca00..fd71ec624be 100644
--- a/tests/baselines/reference/everyTypeAssignableToAny.js
+++ b/tests/baselines/reference/everyTypeAssignableToAny.js
@@ -117,4 +117,4 @@ function foo(x, y, z) {
 //    a = x;
 //    a = y;
 //    a = z;
-//} 
+//}
diff --git a/tests/baselines/reference/functionConstraintSatisfaction.js b/tests/baselines/reference/functionConstraintSatisfaction.js
index fc8a2be88a7..f24fd32aff6 100644
--- a/tests/baselines/reference/functionConstraintSatisfaction.js
+++ b/tests/baselines/reference/functionConstraintSatisfaction.js
@@ -108,4 +108,4 @@ function foo2(x, y) {
 //function foo2<T extends { (): void }, U extends T>(x: T, y: U) {
 //    foo(x);
 //    foo(y);
-//} 
+//}
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.js
index f300e3a8093..27e4093d9c7 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.js
@@ -63,4 +63,4 @@ function other3(arg) {
 //    var d = r2[1];
 //    // BUG 821629
 //    //var u: U = r2[1]; // ok
-//} 
+//}
diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.js
index eee87caf3de..ee33746b152 100644
--- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.js
+++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.js
@@ -64,4 +64,4 @@ function other3(arg) {
 //    var d: Date = r2['hm']; // ok
 //    // BUG 821629
 //    //var u: U = r2['hm']; // ok
-//} 
+//}
diff --git a/tests/baselines/reference/heterogeneousArrayLiterals.js b/tests/baselines/reference/heterogeneousArrayLiterals.js
index 499aa7e7818..46dee284ae9 100644
--- a/tests/baselines/reference/heterogeneousArrayLiterals.js
+++ b/tests/baselines/reference/heterogeneousArrayLiterals.js
@@ -268,4 +268,4 @@ function foo4(t, u) {
 //    var i = [u, base]; // Base[]
 //    var j = [u, derived]; // Derived[]
 //    var k: Base[] = [t, u];
-//} 
+//}
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.js b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.js
index 74354468e32..f566bbdd878 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne.js
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne.js
@@ -54,4 +54,4 @@ function f2() {
 //    }
 //    var x: U;
 //    x.getDate();
-//} 
+//}
diff --git a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js
index 984584389f6..824061fce1f 100644
--- a/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js
+++ b/tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js
@@ -75,4 +75,4 @@ var C2 = /** @class */ (function () {
 //        var x: U;
 //        x.getDate();
 //    }
-//} 
+//}
diff --git a/tests/baselines/reference/literalsInComputedProperties1.js b/tests/baselines/reference/literalsInComputedProperties1.js
index c5b0060f626..4611925f2d4 100644
--- a/tests/baselines/reference/literalsInComputedProperties1.js
+++ b/tests/baselines/reference/literalsInComputedProperties1.js
@@ -89,4 +89,4 @@ var X;
 var a = X["foo"];
 var a0 = X["bar"];
 var _a;
-// TODO: make sure that enum still disallow template literals as member names 
+// TODO: make sure that enum still disallow template literals as member names
diff --git a/tests/baselines/reference/moduleIdentifiers.js b/tests/baselines/reference/moduleIdentifiers.js
index 04d39019482..d3a654b8670 100644
--- a/tests/baselines/reference/moduleIdentifiers.js
+++ b/tests/baselines/reference/moduleIdentifiers.js
@@ -19,4 +19,4 @@ var M;
 //var m: M = M;
 var x1 = M.a;
 //var x2 = m.a;
-//var q: m.P; 
+//var q: m.P;
diff --git a/tests/baselines/reference/moduleResolutionWithExtensions.js b/tests/baselines/reference/moduleResolutionWithExtensions.js
index c1e0310e995..3406bb0adae 100644
--- a/tests/baselines/reference/moduleResolutionWithExtensions.js
+++ b/tests/baselines/reference/moduleResolutionWithExtensions.js
@@ -28,11 +28,11 @@ import j from "./jquery.js"
 "use strict";
 exports.__esModule = true;
 exports["default"] = 0;
-// No extension: '.ts' added 
+// No extension: '.ts' added
 //// [b.js]
 "use strict";
 exports.__esModule = true;
-// '.js' extension: stripped and replaced with '.ts' 
+// '.js' extension: stripped and replaced with '.ts'
 //// [d.js]
 "use strict";
 exports.__esModule = true;
diff --git a/tests/baselines/reference/nullAssignableToEveryType.js b/tests/baselines/reference/nullAssignableToEveryType.js
index f04ae865692..50914b366f8 100644
--- a/tests/baselines/reference/nullAssignableToEveryType.js
+++ b/tests/baselines/reference/nullAssignableToEveryType.js
@@ -84,4 +84,4 @@ function foo(x, y, z) {
 //    x = null;
 //    y = null;
 //    z = null;
-//} 
+//}
diff --git a/tests/baselines/reference/sourceMap-Comment1.js b/tests/baselines/reference/sourceMap-Comment1.js
index 071e54b5716..6f1f43cd8e2 100644
--- a/tests/baselines/reference/sourceMap-Comment1.js
+++ b/tests/baselines/reference/sourceMap-Comment1.js
@@ -2,5 +2,5 @@
 // Comment
 
 //// [sourceMap-Comment1.js]
-// Comment 
+// Comment
 //# sourceMappingURL=sourceMap-Comment1.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/sourceMap-Comment1.sourcemap.txt b/tests/baselines/reference/sourceMap-Comment1.sourcemap.txt
index 4d427d1de89..e2f9174a45f 100644
--- a/tests/baselines/reference/sourceMap-Comment1.sourcemap.txt
+++ b/tests/baselines/reference/sourceMap-Comment1.sourcemap.txt
@@ -8,7 +8,7 @@ sources: sourceMap-Comment1.ts
 emittedFile:tests/cases/compiler/sourceMap-Comment1.js
 sourceFile:sourceMap-Comment1.ts
 -------------------------------------------------------------------
->>>// Comment 
+>>>// Comment
 1 >
 2 >^^^^^^^^^^
 3 >          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
diff --git a/tests/baselines/reference/systemDefaultExportCommentValidity.js b/tests/baselines/reference/systemDefaultExportCommentValidity.js
index a56110b0de9..45fe1df3ccd 100644
--- a/tests/baselines/reference/systemDefaultExportCommentValidity.js
+++ b/tests/baselines/reference/systemDefaultExportCommentValidity.js
@@ -14,7 +14,7 @@ System.register([], function (exports_1, context_1) {
         execute: function () {
             Home = {};
             exports_1("default", Home);
-            // There is intentionally no semicolon on the prior line, this comment should not break emit 
+            // There is intentionally no semicolon on the prior line, this comment should not break emit
         }
     };
 });
diff --git a/tests/baselines/reference/systemModuleTrailingComments.js b/tests/baselines/reference/systemModuleTrailingComments.js
index 41b0bd299a0..01f17d1facf 100644
--- a/tests/baselines/reference/systemModuleTrailingComments.js
+++ b/tests/baselines/reference/systemModuleTrailingComments.js
@@ -12,7 +12,7 @@ System.register([], function (exports_1, context_1) {
         setters: [],
         execute: function () {
             exports_1("test", test = "TEST");
-            //some comment 
+            //some comment
         }
     };
 });
diff --git a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.js b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.js
index 95c65d5f3a9..0655ad17138 100644
--- a/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.js
+++ b/tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.js
@@ -64,4 +64,4 @@ interface I2<V, T, U> {
 //    y: U;
 //    z: V;
 //    foo<W extends V>(x: W): T;
-//} 
+//}
diff --git a/tests/baselines/reference/undefinedAssignableToEveryType.js b/tests/baselines/reference/undefinedAssignableToEveryType.js
index 507f647763a..de64f97f70b 100644
--- a/tests/baselines/reference/undefinedAssignableToEveryType.js
+++ b/tests/baselines/reference/undefinedAssignableToEveryType.js
@@ -83,4 +83,4 @@ function foo(x, y, z) {
 //    x = undefined;
 //    y = undefined;
 //    z = undefined;
-//} 
+//}