Skip to content

Commit ff0961b

Browse files
committed
Remove trailing space from emitLeadingComment
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.
1 parent 2e02778 commit ff0961b

File tree

45 files changed

+53
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+53
-56
lines changed

src/compiler/comments.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,6 @@ namespace ts {
274274
if (hasTrailingNewLine) {
275275
writer.writeLine();
276276
}
277-
else {
278-
writer.write(" ");
279-
}
280277
}
281278

282279
function emitLeadingCommentsOfPosition(pos: number) {

tests/baselines/reference/ambientDeclarationsExternal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var n: number;
2424

2525

2626
//// [decls.js]
27-
// Ambient external import declaration referencing ambient external module using top level module name
27+
// Ambient external import declaration referencing ambient external module using top level module name
2828
//// [consumer.js]
2929
"use strict";
3030
exports.__esModule = true;

tests/baselines/reference/anyAssignableToEveryType.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ function foo(x, y, z) {
8787
// x = a;
8888
// y = a;
8989
// z = a;
90-
//}
90+
//}

tests/baselines/reference/augmentedTypesClass3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ var c5c = /** @class */ (function () {
4646
c5c.prototype.foo = function () { };
4747
return c5c;
4848
}());
49-
//import c5c = require('');
49+
//import c5c = require('');

tests/baselines/reference/augmentedTypesEnum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@ var e6b;
100100
})(e6b || (e6b = {})); // should be error
101101
// enum then import, messes with error reporting
102102
//enum e7 { One }
103-
//import e7 = require(''); // should be error
103+
//import e7 = require(''); // should be error

tests/baselines/reference/augmentedTypesEnum2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ var e2 = /** @class */ (function () {
4141
return e2;
4242
}());
4343
//enum then enum - covered
44-
//enum then import - covered
44+
//enum then import - covered

tests/baselines/reference/augmentedTypesFunction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ function y5b() { }
7979
function y5c() { }
8080
// function then import, messes with other errors
8181
//function y6() { }
82-
//import y6 = require('');
82+
//import y6 = require('');

tests/baselines/reference/augmentedTypesInterface.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ var i3;
4848
i3[i3["One"] = 0] = "One";
4949
})(i3 || (i3 = {}));
5050
; // error
51-
//import i4 = require(''); // error
51+
//import i4 = require(''); // error

tests/baselines/reference/baseIndexSignatureResolution.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ interface B<TBase extends Base> extends A {
5959
}
6060
var b: B<Derived> = null;
6161
var z: Derived = b.foo();
62-
*/
62+
*/

tests/baselines/reference/commentEmitAtEndOfFile1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ var foo;
1818
(function (foo) {
1919
function bar() { }
2020
})(foo || (foo = {}));
21-
// test #4
21+
// test #4

tests/baselines/reference/commentEmitWithCommentOnLastLine.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ var bar;
88
var x;
99
/*
1010
var bar;
11-
*/
11+
*/

tests/baselines/reference/commentOnArrayElement1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var array = [
1111
var array = [
1212
/* element 1*/
1313
1
14-
/* end of element 1 */ ,
14+
/* end of element 1 */,
1515
2
1616
/* end of element 2 */
1717
];

tests/baselines/reference/commentOnArrayElement3.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ var array = [
1212
var array = [
1313
/* element 1*/
1414
1
15-
/* end of element 1 */ ,
15+
/* end of element 1 */,
1616
2
17-
/* end of element 2 */ ,
17+
/* end of element 2 */,
1818
,
1919
];

tests/baselines/reference/commentOnBlock1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ function f() {
77
//// [commentOnBlock1.js]
88
// asdf
99
function f() {
10-
/*asdf*/ { }
10+
/*asdf*/{ }
1111
}

tests/baselines/reference/commentsArgumentsOfCallExpression1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ function () { });
2929
foo(/*c7*/ function () { });
3030
foo(
3131
/*c7*/
32-
/*c8*/ function () { });
32+
/*c8*/function () { });

tests/baselines/reference/commentsArgumentsOfCallExpression2.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ foo(/*c2*/ 1, /*d2*/ 1 + 2, /*e1*/ a + b);
1717
foo(/*c3*/ function () { }, /*d2*/ function () { }, /*e2*/ a + /*e3*/ b);
1818
foo(/*c3*/ function () { }, /*d3*/ function () { }, /*e3*/ (a + b));
1919
foo(
20-
/*c4*/ function () { },
21-
/*d4*/ function () { },
20+
/*c4*/function () { },
21+
/*d4*/function () { },
2222
/*e4*/
23-
/*e5*/ "hello");
23+
/*e5*/"hello");

