Remove trailing space from emitLeadingComment

ubershmekel · ubershmekel · commit ff0961b85e33 · 2017-09-08T15:02:59.000-07:00
This will prevent emiting an extraneous trailing space on comments to match https://eslint.org/docs/rules/no-trailing-spaces This also removes a space that may have been originally there after a comment but isn't necessary syntactically.
diff --git a/src/compiler/comments.ts b/src/compiler/comments.ts
@@ -274,9 +274,6 @@ namespace ts {
             if (hasTrailingNewLine) {
                 writer.writeLine();
             }
-            else {
-                writer.write(" ");
-            }
         }
 
         function emitLeadingCommentsOfPosition(pos: number) {
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/baseIndexSignatureResolution.js b/tests/baselines/reference/baseIndexSignatureResolution.js
@@ -59,4 +59,4 @@ interface B<TBase extends Base> extends A {
 }
 var b: B<Derived> = null;
 var z: Derived = b.foo();
-*/ 
+*/
diff --git 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/commentEmitWithCommentOnLastLine.js b/tests/baselines/reference/commentEmitWithCommentOnLastLine.js
@@ -8,4 +8,4 @@ var bar;
 var x;
 /*
 var bar;
-*/ 
+*/
diff --git a/tests/baselines/reference/commentOnArrayElement1.js b/tests/baselines/reference/commentOnArrayElement1.js
@@ -11,7 +11,7 @@ var array = [
 var array = [
     /* element 1*/
     1
-    /* end of element 1 */ ,
+    /* end of element 1 */,
     2
     /* end of element 2 */
 ];
diff --git a/tests/baselines/reference/commentOnArrayElement3.js b/tests/baselines/reference/commentOnArrayElement3.js
@@ -12,8 +12,8 @@ var array = [
 var array = [
     /* element 1*/
     1
-    /* end of element 1 */ ,
+    /* end of element 1 */,
     2
-    /* end of element 2 */ ,
+    /* end of element 2 */,
     ,
 ];
diff --git a/tests/baselines/reference/commentOnBlock1.js b/tests/baselines/reference/commentOnBlock1.js
@@ -7,5 +7,5 @@ function f() {
 //// [commentOnBlock1.js]
 // asdf
 function f() {
-    /*asdf*/ { }
+    /*asdf*/{ }
 }
diff --git a/tests/baselines/reference/commentsArgumentsOfCallExpression1.js b/tests/baselines/reference/commentsArgumentsOfCallExpression1.js
@@ -29,4 +29,4 @@ function () { });
 foo(/*c7*/ function () { });
 foo(
 /*c7*/
-/*c8*/ function () { });
+/*c8*/function () { });
diff --git a/tests/baselines/reference/commentsArgumentsOfCallExpression2.js b/tests/baselines/reference/commentsArgumentsOfCallExpression2.js
@@ -17,7 +17,7 @@ foo(/*c2*/ 1, /*d2*/ 1 + 2, /*e1*/ a + b);
 foo(/*c3*/ function () { }, /*d2*/ function () { }, /*e2*/ a + /*e3*/ b);
 foo(/*c3*/ function () { }, /*d3*/ function () { }, /*e3*/ (a + b));
 foo(
-/*c4*/ function () { }, 
-/*d4*/ function () { }, 
+/*c4*/function () { }, 
+/*d4*/function () { }, 
 /*e4*/
-/*e5*/ "hello");
+/*e5*/"hello");
diff --git a/tests/baselines/reference/commentsCommentParsing.js b/tests/baselines/reference/commentsCommentParsing.js
@@ -178,7 +178,7 @@ jsDocMultiLine();
 *New line1
 *New Line2*/
 /** Shoul mege this line as well
-* and this too*/ /** Another this one too*/
+* and this too*//** Another this one too*/
 function jsDocMultiLineMerge() {
 }
 jsDocMultiLineMerge();
@@ -188,23 +188,23 @@ function jsDocMixedComments1() {
 }
 jsDocMixedComments1();
 /// Triple slash comment
-/** jsdoc comment */ /*** another jsDocComment*/
+/** jsdoc comment *//*** another jsDocComment*/
 function jsDocMixedComments2() {
 }
 jsDocMixedComments2();
-/** jsdoc comment */ /*** another jsDocComment*/
+/** jsdoc comment *//*** another jsDocComment*/
 /// Triple slash comment
 function jsDocMixedComments3() {
 }
 jsDocMixedComments3();
-/** jsdoc comment */ /*** another jsDocComment*/
+/** jsdoc comment *//*** another jsDocComment*/
 /// Triple slash comment
 /// Triple slash comment 2
 function jsDocMixedComments4() {
 }
 jsDocMixedComments4();
 /// Triple slash comment 1
-/** jsdoc comment */ /*** another jsDocComment*/
+/** jsdoc comment *//*** another jsDocComment*/
 /// Triple slash comment
 /// Triple slash comment 2
 function jsDocMixedComments5() {
diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js
@@ -86,8 +86,8 @@ function blah3(a // trailing commen single line
 ) {
 }
 lambdaFoo = function (a, b) { return a * b; }; // This is trailing comment
-/*leading comment*/ (function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration)
-/*leading comment*/ (function () { return 0; }); //trailing comment
+/*leading comment*/(function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration)
+/*leading comment*/(function () { return 0; }); //trailing comment
 function blah4(/*1*/ a /*2*/, /*3*/ b /*4*/) {
 }
 function foo1() {
diff --git a/tests/baselines/reference/commentsOnPropertyOfObjectLiteral1.js b/tests/baselines/reference/commentsOnPropertyOfObjectLiteral1.js
@@ -18,7 +18,7 @@ var resolve = {
     id: /*! @ngInject */ function (details) { return details.id; },
     id1: /* c1 */ "hello",
     id2: 
-    /*! @ngInject */ function (details) { return details.id; },
+    /*! @ngInject */function (details) { return details.id; },
     id3: 
     /*! @ngInject */
     function (details) { return details.id; },
diff --git 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
@@ -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
@@ -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
@@ -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/concatError.js b/tests/baselines/reference/concatError.js
@@ -56,4 +56,4 @@ var c: C<number>;
 var cc: C<C<number>>;
 
 c = c.m(cc);
-*/ 
+*/
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -84,4 +84,4 @@ function foo(x, y, z) {
 //    x = null;
 //    y = null;
 //    z = null;
-//} 
+//}
diff --git a/tests/baselines/reference/parserSkippedTokens10.js b/tests/baselines/reference/parserSkippedTokens10.js
@@ -5,4 +5,4 @@
 
 
 //// [parserSkippedTokens10.js]
-/*existing trivia*/ ;
+/*existing trivia*/;
diff --git a/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js b/tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js
@@ -78,4 +78,4 @@ declare module MsPortal.Controls.Base.ItemList {
     class ViewModel<TValue> extends ItemValue<TValue> {
     }
 }
-*/ 
+*/
diff --git a/tests/baselines/reference/scannerS7.4_A2_T2.js b/tests/baselines/reference/scannerS7.4_A2_T2.js
@@ -26,4 +26,4 @@
  */
 /*CHECK#1/
 
- 
+
diff --git a/tests/baselines/reference/sourceMap-Comment1.js b/tests/baselines/reference/sourceMap-Comment1.js
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -83,4 +83,4 @@ function foo(x, y, z) {
 //    x = undefined;
 //    y = undefined;
 //    z = undefined;
-//} 
+//}

Original file line number	Diff line number	Diff line change
`@@ -274,9 +274,6 @@ namespace ts {`
`274`	`274`	`if (hasTrailingNewLine) {`
`275`	`275`	`writer.writeLine();`
`276`	`276`	`}`
`277`		`- else {`
`278`		`- writer.write(" ");`
`279`		`- }`
`280`	`277`	`}`
`281`	`278`
`282`	`279`	`function emitLeadingCommentsOfPosition(pos: number) {`
Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,4 @@ interface B<TBase extends Base> extends A {`
`59`	`59`	`}`
`60`	`60`	`var b: B<Derived> = null;`
`61`	`61`	`var z: Derived = b.foo();`
`62`		`-*/`
	`62`	`+*/`