tests/baselines/reference/commentsCommentParsing.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jsDocMultiLine();
178178
*New line1
179179
*New Line2*/
180180
/** Shoul mege this line as well
181-
* and this too*/ /** Another this one too*/
181+
* and this too*//** Another this one too*/
182182
function jsDocMultiLineMerge() {
183183
}
184184
jsDocMultiLineMerge();
@@ -188,23 +188,23 @@ function jsDocMixedComments1() {
188188
}
189189
jsDocMixedComments1();
190190
/// Triple slash comment
191-
/** jsdoc comment */ /*** another jsDocComment*/
191+
/** jsdoc comment *//*** another jsDocComment*/
192192
function jsDocMixedComments2() {
193193
}
194194
jsDocMixedComments2();
195-
/** jsdoc comment */ /*** another jsDocComment*/
195+
/** jsdoc comment *//*** another jsDocComment*/
196196
/// Triple slash comment
197197
function jsDocMixedComments3() {
198198
}
199199
jsDocMixedComments3();
200-
/** jsdoc comment */ /*** another jsDocComment*/
200+
/** jsdoc comment *//*** another jsDocComment*/
201201
/// Triple slash comment
202202
/// Triple slash comment 2
203203
function jsDocMixedComments4() {
204204
}
205205
jsDocMixedComments4();
206206
/// Triple slash comment 1
207-
/** jsdoc comment */ /*** another jsDocComment*/
207+
/** jsdoc comment *//*** another jsDocComment*/
208208
/// Triple slash comment
209209
/// Triple slash comment 2
210210
function jsDocMixedComments5() {

tests/baselines/reference/commentsFunction.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ function blah3(a // trailing commen single line
8686
) {
8787
}
8888
lambdaFoo = function (a, b) { return a * b; }; // This is trailing comment
89-
/*leading comment*/ (function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration)
90-
/*leading comment*/ (function () { return 0; }); //trailing comment
89+
/*leading comment*/(function () { return 0; }); // Needs to be wrapped in parens to be a valid expression (not declaration)
90+
/*leading comment*/(function () { return 0; }); //trailing comment
9191
function blah4(/*1*/ a /*2*/, /*3*/ b /*4*/) {
9292
}
9393
function foo1() {

tests/baselines/reference/commentsOnPropertyOfObjectLiteral1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ var resolve = {
1818
id: /*! @ngInject */ function (details) { return details.id; },
1919
id1: /* c1 */ "hello",
2020
id2:
21-
/*! @ngInject */ function (details) { return details.id; },
21+
/*! @ngInject */function (details) { return details.id; },
2222
id3:
2323
/*! @ngInject */
2424
function (details) { return details.id; },

tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnCallSignature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,4 +505,4 @@ var r8b8 = b8 !== a8;
505505
var r8b9 = b9 !== a9;
506506
var r8b10 = b10 !== a10;
507507
var r8b11 = b11 !== a11;
508-
//var r8b12 = b12 !== a12;
508+
//var r8b12 = b12 !== a12;

tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnConstructorSignature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,4 +431,4 @@ var r8b6 = b6 !== a6;
431431
var r8b7 = b7 !== a7;
432432
var r8b8 = b8 !== a8;
433433
var r8b9 = b9 !== a9;
434-
//var r8b10 = b10 !== a10;
434+
//var r8b10 = b10 !== a10;

tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedCallSignature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,4 @@ var r8b3 = b3 !== a3;
320320
var r8b4 = b4 !== a4;
321321
var r8b5 = b5 !== a5;
322322
var r8b6 = b6 !== a6;
323-
//var r8b7 = b7 !== a7;
323+
//var r8b7 = b7 !== a7;

tests/baselines/reference/comparisonOperatorWithSubtypeObjectOnInstantiatedConstructorSignature.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,4 +320,4 @@ var r8b3 = b3 !== a3;
320320
var r8b4 = b4 !== a4;
321321
var r8b5 = b5 !== a5;
322322
var r8b6 = b6 !== a6;
323-
//var r8b7 = b7 !== a7;
323+
//var r8b7 = b7 !== a7;

tests/baselines/reference/concatError.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ var c: C<number>;
5656
var cc: C<C<number>>;
5757
5858
c = c.m(cc);
59-
*/
59+
*/

tests/baselines/reference/errorSupression1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ var Foo = /** @class */ (function () {
1717
var baz = Foo.b;
1818
// Foo.b won't bind.
1919
baz.concat("y");
20-
// So we don't want an error on 'concat'.
20+
// So we don't want an error on 'concat'.

tests/baselines/reference/everyTypeAssignableToAny.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,4 @@ function foo(x, y, z) {
117117
// a = x;
118118
// a = y;
119119
// a = z;
120-
//}
120+
//}

tests/baselines/reference/functionConstraintSatisfaction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ function foo2(x, y) {
108108
//function foo2<T extends { (): void }, U extends T>(x: T, y: U) {
109109
// foo(x);
110110
// foo(y);
111-
//}
111+
//}

tests/baselines/reference/genericCallWithObjectTypeArgsAndNumericIndexer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ function other3(arg) {
6363
// var d = r2[1];
6464
// // BUG 821629
6565
// //var u: U = r2[1]; // ok
66-
//}
66+
//}

tests/baselines/reference/genericCallWithObjectTypeArgsAndStringIndexer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ function other3(arg) {
6464
// var d: Date = r2['hm']; // ok
6565
// // BUG 821629
6666
// //var u: U = r2['hm']; // ok
67-
//}
67+
//}

tests/baselines/reference/heterogeneousArrayLiterals.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,4 +268,4 @@ function foo4(t, u) {
268268
// var i = [u, base]; // Base[]
269269
// var j = [u, derived]; // Derived[]
270270
// var k: Base[] = [t, u];
271-
//}
271+
//}

tests/baselines/reference/innerTypeParameterShadowingOuterOne.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ function f2() {
5454
// }
5555
// var x: U;
5656
// x.getDate();
57-
//}
57+
//}

tests/baselines/reference/innerTypeParameterShadowingOuterOne2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ var C2 = /** @class */ (function () {
7575
// var x: U;
7676
// x.getDate();
7777
// }
78-
//}
78+
//}

tests/baselines/reference/literalsInComputedProperties1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ var X;
8989
var a = X["foo"];
9090
var a0 = X["bar"];
9191
var _a;
92-
// TODO: make sure that enum still disallow template literals as member names
92+
// TODO: make sure that enum still disallow template literals as member names

tests/baselines/reference/moduleIdentifiers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ var M;
1919
//var m: M = M;
2020
var x1 = M.a;
2121
//var x2 = m.a;
22-
//var q: m.P;
22+
//var q: m.P;

tests/baselines/reference/moduleResolutionWithExtensions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ import j from "./jquery.js"
2828
"use strict";
2929
exports.__esModule = true;
3030
exports["default"] = 0;
31-
// No extension: '.ts' added
31+
// No extension: '.ts' added
3232
//// [b.js]
3333
"use strict";
3434
exports.__esModule = true;
35-
// '.js' extension: stripped and replaced with '.ts'
35+
// '.js' extension: stripped and replaced with '.ts'
3636
//// [d.js]
3737
"use strict";
3838
exports.__esModule = true;

tests/baselines/reference/nullAssignableToEveryType.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,4 @@ function foo(x, y, z) {
8484
// x = null;
8585
// y = null;
8686
// z = null;
87-
//}
87+
//}

tests/baselines/reference/parserSkippedTokens10.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66

77
//// [parserSkippedTokens10.js]
8-
/*existing trivia*/ ;
8+
/*existing trivia*/;

tests/baselines/reference/recursivelySpecializedConstructorDeclaration.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ declare module MsPortal.Controls.Base.ItemList {
7878
class ViewModel<TValue> extends ItemValue<TValue> {
7979
}
8080
}
81-
*/
81+
*/

tests/baselines/reference/scannerS7.4_A2_T2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
*/
2727
/*CHECK#1/
2828

29-
29+

tests/baselines/reference/sourceMap-Comment1.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/baselines/reference/sourceMap-Comment1.sourcemap.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ sources: sourceMap-Comment1.ts
88
emittedFile:tests/cases/compiler/sourceMap-Comment1.js
99
sourceFile:sourceMap-Comment1.ts
1010
-------------------------------------------------------------------
11-
>>>// Comment
11+
>>>// Comment
1212
1 >
1313
2 >^^^^^^^^^^
1414
3 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->

tests/baselines/reference/systemDefaultExportCommentValidity.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ System.register([], function (exports_1, context_1) {
1414
execute: function () {
1515
Home = {};
1616
exports_1("default", Home);
17-
// There is intentionally no semicolon on the prior line, this comment should not break emit
17+
// There is intentionally no semicolon on the prior line, this comment should not break emit
1818
}
1919
};
2020
});

tests/baselines/reference/systemModuleTrailingComments.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ System.register([], function (exports_1, context_1) {
1212
setters: [],
1313
execute: function () {
1414
exports_1("test", test = "TEST");
15-
//some comment
15+
//some comment
1616
}
1717
};
1818
});

tests/baselines/reference/typeParameterUsedAsTypeParameterConstraint3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ interface I2<V, T, U> {
6464
// y: U;
6565
// z: V;
6666
// foo<W extends V>(x: W): T;
67-
//}
67+
//}

tests/baselines/reference/undefinedAssignableToEveryType.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ function foo(x, y, z) {
8383
// x = undefined;
8484
// y = undefined;
8585
// z = undefined;
86-
//}
86+
//}

0 commit comments

Comments
 (0)