diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 4ff0886db49..577ab3e5a81 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -167,14 +167,23 @@ module ts { }); } - function emitComments(comments: Comment[], writer: EmitTextWriter, writeComment: (comment: Comment, writer: EmitTextWriter) => void) { + function emitComments(comments: Comment[], trailingSeparator: boolean, writer: EmitTextWriter, writeComment: (comment: Comment, writer: EmitTextWriter) => void) { + var emitLeadingSpace = !trailingSeparator; forEach(comments, comment => { + if (emitLeadingSpace) { + writer.write(" "); + emitLeadingSpace = false; + } writeComment(comment, writer); if (comment.hasTrailingNewLine) { writer.writeLine(); - } else { + } else if (trailingSeparator) { writer.write(" "); } + else { + // Emit leading space to separate comment during next comment emit + emitLeadingSpace = true; + } }); } @@ -1941,18 +1950,16 @@ module ts { function emitLeadingDeclarationComments(node: Declaration) { var leadingComments = getLeadingComments(currentSourceFile.text, node.pos); emitNewLineBeforeLeadingComments(node, leadingComments, writer); - emitComments(leadingComments, writer, writeComment); + // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space + emitComments(leadingComments, /*trailingSeparator*/ true, writer, writeComment); } function emitTrailingDeclarationComments(node: Declaration) { // Emit the trailing declaration comments only if the parent's end doesnt match if (node.parent.kind === SyntaxKind.SourceFile || node.end !== node.parent.end) { var trailingComments = getTrailingComments(currentSourceFile.text, node.end); - if (trailingComments && trailingComments.length) { - // Trailing comments are emitting on same line, so write a space between comment - writer.write(" "); - } - emitComments(trailingComments, writer, writeComment); + // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/ + emitComments(trailingComments, /*trailingSeparator*/ false, writer, writeComment); } } @@ -2068,7 +2075,8 @@ module ts { if (declaration) { var jsDocComments = getJsDocComments(declaration, currentSourceFile); emitNewLineBeforeLeadingComments(declaration, jsDocComments, writer); - emitComments(jsDocComments, writer, writeCommentRange); + // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space + emitComments(jsDocComments, /*trailingSeparator*/ true, writer, writeCommentRange); } } diff --git a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js index 0a08bab49a5..c72ca4b114b 100644 --- a/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js +++ b/tests/baselines/reference/AmbientModuleAndNonAmbientClassWithSameNameAndCommonRoot.js @@ -37,4 +37,4 @@ var A; //// [test.js] var p; var p = A.Point.Origin; -var p = new A.Point(0, 0); // unexpected error here, bug 840000 +var p = new A.Point(0, 0); // unexpected error here, bug 840000 diff --git a/tests/baselines/reference/ambiguousOverloadResolution.js b/tests/baselines/reference/ambiguousOverloadResolution.js index 341ccd77114..2d817ba1385 100644 --- a/tests/baselines/reference/ambiguousOverloadResolution.js +++ b/tests/baselines/reference/ambiguousOverloadResolution.js @@ -28,4 +28,4 @@ var B = (function (_super) { return B; })(A); var x; -var t = f(x, x); // Not an error +var t = f(x, x); // Not an error diff --git a/tests/baselines/reference/anyAsConstructor.js b/tests/baselines/reference/anyAsConstructor.js index e8b7af8b2d6..2dfa9a5398b 100644 --- a/tests/baselines/reference/anyAsConstructor.js +++ b/tests/baselines/reference/anyAsConstructor.js @@ -18,4 +18,4 @@ var a = new x(); var b = new x('hello'); var c = new x(x); // grammar allows this for constructors -var d = new x(x); // no error +var d = new x(x); // no error diff --git a/tests/baselines/reference/anyAssignabilityInInheritance.js b/tests/baselines/reference/anyAssignabilityInInheritance.js index c74c7b0e596..7000a1cb250 100644 --- a/tests/baselines/reference/anyAssignabilityInInheritance.js +++ b/tests/baselines/reference/anyAssignabilityInInheritance.js @@ -135,4 +135,4 @@ var CC; })(CC || (CC = {})); var r3 = foo3(a); // any var r3 = foo3(a); // any -var r3 = foo3(a); // any +var r3 = foo3(a); // any diff --git a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js index 4c4626bb073..f15215a88eb 100644 --- a/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js +++ b/tests/baselines/reference/arrayLiteralsWithRecursiveGenerics.js @@ -56,4 +56,4 @@ var xs = [list, myList]; // {}[] var ys = [list, list2]; // {}[] var zs = [list, null]; // List[] var myDerivedList; -var as = [list, myDerivedList]; // List[] +var as = [list, myDerivedList]; // List[] diff --git a/tests/baselines/reference/arrayOfFunctionTypes3.js b/tests/baselines/reference/arrayOfFunctionTypes3.js index 126660b70a8..ab7c6778a71 100644 --- a/tests/baselines/reference/arrayOfFunctionTypes3.js +++ b/tests/baselines/reference/arrayOfFunctionTypes3.js @@ -50,4 +50,4 @@ var b2; var c2; var z2 = [a2, b2, c2]; var r6 = z2[0]; -var r7 = r6(''); // any not string +var r7 = r6(''); // any not string diff --git a/tests/baselines/reference/arrayTypeOfFunctionTypes.js b/tests/baselines/reference/arrayTypeOfFunctionTypes.js index b2bdf018bdf..9a7a4516cb5 100644 --- a/tests/baselines/reference/arrayTypeOfFunctionTypes.js +++ b/tests/baselines/reference/arrayTypeOfFunctionTypes.js @@ -29,4 +29,4 @@ var r4b = new r3(); // error var x3; var r5 = x2[1]; var r6 = r5(); -var r6b = new r5(); // error +var r6b = new r5(); // error diff --git a/tests/baselines/reference/assignmentToObjectAndFunction.js b/tests/baselines/reference/assignmentToObjectAndFunction.js index c6994abb3ab..b058765d5f8 100644 --- a/tests/baselines/reference/assignmentToObjectAndFunction.js +++ b/tests/baselines/reference/assignmentToObjectAndFunction.js @@ -59,4 +59,4 @@ var bad; (function (bad) { bad.apply = 0; })(bad || (bad = {})); -var badFundule = bad; // error +var badFundule = bad; // error diff --git a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js index bb4bc81e0d9..88996de1553 100644 --- a/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js +++ b/tests/baselines/reference/augmentedTypeAssignmentCompatIndexSignature.js @@ -26,4 +26,4 @@ var o = {}; var f = function () { }; var v1 = o; // Should be allowed -var v2 = f; // Should be allowed +var v2 = f; // Should be allowed diff --git a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js index 79543b2de3e..a1b6bf6805c 100644 --- a/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js +++ b/tests/baselines/reference/augmentedTypeBracketAccessIndexSignature.js @@ -16,4 +16,4 @@ var b = (() => { })[0]; // Should be Bar //// [augmentedTypeBracketAccessIndexSignature.js] var a = {}[0]; // Should be Foo var b = (function () { -})[0]; // Should be Bar +})[0]; // Should be Bar diff --git a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js index cd78ec26191..5bc184df667 100644 --- a/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js +++ b/tests/baselines/reference/augmentedTypeBracketNamedPropertyAccess.js @@ -20,4 +20,4 @@ var f = function () { var r1 = o['data']; // Should be number var r2 = o['functionData']; // Should be any (no property found) var r3 = f['functionData']; // Should be string -var r4 = f['data']; // Should be number +var r4 = f['data']; // Should be number diff --git a/tests/baselines/reference/augmentedTypesClass.js b/tests/baselines/reference/augmentedTypesClass.js index 2be1ff0bcbb..5d0d8ab75d6 100644 --- a/tests/baselines/reference/augmentedTypesClass.js +++ b/tests/baselines/reference/augmentedTypesClass.js @@ -28,4 +28,4 @@ var c4 = (function () { var c4; (function (c4) { c4[c4["One"] = 0] = "One"; -})(c4 || (c4 = {})); // error +})(c4 || (c4 = {})); // error diff --git a/tests/baselines/reference/augmentedTypesModules3.js b/tests/baselines/reference/augmentedTypesModules3.js index bf5b88e5611..7f5c390ea3a 100644 --- a/tests/baselines/reference/augmentedTypesModules3.js +++ b/tests/baselines/reference/augmentedTypesModules3.js @@ -22,4 +22,4 @@ var m3a = (function () { m3a.prototype.foo = function () { }; return m3a; -})(); // error, class isn't ambient or declared before the module +})(); // error, class isn't ambient or declared before the module diff --git a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js index 907599cf568..c45ae88458f 100644 --- a/tests/baselines/reference/bestCommonTypeWithContextualTyping.js +++ b/tests/baselines/reference/bestCommonTypeWithContextualTyping.js @@ -28,4 +28,4 @@ var e; var arr = [e]; // Ellement[] var obj = { s: e }; // { s: Ellement; [s: string]: Ellement } var conditional = null ? e : e; // Ellement -var contextualOr = e || e; // Ellement +var contextualOr = e || e; // Ellement diff --git a/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.js b/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.js index e500e233cc0..dba18d96963 100644 --- a/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.js +++ b/tests/baselines/reference/callExpressionWithTypeParameterConstrainedToOuterTypeParameter.js @@ -7,4 +7,4 @@ var y = i(""); // y should be string //// [callExpressionWithTypeParameterConstrainedToOuterTypeParameter.js] var i; -var y = i(""); // y should be string +var y = i(""); // y should be string diff --git a/tests/baselines/reference/classExtendsItself.js b/tests/baselines/reference/classExtendsItself.js index b91eacae694..bb6b68f07d6 100644 --- a/tests/baselines/reference/classExtendsItself.js +++ b/tests/baselines/reference/classExtendsItself.js @@ -32,4 +32,4 @@ var E = (function (_super) { _super.apply(this, arguments); } return E; -})(E); // error +})(E); // error diff --git a/tests/baselines/reference/classExtendsValidConstructorFunction.js b/tests/baselines/reference/classExtendsValidConstructorFunction.js index a2d73f2e605..a0876e8f709 100644 --- a/tests/baselines/reference/classExtendsValidConstructorFunction.js +++ b/tests/baselines/reference/classExtendsValidConstructorFunction.js @@ -21,4 +21,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(foo); // error, cannot extend it though +})(foo); // error, cannot extend it though diff --git a/tests/baselines/reference/classSideInheritance3.js b/tests/baselines/reference/classSideInheritance3.js index 5737ba1380c..9f90fad487b 100644 --- a/tests/baselines/reference/classSideInheritance3.js +++ b/tests/baselines/reference/classSideInheritance3.js @@ -48,4 +48,4 @@ var C = (function (_super) { })(A); var r1 = B; // error var r2 = B; // error -var r3 = C; // ok +var r3 = C; // ok diff --git a/tests/baselines/reference/classWithBaseClassButNoConstructor.js b/tests/baselines/reference/classWithBaseClassButNoConstructor.js index 2d625ac276c..2c881a29a7c 100644 --- a/tests/baselines/reference/classWithBaseClassButNoConstructor.js +++ b/tests/baselines/reference/classWithBaseClassButNoConstructor.js @@ -97,4 +97,4 @@ var D3 = (function (_super) { })(Base2); var r4 = D3; var d5 = new D(); // error -var d6 = new D(1); // ok +var d6 = new D(1); // ok diff --git a/tests/baselines/reference/classWithoutExplicitConstructor.js b/tests/baselines/reference/classWithoutExplicitConstructor.js index 9babd66115b..fed448a2459 100644 --- a/tests/baselines/reference/classWithoutExplicitConstructor.js +++ b/tests/baselines/reference/classWithoutExplicitConstructor.js @@ -33,4 +33,4 @@ var D = (function () { return D; })(); var d = new D(); -var d2 = new D(null); // error +var d2 = new D(null); // error diff --git a/tests/baselines/reference/cloduleTest2.js b/tests/baselines/reference/cloduleTest2.js index c8d78e8198b..d5d30083aec 100644 --- a/tests/baselines/reference/cloduleTest2.js +++ b/tests/baselines/reference/cloduleTest2.js @@ -80,4 +80,4 @@ var m3d; m3d.y = 2; })(m3d || (m3d = {})); var r = new m3d(); // error -var r2 = new m4d(); // error +var r2 = new m4d(); // error diff --git a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js index 5b6313d2aa8..1f613798642 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndAliasInGlobal.js @@ -12,4 +12,4 @@ var a; a.b = 10; })(a || (a = {})); var f = function () { return _this; }; -var _this = a; // Error +var _this = a; // Error diff --git a/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js b/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js index aa7bb24034a..b99311b0c3e 100644 --- a/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js +++ b/tests/baselines/reference/collisionThisExpressionAndAmbientClassInGlobal.js @@ -7,4 +7,4 @@ var a = new _this(); // Error //// [collisionThisExpressionAndAmbientClassInGlobal.js] var _this = this; var f = function () { return _this; }; -var a = new _this(); // Error +var a = new _this(); // Error diff --git a/tests/baselines/reference/commentsClass.js b/tests/baselines/reference/commentsClass.js index 13302c3f270..cfc58798b22 100644 --- a/tests/baselines/reference/commentsClass.js +++ b/tests/baselines/reference/commentsClass.js @@ -79,14 +79,14 @@ var c3 = (function () { function c3() { } // trailing comment of constructor return c3; -})(); /* trailing comment 2 */ +})(); /* trailing comment 2 */ var i3 = new c3(); var i3_c = c3; /** Class comment*/ var c4 = (function () { /** Constructor comment*/ function c4() { - } /* trailing comment of constructor 2*/ + } /* trailing comment of constructor 2*/ return c4; })(); var i4 = new c4(); diff --git a/tests/baselines/reference/commentsClassMembers.js b/tests/baselines/reference/commentsClassMembers.js index a58db0a124f..0ff7212b366 100644 --- a/tests/baselines/reference/commentsClassMembers.js +++ b/tests/baselines/reference/commentsClassMembers.js @@ -227,7 +227,7 @@ var c1 = (function () { /** sum with property*/ c1.prototype.p2 = function (b) { return this.p1 + b; - }; /* trailing comment of method*/ + }; /* trailing comment of method*/ Object.defineProperty(c1.prototype, "p3", { /** getter property*/ get: function () { @@ -266,11 +266,11 @@ var c1 = (function () { /** static getter property*/ get: function () { return c1.s2(c1.s1); - } /*trailing comment 1 getter*/ , + } /*trailing comment 1 getter*/, /** setter property*/ set: function (value) { c1.s1 = c1.s2(value); - } /*trailing comment 2 */ /*setter*/ , + } /*trailing comment 2 */ /*setter*/, enumerable: true, configurable: true }); @@ -437,7 +437,7 @@ c1.nc_s3 = i1_s_ncprop; var i1_c = c1; var cProperties = (function () { function cProperties() { - this.x = 10; /*trailing comment for property*/ + this.x = 10; /*trailing comment for property*/ this.y = 10; // trailing comment of // style } Object.defineProperty(cProperties.prototype, "p1", { @@ -467,7 +467,7 @@ var cProperties = (function () { Object.defineProperty(cProperties.prototype, "nc_p2", { set: function (value) { this.val = value; - } /* trailing comment of setter only*/ , + } /* trailing comment of setter only*/, enumerable: true, configurable: true }); diff --git a/tests/baselines/reference/commentsEnums.js b/tests/baselines/reference/commentsEnums.js index 1c15068e3de..c8bba8a4f77 100644 --- a/tests/baselines/reference/commentsEnums.js +++ b/tests/baselines/reference/commentsEnums.js @@ -17,7 +17,7 @@ x = Colors.FancyPink; var Colors; (function (Colors) { /** Fancy name for 'blue'*/ - Colors[Colors["Cornflower"] = 0] = "Cornflower"; /* blue */ + Colors[Colors["Cornflower"] = 0] = "Cornflower"; /* blue */ /** Fancy name for 'pink'*/ Colors[Colors["FancyPink"] = 1] = "FancyPink"; })(Colors || (Colors = {})); // trailing comment diff --git a/tests/baselines/reference/commentsFunction.js b/tests/baselines/reference/commentsFunction.js index e82b5709376..40cb173d34d 100644 --- a/tests/baselines/reference/commentsFunction.js +++ b/tests/baselines/reference/commentsFunction.js @@ -40,7 +40,7 @@ lambdaFoo = (a, b) => a * b; // This is trailing comment that will not get emitt //// [commentsFunction.js] /** This comment should appear for foo*/ function foo() { -} /* trailing comment of function */ +} /* trailing comment of function */ foo(); /** This is comment for function signature*/ function fooWithParameters(a, @@ -61,9 +61,9 @@ var lambddaNoVarComment = function (a, b) { return a * b; }; lambdaFoo(10, 20); lambddaNoVarComment(10, 20); function blah(a /* multiline trailing comment -multiline */ ) { +multiline */) { } -function blah2(a /* single line multiple trailing comments */ /* second */ ) { +function blah2(a /* single line multiple trailing comments */ /* second */) { } function blah3(a // trailing commen single line ) { diff --git a/tests/baselines/reference/commentsModules.js b/tests/baselines/reference/commentsModules.js index 1dbc6cc35c5..77dc7110ec6 100644 --- a/tests/baselines/reference/commentsModules.js +++ b/tests/baselines/reference/commentsModules.js @@ -157,7 +157,7 @@ var m2; m3.c = c; })(m2.m3 || (m2.m3 = {})); var m3 = m2.m3; -})(m2 || (m2 = {})); /* trailing dotted module comment*/ +})(m2 || (m2 = {})); /* trailing dotted module comment*/ new m2.m3.c(); /** module comment of m3.m4.m5*/ var m3; @@ -191,7 +191,7 @@ var m4; })(); m7.c = c; })(m6.m7 || (m6.m7 = {})); - var m7 = m6.m7; /* trailing inner module */ /* multiple comments*/ + var m7 = m6.m7; /* trailing inner module */ /* multiple comments*/ })(m5.m6 || (m5.m6 = {})); var m6 = m5.m6; })(m4.m5 || (m4.m5 = {})); diff --git a/tests/baselines/reference/commentsOnObjectLiteral2.js b/tests/baselines/reference/commentsOnObjectLiteral2.js index 625e0769af5..5f6997a5b2b 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral2.js +++ b/tests/baselines/reference/commentsOnObjectLiteral2.js @@ -21,5 +21,5 @@ var Person = makeClass({ */ initialize: function (name) { this.name = name; - } /* trailing comment 1*/ + } /* trailing comment 1*/ }); diff --git a/tests/baselines/reference/commentsOnObjectLiteral3.js b/tests/baselines/reference/commentsOnObjectLiteral3.js index 4bf3c45d342..07500c2d606 100644 --- a/tests/baselines/reference/commentsOnObjectLiteral3.js +++ b/tests/baselines/reference/commentsOnObjectLiteral3.js @@ -22,7 +22,7 @@ var v = { //// [commentsOnObjectLiteral3.js] var v = { //property - prop: 1 /* multiple trailing comments */ /*trailing comments*/ , + prop: 1 /* multiple trailing comments */ /*trailing comments*/, //property func: function () { }, @@ -34,7 +34,7 @@ var v = { //getter get a() { return this.prop; - } /*trailing 1*/ , + } /*trailing 1*/, //setter set a(value) { this.prop = value; diff --git a/tests/baselines/reference/commentsVarDecl.js b/tests/baselines/reference/commentsVarDecl.js index 9d2b173589e..4dd7392a8ce 100644 --- a/tests/baselines/reference/commentsVarDecl.js +++ b/tests/baselines/reference/commentsVarDecl.js @@ -52,12 +52,12 @@ var anotherVariable = 30; var aVar = ""; /** this is multiline comment * All these variables are of number type */ -var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */ +var anotherAnotherVariable = 70; /* these are multiple trailing comments */ /* multiple trailing comments */ /** Triple slash multiline comment*/ /** another line in the comment*/ /** comment line 2*/ var x = 70; /* multiline trailing comment -this is multiline trailing comment */ +this is multiline trailing comment */ x = myVariable; /** triple slash comment1*/ /** jsdocstyle comment - only this comment should be in .d.ts file*/ diff --git a/tests/baselines/reference/conditionalExpression1.js b/tests/baselines/reference/conditionalExpression1.js index 5c59c7eca91..4d90548ec62 100644 --- a/tests/baselines/reference/conditionalExpression1.js +++ b/tests/baselines/reference/conditionalExpression1.js @@ -2,4 +2,4 @@ var x: boolean = (true ? 1 : ""); // should be an error //// [conditionalExpression1.js] -var x = (true ? 1 : ""); // should be an error +var x = (true ? 1 : ""); // should be an error diff --git a/tests/baselines/reference/constraints0.js b/tests/baselines/reference/constraints0.js index fa041877439..d648eb0a31c 100644 --- a/tests/baselines/reference/constraints0.js +++ b/tests/baselines/reference/constraints0.js @@ -19,4 +19,4 @@ var y = v1.x.a; // 'a' should be of type 'number' //// [constraints0.js] var v1; // should work var v2; // should not work -var y = v1.x.a; // 'a' should be of type 'number' +var y = v1.x.a; // 'a' should be of type 'number' diff --git a/tests/baselines/reference/constructorParameterProperties.js b/tests/baselines/reference/constructorParameterProperties.js index 0609d262e6d..37ba30d24b0 100644 --- a/tests/baselines/reference/constructorParameterProperties.js +++ b/tests/baselines/reference/constructorParameterProperties.js @@ -37,4 +37,4 @@ var D = (function () { var d; var r = d.y; var r2 = d.x; // error -var r3 = d.a; // error +var r3 = d.a; // error diff --git a/tests/baselines/reference/constructorParameterProperties2.js b/tests/baselines/reference/constructorParameterProperties2.js index a95a98c0c5f..8ad0c8b6ea6 100644 --- a/tests/baselines/reference/constructorParameterProperties2.js +++ b/tests/baselines/reference/constructorParameterProperties2.js @@ -46,4 +46,4 @@ var E = (function () { return E; })(); var e; -var r3 = e.y; // error +var r3 = e.y; // error diff --git a/tests/baselines/reference/contextualSignatureInstantiation1.js b/tests/baselines/reference/contextualSignatureInstantiation1.js index c6756ff6331..843ac5140f0 100644 --- a/tests/baselines/reference/contextualSignatureInstantiation1.js +++ b/tests/baselines/reference/contextualSignatureInstantiation1.js @@ -11,4 +11,4 @@ var r100 = map2(e2); // type arg inference should fail for S since a generic lam var e = function (x, y) { return x.length; }; var r99 = map(e); // should be {}[] for S since a generic lambda is not inferentially typed var e2 = function (x, y) { return x.length; }; -var r100 = map2(e2); // type arg inference should fail for S since a generic lambda is not inferentially typed. Falls back to { length: number } +var r100 = map2(e2); // type arg inference should fail for S since a generic lambda is not inferentially typed. Falls back to { length: number } diff --git a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js index 9b53c7775f0..bd76a746ac9 100644 --- a/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js +++ b/tests/baselines/reference/contextualSignatureInstantiationWithTypeParameterConstrainedToOuterTypeParameter.js @@ -14,4 +14,4 @@ function f() { return g; } var h; -var x = h("", f()); // Call should succeed and x should be string. All type parameters should be instantiated to string +var x = h("", f()); // Call should succeed and x should be string. All type parameters should be instantiated to string diff --git a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js index 64aea4e39a2..4c5cc06e75e 100644 --- a/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js +++ b/tests/baselines/reference/contextualTypingWithFixedTypeParameters1.js @@ -6,4 +6,4 @@ var r9 = f10('', () => (a => a.foo), 1); // now a should be any //// [contextualTypingWithFixedTypeParameters1.js] var f10; f10('', function () { return function (a) { return a.foo; }; }, ''); -var r9 = f10('', function () { return (function (a) { return a.foo; }); }, 1); // now a should be any +var r9 = f10('', function () { return (function (a) { return a.foo; }); }, 1); // now a should be any diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js index 1d2c9818116..350e36b9bf7 100644 --- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js +++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor.js @@ -66,4 +66,4 @@ var D = (function (_super) { return D; })(Base2); var d = new D(); // error -var d2 = new D(new Date()); // ok +var d2 = new D(new Date()); // ok diff --git a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js index ae2fc3a3eea..30711128738 100644 --- a/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js +++ b/tests/baselines/reference/derivedClassWithoutExplicitConstructor3.js @@ -108,4 +108,4 @@ var D2 = (function (_super) { })(D); var d = new D2(); // error var d2 = new D2(new Date()); // error -var d3 = new D2(new Date(), new Date()); // ok +var d3 = new D2(new Date(), new Date()); // ok diff --git a/tests/baselines/reference/duplicateVariablesWithAny.js b/tests/baselines/reference/duplicateVariablesWithAny.js index 1c6fe59b25e..9742b1bef57 100644 --- a/tests/baselines/reference/duplicateVariablesWithAny.js +++ b/tests/baselines/reference/duplicateVariablesWithAny.js @@ -31,4 +31,4 @@ var N; var y; //error })(N || (N = {})); var z; -var z; // ok +var z; // ok diff --git a/tests/baselines/reference/emptyIndexer.js b/tests/baselines/reference/emptyIndexer.js index 4f26526f288..df4bd1dbca3 100644 --- a/tests/baselines/reference/emptyIndexer.js +++ b/tests/baselines/reference/emptyIndexer.js @@ -14,4 +14,4 @@ var n = x[''].m(); // should not crash compiler //// [emptyIndexer.js] var x; -var n = x[''].m(); // should not crash compiler +var n = x[''].m(); // should not crash compiler diff --git a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js index 12895c6638d..c8ba8324ad2 100644 --- a/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js +++ b/tests/baselines/reference/exportAssignmentOfDeclaredExternalModule.js @@ -22,4 +22,4 @@ var x = new Sammy(); // error to use as constructor as there is not constructor var y = Sammy(); // error to use interface name as call target var z; // no error - z is of type interface Sammy from module 'M' var a = new z(); // constructor - no error -var b = z(); // call signature - no error +var b = z(); // call signature - no error diff --git a/tests/baselines/reference/extendNonClassSymbol1.js b/tests/baselines/reference/extendNonClassSymbol1.js index daccb94983d..47a602aefaf 100644 --- a/tests/baselines/reference/extendNonClassSymbol1.js +++ b/tests/baselines/reference/extendNonClassSymbol1.js @@ -24,4 +24,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(x); // error, could not find symbol xs +})(x); // error, could not find symbol xs diff --git a/tests/baselines/reference/extendNonClassSymbol2.js b/tests/baselines/reference/extendNonClassSymbol2.js index f9f79f708ee..4cb7b1787df 100644 --- a/tests/baselines/reference/extendNonClassSymbol2.js +++ b/tests/baselines/reference/extendNonClassSymbol2.js @@ -22,4 +22,4 @@ var C = (function (_super) { _super.apply(this, arguments); } return C; -})(Foo); // error, could not find symbol Foo +})(Foo); // error, could not find symbol Foo diff --git a/tests/baselines/reference/funClodule.js b/tests/baselines/reference/funClodule.js index 378452ce12f..8629ed63055 100644 --- a/tests/baselines/reference/funClodule.js +++ b/tests/baselines/reference/funClodule.js @@ -32,4 +32,4 @@ var foo3 = (function () { function foo3() { } return foo3; -})(); // Should error +})(); // Should error diff --git a/tests/baselines/reference/functionSignatureAssignmentCompat1.js b/tests/baselines/reference/functionSignatureAssignmentCompat1.js index 737d27be484..5de1ef53c8b 100644 --- a/tests/baselines/reference/functionSignatureAssignmentCompat1.js +++ b/tests/baselines/reference/functionSignatureAssignmentCompat1.js @@ -15,4 +15,4 @@ var e: ParserFunc = parsers.readline(); // ok var parsers; var c = parsers.raw; // ok! var d = parsers.readline; // not ok -var e = parsers.readline(); // ok +var e = parsers.readline(); // ok diff --git a/tests/baselines/reference/genericCallTypeArgumentInference.js b/tests/baselines/reference/genericCallTypeArgumentInference.js index 606ec231129..cfa366e5e2b 100644 --- a/tests/baselines/reference/genericCallTypeArgumentInference.js +++ b/tests/baselines/reference/genericCallTypeArgumentInference.js @@ -157,4 +157,4 @@ var r7 = i.foo4('', true); // string var r8 = i.foo5(true, 1); // boolean var r9 = i.foo6(); // {} var r10 = i.foo7(''); // {} -var r11 = i.foo8(); // {} +var r11 = i.foo8(); // {} diff --git a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js index 4eade3e00fd..c51b8237c6d 100644 --- a/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js +++ b/tests/baselines/reference/genericCallWithConstraintsTypeArgumentInference2.js @@ -22,4 +22,4 @@ var r = foo(1); // ok var r2 = foo(null); // {} var r3 = foo(new Object()); // {} var r4 = foo(1); // error -var r5 = foo(new Date()); // no error +var r5 = foo(new Date()); // no error diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js index 9bc5168f1e4..ca9b79c3507 100644 --- a/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js +++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments2.js @@ -67,4 +67,4 @@ function foo3(x, cb, y) { var r7 = foo3(null, i, ''); // any var r7b = foo3(null, a, ''); // any var r8 = foo3(1, i2, 1); // {} -var r9 = foo3('', i2, ''); // string +var r9 = foo3('', i2, ''); // string diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.js index 97f5bfda306..ff0082ea439 100644 --- a/tests/baselines/reference/genericCallWithFunctionTypedArguments3.js +++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments3.js @@ -29,4 +29,4 @@ function foo4(cb) { } var r = foo4(a); // T is {} (candidates boolean and string), U is any (candidates any and boolean) var b; -var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {}) +var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {}) diff --git a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js index 7a4daaeda64..06c49c64f5b 100644 --- a/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js +++ b/tests/baselines/reference/genericCallWithFunctionTypedArguments4.js @@ -41,4 +41,4 @@ function foo4(cb) { } var r = foo4(a); // T is {} (candidates boolean and string), U is {} (candidates C and D) var b; -var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {}) +var r2 = foo4(b); // T is {} (candidates boolean and {}), U is any (candidates any and {}) diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js index fa72febbfdc..7dc955b6172 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments2.js @@ -70,4 +70,4 @@ function foo3(x, a, b) { var r; return r; } -var r7 = foo3(0 /* A */, function (x) { return 0 /* A */; }, function (x) { return 0 /* A */; }); // error +var r7 = foo3(0 /* A */, function (x) { return 0 /* A */; }, function (x) { return 0 /* A */; }); // error diff --git a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js index 25ae6b48e26..8ffb4f9970b 100644 --- a/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js +++ b/tests/baselines/reference/genericCallWithGenericSignatureArguments3.js @@ -64,4 +64,4 @@ var r9 = foo2(null, function (x) { return ''; }, function (x) { return ''; }); / var r10 = foo2(null, function (x) { return ''; }, function (x) { return ''; }); // Object => Object var x; var r11 = foo2(x, function (a1) { return function (n) { return 1; }; }, function (a2) { return 2; }); // {} => {} -var r12 = foo2(x, function (a1) { return function (n) { return 1; }; }, function (a2) { return 2; }); // (string => boolean) => {} +var r12 = foo2(x, function (a1) { return function (n) { return 1; }; }, function (a2) { return 2; }); // (string => boolean) => {} diff --git a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.js b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.js index d9f84977df0..4a33c7d9bcf 100644 --- a/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.js +++ b/tests/baselines/reference/genericCallWithNonSymmetricSubtypes.js @@ -53,4 +53,4 @@ var r6 = foo(y, x); // { x?: number; }; var s1; var s2; var r7 = foo(s1, s2); // (x: Object) => string; -var r8 = foo(s2, s1); // (x: string) => string; +var r8 = foo(s2, s1); // (x: string) => string; diff --git a/tests/baselines/reference/genericCallWithObjectLiteralArgs.js b/tests/baselines/reference/genericCallWithObjectLiteralArgs.js index 117cbc114a1..76b5380a651 100644 --- a/tests/baselines/reference/genericCallWithObjectLiteralArgs.js +++ b/tests/baselines/reference/genericCallWithObjectLiteralArgs.js @@ -17,4 +17,4 @@ var r = foo({ bar: 1, baz: '' }); // T = {} var r2 = foo({ bar: 1, baz: 1 }); // T = number // BUG 835724 var r3 = foo({ bar: foo, baz: foo }); // T = any -var r4 = foo({ bar: 1, baz: '' }); // T = Object +var r4 = foo({ bar: 1, baz: '' }); // T = Object diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs.js b/tests/baselines/reference/genericCallWithObjectTypeArgs.js index c51a5f2495d..b5429e9df43 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgs.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgs.js @@ -44,4 +44,4 @@ function foo(t, t2) { var c1 = new X(); var d1 = new X(); var r = foo(c1, d1); // error -var r2 = foo(c1, c1); // ok +var r2 = foo(c1, c1); // ok diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js index d4012fbc641..3a72feff979 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgs2.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgs2.js @@ -69,4 +69,4 @@ function f2(a) { } var r3 = f2({ x: new Derived(), y: new Derived2() }); // Derived => Derived2 var i; -var r4 = f2(i); // Base => Derived +var r4 = f2(i); // Base => Derived diff --git a/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.js b/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.js index c92b4c90ef3..ae104470b76 100644 --- a/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.js +++ b/tests/baselines/reference/genericCallWithObjectTypeArgsAndInitializers.js @@ -33,4 +33,4 @@ function foo6(x, y, z) { } // error function foo7(x, y) { if (y === void 0) { y = x; } -} // should be ok +} // should be ok diff --git a/tests/baselines/reference/genericClasses0.js b/tests/baselines/reference/genericClasses0.js index b4b80c5277c..158793a9cbf 100644 --- a/tests/baselines/reference/genericClasses0.js +++ b/tests/baselines/reference/genericClasses0.js @@ -14,7 +14,7 @@ var C = (function () { return C; })(); var v1; -var y = v1.x; // should be 'string' +var y = v1.x; // should be 'string' //// [genericClasses0.d.ts] diff --git a/tests/baselines/reference/genericClasses1.js b/tests/baselines/reference/genericClasses1.js index a4b321f8ed9..804d6624a32 100644 --- a/tests/baselines/reference/genericClasses1.js +++ b/tests/baselines/reference/genericClasses1.js @@ -14,7 +14,7 @@ var C = (function () { return C; })(); var v1 = new C(); -var y = v1.x; // should be 'string' +var y = v1.x; // should be 'string' //// [genericClasses1.d.ts] diff --git a/tests/baselines/reference/genericClasses2.js b/tests/baselines/reference/genericClasses2.js index d4ea5bcab91..b581621dc97 100644 --- a/tests/baselines/reference/genericClasses2.js +++ b/tests/baselines/reference/genericClasses2.js @@ -24,7 +24,7 @@ var C = (function () { var v1; var y = v1.x; // should be 'string' var w = v1.y.a; // should be 'string' -var z = v1.z.a; // should be 'number' +var z = v1.z.a; // should be 'number' //// [genericClasses2.d.ts] diff --git a/tests/baselines/reference/genericCloneReturnTypes2.js b/tests/baselines/reference/genericCloneReturnTypes2.js index 621b1487b44..9a1201af7f8 100644 --- a/tests/baselines/reference/genericCloneReturnTypes2.js +++ b/tests/baselines/reference/genericCloneReturnTypes2.js @@ -29,4 +29,4 @@ var MyList = (function () { var a; var b = a.clone(); // ok var c = a.clone(); // bug was there was an error on this line -var d = a.clone(); // error +var d = a.clone(); // error diff --git a/tests/baselines/reference/genericFunctions0.js b/tests/baselines/reference/genericFunctions0.js index 9b81a844a02..408abdb9ce0 100644 --- a/tests/baselines/reference/genericFunctions0.js +++ b/tests/baselines/reference/genericFunctions0.js @@ -7,7 +7,7 @@ var x = foo(5); // 'x' should be number function foo(x) { return x; } -var x = foo(5); // 'x' should be number +var x = foo(5); // 'x' should be number //// [genericFunctions0.d.ts] diff --git a/tests/baselines/reference/genericFunctions1.js b/tests/baselines/reference/genericFunctions1.js index 6f6909a5059..25cc91820b8 100644 --- a/tests/baselines/reference/genericFunctions1.js +++ b/tests/baselines/reference/genericFunctions1.js @@ -7,7 +7,7 @@ var x = foo(5); // 'x' should be number function foo(x) { return x; } -var x = foo(5); // 'x' should be number +var x = foo(5); // 'x' should be number //// [genericFunctions1.d.ts] diff --git a/tests/baselines/reference/genericImplements.js b/tests/baselines/reference/genericImplements.js index 73beda1dcfb..17d3d2c0d20 100644 --- a/tests/baselines/reference/genericImplements.js +++ b/tests/baselines/reference/genericImplements.js @@ -59,4 +59,4 @@ var Z = (function () { return undefined; }; return Z; -})(); // { f: () => T } +})(); // { f: () => T } diff --git a/tests/baselines/reference/genericInference2.js b/tests/baselines/reference/genericInference2.js index db36f35eccc..8724dae47c4 100644 --- a/tests/baselines/reference/genericInference2.js +++ b/tests/baselines/reference/genericInference2.js @@ -30,4 +30,4 @@ var age_v = o.age(); // should be 'number' var name_v = o.name("Robert"); // should be 'any' var zz_v = o.name.N; // should be 'number' var yy_v = o.name.g; // should be 'boolean' -var rr_v = o.name.r; // should be 'string' +var rr_v = o.name.r; // should be 'string' diff --git a/tests/baselines/reference/genericOfACloduleType1.js b/tests/baselines/reference/genericOfACloduleType1.js index 495eaa5bfb4..f9899f33cfc 100644 --- a/tests/baselines/reference/genericOfACloduleType1.js +++ b/tests/baselines/reference/genericOfACloduleType1.js @@ -43,4 +43,4 @@ var M; var g1 = new G(); g1.bar(null).foo(); })(M || (M = {})); -var g2 = new G(); // was: error Type reference cannot refer to container 'M.C'. +var g2 = new G(); // was: error Type reference cannot refer to container 'M.C'. diff --git a/tests/baselines/reference/genericRestArgs.js b/tests/baselines/reference/genericRestArgs.js index cae140ca019..75c88d7cbf2 100644 --- a/tests/baselines/reference/genericRestArgs.js +++ b/tests/baselines/reference/genericRestArgs.js @@ -29,4 +29,4 @@ function makeArrayGOpt(item1, item2, item3) { } var a2Ga = makeArrayGOpt(1, ""); var a2Gb = makeArrayG(1, ""); -var a2Gc = makeArrayG(1, ""); // error +var a2Gc = makeArrayG(1, ""); // error diff --git a/tests/baselines/reference/genericTypeAssertions1.js b/tests/baselines/reference/genericTypeAssertions1.js index c107cefc4e8..02a22aa5c81 100644 --- a/tests/baselines/reference/genericTypeAssertions1.js +++ b/tests/baselines/reference/genericTypeAssertions1.js @@ -14,4 +14,4 @@ var A = (function () { })(); var foo = new A(); var r = new A(); // error -var r2 = foo; // error +var r2 = foo; // error diff --git a/tests/baselines/reference/genericTypeAssertions2.js b/tests/baselines/reference/genericTypeAssertions2.js index a7dd3b5352e..c7acecb5e43 100644 --- a/tests/baselines/reference/genericTypeAssertions2.js +++ b/tests/baselines/reference/genericTypeAssertions2.js @@ -42,4 +42,4 @@ var r = new B(); var r2 = new B(); // error var r3 = new B(); // error var r4 = new A(); -var r5 = []; // error +var r5 = []; // error diff --git a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js index a82d7407724..441123c9fd4 100644 --- a/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js +++ b/tests/baselines/reference/genericWithIndexerOfTypeParameterType1.js @@ -19,4 +19,4 @@ var LazyArray = (function () { return LazyArray; })(); var lazyArray = new LazyArray(); -var value = lazyArray.array()["test"]; // used to be an error +var value = lazyArray.array()["test"]; // used to be an error diff --git a/tests/baselines/reference/generics0.js b/tests/baselines/reference/generics0.js index d12c5e1970a..2772397c055 100644 --- a/tests/baselines/reference/generics0.js +++ b/tests/baselines/reference/generics0.js @@ -9,7 +9,7 @@ var z = v2.x; // 'y' should be of type 'string' //// [generics0.js] var v2; -var z = v2.x; // 'y' should be of type 'string' +var z = v2.x; // 'y' should be of type 'string' //// [generics0.d.ts] diff --git a/tests/baselines/reference/generics1NoError.js b/tests/baselines/reference/generics1NoError.js index 627b25c1748..66b0ca3baff 100644 --- a/tests/baselines/reference/generics1NoError.js +++ b/tests/baselines/reference/generics1NoError.js @@ -13,7 +13,7 @@ var v4: G, C>; // Ok //// [generics1NoError.js] var v1; // Ok var v2; // Ok, equivalent to G -var v4; // Ok +var v4; // Ok //// [generics1NoError.d.ts] diff --git a/tests/baselines/reference/generics2NoError.js b/tests/baselines/reference/generics2NoError.js index e26bb66605b..047275f4f4c 100644 --- a/tests/baselines/reference/generics2NoError.js +++ b/tests/baselines/reference/generics2NoError.js @@ -20,7 +20,7 @@ var v4: G, C>; // Ok //// [generics2NoError.js] var v1; // Ok var v2; // Ok, equivalent to G -var v4; // Ok +var v4; // Ok //// [generics2NoError.d.ts] diff --git a/tests/baselines/reference/globalThis.js b/tests/baselines/reference/globalThis.js index e63431470a5..ce706376a0f 100644 --- a/tests/baselines/reference/globalThis.js +++ b/tests/baselines/reference/globalThis.js @@ -2,4 +2,4 @@ var __e = Math.E; // should not generate 'this.Math.E' //// [globalThis.js] -var __e = Math.E; // should not generate 'this.Math.E' +var __e = Math.E; // should not generate 'this.Math.E' diff --git a/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js b/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js index a1e0c16b557..4218d9a9a21 100644 --- a/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js +++ b/tests/baselines/reference/implicitAnyNewExprLackConstructorSignature.js @@ -6,4 +6,4 @@ var x: any = new Point(); // error at "new" function Point() { this.x = 3; } -var x = new Point(); // error at "new" +var x = new Point(); // error at "new" diff --git a/tests/baselines/reference/indexer3.js b/tests/baselines/reference/indexer3.js index 2bb77d7cea6..a14418792cf 100644 --- a/tests/baselines/reference/indexer3.js +++ b/tests/baselines/reference/indexer3.js @@ -4,4 +4,4 @@ var r: Date = dateMap["hello"] // result type includes indexer using BCT //// [indexer3.js] var dateMap = {}; -var r = dateMap["hello"]; // result type includes indexer using BCT +var r = dateMap["hello"]; // result type includes indexer using BCT diff --git a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js index 2c12d9c2ae6..35f0928378c 100644 --- a/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js +++ b/tests/baselines/reference/inferentialTypingWithFunctionTypeZip.js @@ -8,4 +8,4 @@ var i = result[0].x; // number var pair; var zipWith; var result = zipWith([1, 2], ['a', 'b'], pair); -var i = result[0].x; // number +var i = result[0].x; // number diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js index 38c4dc7c2cb..3634d088a98 100644 --- a/tests/baselines/reference/interfaceExtendingClassWithPrivates.js +++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates.js @@ -23,4 +23,4 @@ var Foo = (function () { })(); var i; var r = i.y; -var r2 = i.x; // error +var r2 = i.x; // error diff --git a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js index ace63a486ba..6726d560a8c 100644 --- a/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js +++ b/tests/baselines/reference/interfaceExtendingClassWithPrivates2.js @@ -46,4 +46,4 @@ var Baz = (function () { var i; var r = i.z; var r2 = i.x; // error -var r3 = i.y; // error +var r3 = i.y; // error diff --git a/tests/baselines/reference/logicalOrOperatorWithEveryType.js b/tests/baselines/reference/logicalOrOperatorWithEveryType.js index bdd6802ea6a..bf7a641882e 100644 --- a/tests/baselines/reference/logicalOrOperatorWithEveryType.js +++ b/tests/baselines/reference/logicalOrOperatorWithEveryType.js @@ -243,4 +243,4 @@ var rf6 = a6 || undefined; // enum || undefined is E var rf7 = a7 || undefined; // object || undefined is object var rf8 = a8 || undefined; // array || undefined is array var rf9 = null || undefined; // null || undefined is any -var rf10 = undefined || undefined; // undefined || undefined is any +var rf10 = undefined || undefined; // undefined || undefined is any diff --git a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js index c7ee59c771a..dc347e95580 100644 --- a/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPrivateOverloads.js @@ -81,4 +81,4 @@ var r = c.foo(1); // error var d; var r2 = d.foo(2); // error var r3 = C.foo(1); // error -var r4 = D.bar(''); // error +var r4 = D.bar(''); // error diff --git a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js index 94267971dd1..27e3bb5e85d 100644 --- a/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js +++ b/tests/baselines/reference/memberFunctionsWithPublicPrivateOverloads.js @@ -75,4 +75,4 @@ var D = (function () { var c; var r = c.foo(1); // error var d; -var r2 = d.foo(2); // error +var r2 = d.foo(2); // error diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js index 54f164b7999..2502b46b06b 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates.js @@ -43,4 +43,4 @@ var E = (function () { return E; })(); var a; -var r = a.x; // error +var r = a.x; // error diff --git a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js index 0c4419a5fa8..e9f16103535 100644 --- a/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js +++ b/tests/baselines/reference/mergedInterfacesWithInheritedPrivates2.js @@ -64,4 +64,4 @@ var E = (function (_super) { })(C2); var a; var r = a.x; // error -var r2 = a.w; // error +var r2 = a.w; // error diff --git a/tests/baselines/reference/moduleWithNoValuesAsType.js b/tests/baselines/reference/moduleWithNoValuesAsType.js index 84d3bdebfce..415ed1f7286 100644 --- a/tests/baselines/reference/moduleWithNoValuesAsType.js +++ b/tests/baselines/reference/moduleWithNoValuesAsType.js @@ -18,4 +18,4 @@ var c: C; // error //// [moduleWithNoValuesAsType.js] var a; // error var b; // error -var c; // error +var c; // error diff --git a/tests/baselines/reference/moduleWithValuesAsType.js b/tests/baselines/reference/moduleWithValuesAsType.js index dedb146ee5b..4e26f1029a1 100644 --- a/tests/baselines/reference/moduleWithValuesAsType.js +++ b/tests/baselines/reference/moduleWithValuesAsType.js @@ -10,4 +10,4 @@ var A; (function (A) { var b = 1; })(A || (A = {})); -var a; // no error +var a; // no error diff --git a/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.js b/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.js index 026443b3c16..db71542e775 100644 --- a/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.js +++ b/tests/baselines/reference/newExpressionWithTypeParameterConstrainedToOuterTypeParameter.js @@ -7,4 +7,4 @@ var y = new i(""); // y should be string //// [newExpressionWithTypeParameterConstrainedToOuterTypeParameter.js] var i; -var y = new i(""); // y should be string +var y = new i(""); // y should be string diff --git a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js index 81b3f281cc0..560c8c3cbd7 100644 --- a/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js +++ b/tests/baselines/reference/nonGenericClassExtendingGenericClassWithAny.js @@ -23,4 +23,4 @@ var Bar = (function (_super) { _super.apply(this, arguments); } return Bar; -})(Foo); // Valid +})(Foo); // Valid diff --git a/tests/baselines/reference/nullAssignedToUndefined.js b/tests/baselines/reference/nullAssignedToUndefined.js index a2ac0458d1a..a4123a4c595 100644 --- a/tests/baselines/reference/nullAssignedToUndefined.js +++ b/tests/baselines/reference/nullAssignedToUndefined.js @@ -4,4 +4,4 @@ var y: typeof undefined = null; // ok, widened //// [nullAssignedToUndefined.js] var x = undefined = null; // error -var y = null; // ok, widened +var y = null; // ok, widened diff --git a/tests/baselines/reference/numericIndexerTyping1.js b/tests/baselines/reference/numericIndexerTyping1.js index 252737db164..252e05fa341 100644 --- a/tests/baselines/reference/numericIndexerTyping1.js +++ b/tests/baselines/reference/numericIndexerTyping1.js @@ -16,4 +16,4 @@ var r2: string = i2[1]; // error: numeric indexer returns the type of the string var i; var r = i[1]; // error: numeric indexer returns the type of the string indexer var i2; -var r2 = i2[1]; // error: numeric indexer returns the type of the string indexer +var r2 = i2[1]; // error: numeric indexer returns the type of the string indexer diff --git a/tests/baselines/reference/numericIndexerTyping2.js b/tests/baselines/reference/numericIndexerTyping2.js index 1bd4608c065..424f56b6214 100644 --- a/tests/baselines/reference/numericIndexerTyping2.js +++ b/tests/baselines/reference/numericIndexerTyping2.js @@ -34,4 +34,4 @@ var I2 = (function (_super) { var i; var r = i[1]; // error: numeric indexer returns the type of the string indexer var i2; -var r2 = i2[1]; // error: numeric indexer returns the type of the string indexere +var r2 = i2[1]; // error: numeric indexer returns the type of the string indexere diff --git a/tests/baselines/reference/objectLiteralReferencingInternalProperties.js b/tests/baselines/reference/objectLiteralReferencingInternalProperties.js index 540661d2f39..793fa0c588a 100644 --- a/tests/baselines/reference/objectLiteralReferencingInternalProperties.js +++ b/tests/baselines/reference/objectLiteralReferencingInternalProperties.js @@ -2,4 +2,4 @@ var a = { b: 10, c: b }; // Should give error for attempting to reference b. //// [objectLiteralReferencingInternalProperties.js] -var a = { b: 10, c: b }; // Should give error for attempting to reference b. +var a = { b: 10, c: b }; // Should give error for attempting to reference b. diff --git a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.js b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.js index 8dbd2f1d66a..8c9a1fa01b4 100644 --- a/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.js +++ b/tests/baselines/reference/objectTypeWithCallSignatureHidingMembersOfExtendedFunction.js @@ -44,4 +44,4 @@ var r2 = x.apply; var r2b = x.call; var r2c = x.arguments; var r2d = x.data; -var r2e = x['hm']; // should be Object +var r2e = x['hm']; // should be Object diff --git a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.js b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.js index 3895e9951a3..d796c0fadf9 100644 --- a/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.js +++ b/tests/baselines/reference/objectTypeWithConstructSignatureHidingMembersOfExtendedFunction.js @@ -41,4 +41,4 @@ var r2 = x.apply; var r2b = x.call; var r2c = x.arguments; var r2d = x.data; -var r2e = x['hm']; // should be Object +var r2e = x['hm']; // should be Object diff --git a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js index db70c6f2b4b..51bf62f7ba3 100644 --- a/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js +++ b/tests/baselines/reference/overloadOnConstInObjectLiteralImplementingAnInterface.js @@ -7,4 +7,4 @@ var i2: I = { x1: (a: number, cb: (x: 'hi') => number) => { } }; // error //// [overloadOnConstInObjectLiteralImplementingAnInterface.js] var i2 = { x1: function (a, cb) { -} }; // error +} }; // error diff --git a/tests/baselines/reference/overloadResolutionTest1.js b/tests/baselines/reference/overloadResolutionTest1.js index daca66aae7d..a08243fb27a 100644 --- a/tests/baselines/reference/overloadResolutionTest1.js +++ b/tests/baselines/reference/overloadResolutionTest1.js @@ -45,4 +45,4 @@ function foo4(bar) { return bar; } ; -var x = foo4({ a: true }); // error +var x = foo4({ a: true }); // error diff --git a/tests/baselines/reference/overloadingOnConstants2.js b/tests/baselines/reference/overloadingOnConstants2.js index 7d9924ffd3e..4a3f49d1b06 100644 --- a/tests/baselines/reference/overloadingOnConstants2.js +++ b/tests/baselines/reference/overloadingOnConstants2.js @@ -64,4 +64,4 @@ function bar(x, items) { } var d = bar("hi", []); // D var e = bar("bye", []); // E -var f = bar("um", []); // C +var f = bar("um", []); // C diff --git a/tests/baselines/reference/partiallyAmbientClodule.js b/tests/baselines/reference/partiallyAmbientClodule.js index fa4c5abd6ac..52077a4b4ad 100644 --- a/tests/baselines/reference/partiallyAmbientClodule.js +++ b/tests/baselines/reference/partiallyAmbientClodule.js @@ -9,4 +9,4 @@ var foo = (function () { function foo() { } return foo; -})(); // Legal, because module is ambient +})(); // Legal, because module is ambient diff --git a/tests/baselines/reference/partiallyAmbientFundule.js b/tests/baselines/reference/partiallyAmbientFundule.js index bdb95fb9451..21cb5179aef 100644 --- a/tests/baselines/reference/partiallyAmbientFundule.js +++ b/tests/baselines/reference/partiallyAmbientFundule.js @@ -6,4 +6,4 @@ function foo () { } // Legal, because module is ambient //// [partiallyAmbientFundule.js] function foo() { -} // Legal, because module is ambient +} // Legal, because module is ambient diff --git a/tests/baselines/reference/privacyVar.js b/tests/baselines/reference/privacyVar.js index 93ebcd202df..7d3d94dc4eb 100644 --- a/tests/baselines/reference/privacyVar.js +++ b/tests/baselines/reference/privacyVar.js @@ -336,4 +336,4 @@ exports.glo_v14_public = new glo_C2_private(); // error var glo_v21_private = new glo_C1_public(); exports.glo_v22_public = new glo_C1_public(); var glo_v23_private = new glo_C2_private(); -exports.glo_v24_public = new glo_C2_private(); // error +exports.glo_v24_public = new glo_C2_private(); // error diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js index 2f69ba01d61..1d0962d30db 100644 --- a/tests/baselines/reference/promiseChaining.js +++ b/tests/baselines/reference/promiseChaining.js @@ -19,7 +19,7 @@ var Chain = (function () { Chain.prototype.then = function (cb) { var result = cb(this.value); // should get a fresh type parameter which each then call - var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; }) /*number*/ ; // No error + var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; }) /*number*/; // No error return new Chain(result); }; return Chain; diff --git a/tests/baselines/reference/promiseChaining1.js b/tests/baselines/reference/promiseChaining1.js index 26d5d21339d..9dc167f2db6 100644 --- a/tests/baselines/reference/promiseChaining1.js +++ b/tests/baselines/reference/promiseChaining1.js @@ -19,7 +19,7 @@ var Chain2 = (function () { Chain2.prototype.then = function (cb) { var result = cb(this.value); // should get a fresh type parameter which each then call - var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; }) /*number*/ ; // Should error on "abc" because it is not a Function + var z = this.then(function (x) { return result; }).then(function (x) { return "abc"; }).then(function (x) { return x.length; }) /*number*/; // Should error on "abc" because it is not a Function return new Chain2(result); }; return Chain2; diff --git a/tests/baselines/reference/promisePermutations.js b/tests/baselines/reference/promisePermutations.js index 0b1562121c8..189ef40335e 100644 --- a/tests/baselines/reference/promisePermutations.js +++ b/tests/baselines/reference/promisePermutations.js @@ -276,4 +276,4 @@ var r12a = r12.then(testFunction12, testFunction12, testFunction12); // ok var s12 = testFunction12(function (x) { return x; }); var s12a = s12.then(testFunction12, testFunction12, testFunction12); // ok var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok -var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok +var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok diff --git a/tests/baselines/reference/promisePermutations2.js b/tests/baselines/reference/promisePermutations2.js index d8190627d16..039628c52f2 100644 --- a/tests/baselines/reference/promisePermutations2.js +++ b/tests/baselines/reference/promisePermutations2.js @@ -275,4 +275,4 @@ var r12a = r12.then(testFunction12, testFunction12, testFunction12); // ok var s12 = testFunction12(function (x) { return x; }); var s12a = s12.then(testFunction12, testFunction12, testFunction12); // ok var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok -var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok +var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok diff --git a/tests/baselines/reference/promisePermutations3.js b/tests/baselines/reference/promisePermutations3.js index f3800328dec..9fc56fff7c8 100644 --- a/tests/baselines/reference/promisePermutations3.js +++ b/tests/baselines/reference/promisePermutations3.js @@ -275,4 +275,4 @@ var r12a = r12.then(testFunction12, testFunction12, testFunction12); // ok var s12 = testFunction12(function (x) { return x; }); var s12a = s12.then(testFunction12, testFunction12, testFunction12); // ok var s12b = s12.then(testFunction12P, testFunction12P, testFunction12P); // ok -var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok +var s12c = s12.then(testFunction12P, testFunction12, testFunction12); // ok diff --git a/tests/baselines/reference/propertyAccess.js b/tests/baselines/reference/propertyAccess.js index dd1eff6ccb4..89b4751635d 100644 --- a/tests/baselines/reference/propertyAccess.js +++ b/tests/baselines/reference/propertyAccess.js @@ -231,4 +231,4 @@ var yy; var zz = bothIndex['1.0']; var zz; // Bracket notation property access using value of other type on type with numeric index signature and no string index signature and string index signature -var zzzz = bothIndex[window]; // Error +var zzzz = bothIndex[window]; // Error diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js index 7ea2f3f4e46..31eb2ab99e7 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints2.js @@ -164,4 +164,4 @@ var b = { // return a + x.foo(); // } //} -var r4 = b.foo(aB, aB); // no inferences for T so constraint isn't satisfied, error +var r4 = b.foo(aB, aB); // no inferences for T so constraint isn't satisfied, error diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js index d9bf76dd73a..464c04077e6 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints3.js @@ -116,4 +116,4 @@ var b = { return a + x.foo(); } }; -var r4 = b.foo(new B()); // valid call to an invalid function +var r4 = b.foo(new B()); // valid call to an invalid function diff --git a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js index 23e9e06882d..3a88ec832f7 100644 --- a/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js +++ b/tests/baselines/reference/propertyAccessOnTypeParameterWithConstraints5.js @@ -95,4 +95,4 @@ var b = { // BUG 794164 bar: b.foo(1).notHere() }; -var r4 = b.foo(new B()); // error after constraints above made illegal, doesn't matter +var r4 = b.foo(new B()); // error after constraints above made illegal, doesn't matter diff --git a/tests/baselines/reference/propertyParameterWithQuestionMark.js b/tests/baselines/reference/propertyParameterWithQuestionMark.js index b7876ae8571..5191927b67b 100644 --- a/tests/baselines/reference/propertyParameterWithQuestionMark.js +++ b/tests/baselines/reference/propertyParameterWithQuestionMark.js @@ -20,4 +20,4 @@ var C = (function () { var v = {}; // Should fail var v2; v = v2; -var v3 = new C; // Should succeed +var v3 = new C; // Should succeed diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js index fb71e9d51be..59f4f8c8a94 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js @@ -27,5 +27,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js] define(["require", "exports"], function (require, exports) { - exports.b; // This should result in type ClassB + exports.b; // This should result in type ClassB }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js index 11e5fb873e8..48f35df3097 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js @@ -31,5 +31,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js] define(["require", "exports"], function (require, exports) { - exports.b; // This should result in type ClassB + exports.b; // This should result in type ClassB }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js index 61d42b33e81..c7456cda942 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js @@ -35,5 +35,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js] define(["require", "exports"], function (require, exports) { - exports.b; // This should result in type ClassB + exports.b; // This should result in type ClassB }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js index 7ccd5178cc9..8123273846f 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js @@ -28,5 +28,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js] define(["require", "exports"], function (require, exports) { - exports.b; // This should result in type ClassB + exports.b; // This should result in type ClassB }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js index fb127acbcb3..8dc0bca5fb0 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js @@ -36,5 +36,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js] define(["require", "exports"], function (require, exports) { - exports.b; // This should result in type ClassB + exports.b; // This should result in type ClassB }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js index b4798c6fc06..666f5a996bb 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js @@ -44,5 +44,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js] define(["require", "exports"], function (require, exports) { - exports.b; // This should result in type ClassB + exports.b; // This should result in type ClassB }); diff --git a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js index b6e8b736152..f5568b5e39d 100644 --- a/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js +++ b/tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js @@ -46,5 +46,5 @@ define(["require", "exports"], function (require, exports) { }); //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js] define(["require", "exports"], function (require, exports) { - exports.b; // This should result in type ClassB + exports.b; // This should result in type ClassB }); diff --git a/tests/baselines/reference/recursiveTypeInGenericConstraint.js b/tests/baselines/reference/recursiveTypeInGenericConstraint.js index d5405fc9821..16ebdd2f6d9 100644 --- a/tests/baselines/reference/recursiveTypeInGenericConstraint.js +++ b/tests/baselines/reference/recursiveTypeInGenericConstraint.js @@ -29,4 +29,4 @@ var D = (function () { } return D; })(); -var c1 = new Foo(); // ok, circularity in assignment compat check causes success +var c1 = new Foo(); // ok, circularity in assignment compat check causes success diff --git a/tests/baselines/reference/returnTypeParameter.js b/tests/baselines/reference/returnTypeParameter.js index fcf3714583d..58667207055 100644 --- a/tests/baselines/reference/returnTypeParameter.js +++ b/tests/baselines/reference/returnTypeParameter.js @@ -7,4 +7,4 @@ function f(a) { } // error, no return statement function f2(a) { return T; -} // bug was that this satisfied the return statement requirement +} // bug was that this satisfied the return statement requirement diff --git a/tests/baselines/reference/sourceMapValidationClasses.js b/tests/baselines/reference/sourceMapValidationClasses.js index 25c2293bb22..ad896ed463a 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js +++ b/tests/baselines/reference/sourceMapValidationClasses.js @@ -60,7 +60,7 @@ var Foo; for (var _i = 1; _i < arguments.length; _i++) { restGreetings[_i - 1] = arguments[_i]; } - var greeters = []; /* inline block comment */ + var greeters = []; /* inline block comment */ greeters[0] = new Greeter(greeting); for (var i = 0; i < restGreetings.length; i++) { greeters.push(new Greeter(restGreetings[i])); diff --git a/tests/baselines/reference/sourceMapValidationClasses.js.map b/tests/baselines/reference/sourceMapValidationClasses.js.map index 89e595f5a6d..a599f1c72a9 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.js.map +++ b/tests/baselines/reference/sourceMapValidationClasses.js.map @@ -1,2 +1,2 @@ //// [sourceMapValidationClasses.js.map] -{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAACA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,uBAA8CA;iBAA9CA,WAA8CA,CAA9CA,sBAA8CA,CAA9CA,IAA8CA;gBAA9CA,sCAA8CA;;YAC1EA,IAAIA,QAAQA,GAAcA,EAAEA,EAAEA,0BAA0BA,CAA3BA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QAEpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAnCUD,OAAGA,KAAHA,OAAGA,QAmCbA;IAnCUA,IAAAA,GAAGA,GAAHA,OAmCVA,CAAAA;AAADA,CAACA,EAnCM,GAAG,KAAH,GAAG,QAmCT"} \ No newline at end of file +{"version":3,"file":"sourceMapValidationClasses.js","sourceRoot":"","sources":["sourceMapValidationClasses.ts"],"names":["Foo","Foo.Bar","Foo.Bar.Greeter","Foo.Bar.Greeter.constructor","Foo.Bar.Greeter.greet","Foo.Bar.foo","Foo.Bar.foo2"],"mappings":"AAAA,IAAO,GAAG,CAmCT;AAnCD,WAAO,GAAG;IAACA,WAAAA,GAAGA,EAACA,CAACA;QACZC,YAAYA,CAACA;QAEbA,IAAMA,OAAOA;YACTC,SADEA,OAAOA,CACUA,QAAgBA;gBAAhBC,aAAQA,GAARA,QAAQA,CAAQA;YACnCA,CAACA;YAEDD,uBAAKA,GAALA;gBACIE,MAAMA,CAACA,MAAMA,GAAGA,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5CA,CAACA;YACLF,cAACA;QAADA,CAACA,AAPDD,IAOCA;QAGDA,SAASA,GAAGA,CAACA,QAAgBA;YACzBI,MAAMA,CAACA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;QACjCA,CAACA;QAEDJ,IAAIA,OAAOA,GAAGA,IAAIA,OAAOA,CAACA,eAAeA,CAACA,CAACA;QAC3CA,IAAIA,GAAGA,GAAGA,OAAOA,CAACA,KAAKA,EAAEA,CAACA;QAE1BA,SAASA,IAAIA,CAACA,QAAgBA;YAAEK,uBAA8CA;iBAA9CA,WAA8CA,CAA9CA,sBAA8CA,CAA9CA,IAA8CA;gBAA9CA,sCAA8CA;;YAC1EA,IAAIA,QAAQA,GAAcA,EAAEA,EAAEA,0BAA0BA,AAA3BA;YAC7BA,QAAQA,CAACA,CAACA,CAACA,GAAGA,IAAIA,OAAOA,CAACA,QAAQA,CAACA,CAACA;YACpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,aAAaA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;gBAC5CA,QAAQA,CAACA,IAAIA,CAACA,IAAIA,OAAOA,CAACA,aAAaA,CAACA,CAACA,CAACA,CAACA,CAACA,CAACA;YACjDA,CAACA;YAEDA,MAAMA,CAACA,QAAQA,CAACA;QACpBA,CAACA;QAEDL,IAAIA,CAACA,GAAGA,IAAIA,CAACA,OAAOA,EAAEA,OAAOA,EAAEA,GAAGA,CAACA,CAACA;QAEpCA,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,CAACA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;YAChCA,CAACA,CAACA,CAACA,CAACA,CAACA,KAAKA,EAAEA,CAACA;QACjBA,CAACA;IACLA,CAACA,EAnCUD,OAAGA,KAAHA,OAAGA,QAmCbA;IAnCUA,IAAAA,GAAGA,GAAHA,OAmCVA,CAAAA;AAADA,CAACA,EAnCM,GAAG,KAAH,GAAG,QAmCT"} \ No newline at end of file diff --git a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt index 78f9ed083a7..1fe25cf6fe0 100644 --- a/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt +++ b/tests/baselines/reference/sourceMapValidationClasses.sourcemap.txt @@ -436,7 +436,7 @@ sourceFile:sourceMapValidationClasses.ts 2 >Emitted(22, 55) Source(21, 83) + SourceIndex(0) name (Foo.Bar.foo2) --- >>> } ->>> var greeters = []; /* inline block comment */ +>>> var greeters = []; /* inline block comment */ 1 >^^^^^^^^^^^^ 2 > ^^^^ 3 > ^^^^^^^^ @@ -444,7 +444,7 @@ sourceFile:sourceMapValidationClasses.ts 5 > ^^ 6 > ^^ 7 > ^^^^^^^^^^^^^^^^^^^^^^^^^^ -8 > ^ +8 > 1 >) { > 2 > var @@ -461,7 +461,7 @@ sourceFile:sourceMapValidationClasses.ts 5 >Emitted(24, 30) Source(22, 37) + SourceIndex(0) name (Foo.Bar.foo2) 6 >Emitted(24, 32) Source(22, 39) + SourceIndex(0) name (Foo.Bar.foo2) 7 >Emitted(24, 58) Source(22, 65) + SourceIndex(0) name (Foo.Bar.foo2) -8 >Emitted(24, 59) Source(22, 38) + SourceIndex(0) name (Foo.Bar.foo2) +8 >Emitted(24, 58) Source(22, 38) + SourceIndex(0) name (Foo.Bar.foo2) --- >>> greeters[0] = new Greeter(greeting); 1 >^^^^^^^^^^^^ diff --git a/tests/baselines/reference/stringPropertyAccessWithError.js b/tests/baselines/reference/stringPropertyAccessWithError.js index 728a9048fff..bdecad91c49 100644 --- a/tests/baselines/reference/stringPropertyAccessWithError.js +++ b/tests/baselines/reference/stringPropertyAccessWithError.js @@ -4,4 +4,4 @@ var d = x['charAt']('invalid'); // error //// [stringPropertyAccessWithError.js] var x = ''; -var d = x['charAt']('invalid'); // error +var d = x['charAt']('invalid'); // error diff --git a/tests/baselines/reference/subtypingWithCallSignaturesA.js b/tests/baselines/reference/subtypingWithCallSignaturesA.js index 5de75bf6214..a6c8da99b8c 100644 --- a/tests/baselines/reference/subtypingWithCallSignaturesA.js +++ b/tests/baselines/reference/subtypingWithCallSignaturesA.js @@ -3,4 +3,4 @@ declare function foo3(cb: (x: number) => number): typeof cb; var r5 = foo3((x: number) => ''); // error //// [subtypingWithCallSignaturesA.js] -var r5 = foo3(function (x) { return ''; }); // error +var r5 = foo3(function (x) { return ''; }); // error diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js index 59d7383b83f..07a256b2052 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality2.js @@ -37,4 +37,4 @@ var r = true ? a : b; // error // object literal case var a; var b; -var r = true ? a : b; // error +var r = true ? a : b; // error diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.js b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.js index 4ce80c0b1a1..e4e1d802b5d 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality3.js +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality3.js @@ -37,4 +37,4 @@ var r = true ? a : b; // ok // object literal case var a; var b; -var r = true ? a : b; // ok +var r = true ? a : b; // ok diff --git a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.js b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.js index 6e468ceb3de..b543c5bd71a 100644 --- a/tests/baselines/reference/subtypingWithObjectMembersOptionality4.js +++ b/tests/baselines/reference/subtypingWithObjectMembersOptionality4.js @@ -37,4 +37,4 @@ var r = true ? a : b; // ok // object literal case var a; var b; -var r = true ? a : b; // ok +var r = true ? a : b; // ok diff --git a/tests/baselines/reference/targetTypeCalls.js b/tests/baselines/reference/targetTypeCalls.js index 6b3653276fd..302419a2693 100644 --- a/tests/baselines/reference/targetTypeCalls.js +++ b/tests/baselines/reference/targetTypeCalls.js @@ -29,4 +29,4 @@ var fra4 = function () { return v; }; }(); -}(); // should work +}(); // should work diff --git a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.js b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.js index d0a0d81ff9d..2090c4fc546 100644 --- a/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.js +++ b/tests/baselines/reference/twoMergedInterfacesWithDifferingOverloads.js @@ -56,4 +56,4 @@ var r = b.foo(true); // returns Date var c; var r2 = c.foo(1, 2); // number var d; -var r3 = d.foo(1, 1); // boolean, last definition wins +var r3 = d.foo(1, 1); // boolean, last definition wins diff --git a/tests/baselines/reference/typeArgInference2.js b/tests/baselines/reference/typeArgInference2.js index 22a083b3f4c..ef76c9b33e7 100644 --- a/tests/baselines/reference/typeArgInference2.js +++ b/tests/baselines/reference/typeArgInference2.js @@ -18,4 +18,4 @@ var z2 = foo(); // Item var z3 = foo({ name: null }); // { name: any } var z4 = foo({ name: "abc" }); // { name: string } var z5 = foo({ name: "abc", a: 5 }); // { name: string; a: number } -var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 }); // Item +var z6 = foo({ name: "abc", a: 5 }, { name: "def", b: 5 }); // Item diff --git a/tests/baselines/reference/typeArgInference2WithError.js b/tests/baselines/reference/typeArgInference2WithError.js index e1241ccd24f..5951b30da81 100644 --- a/tests/baselines/reference/typeArgInference2WithError.js +++ b/tests/baselines/reference/typeArgInference2WithError.js @@ -8,4 +8,4 @@ declare function foo(x?: T, y?: T): T; var z7 = foo("abc", 5); // Error //// [typeArgInference2WithError.js] -var z7 = foo("abc", 5); // Error +var z7 = foo("abc", 5); // Error diff --git a/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.js b/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.js index 5a93258ab41..202574128b9 100644 --- a/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.js +++ b/tests/baselines/reference/typeArgumentsShouldDisallowNonGenericOverloads.js @@ -18,4 +18,4 @@ function foo(a) { var x = foo("hi"); // return type should be 'number' var y = foo("hi"); // return type should be 'string' var w = foo("hi"); // should error -var z = foo("hi"); // should error +var z = foo("hi"); // should error diff --git a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js index 995b0c75561..ce77eac85e6 100644 --- a/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js +++ b/tests/baselines/reference/typeOfEnumAndVarRedeclarations.js @@ -22,4 +22,4 @@ var E; var x = E; var x; // Shouldnt error var y = E; -var y; // two errors: the types are not identical and duplicate signatures +var y; // two errors: the types are not identical and duplicate signatures diff --git a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js index 18b059dd1c8..df1c552562e 100644 --- a/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js +++ b/tests/baselines/reference/typeParameterConstrainedToOuterTypeParameter.js @@ -12,4 +12,4 @@ var b: B = a; // assignment should be legal (both U's get instantiated t //// [typeParameterConstrainedToOuterTypeParameter.js] var a; -var b = a; // assignment should be legal (both U's get instantiated to any for comparison) +var b = a; // assignment should be legal (both U's get instantiated to any for comparison) diff --git a/tests/baselines/reference/typeofInObjectLiteralType.js b/tests/baselines/reference/typeofInObjectLiteralType.js index fcb352841db..50ac265cb71 100644 --- a/tests/baselines/reference/typeofInObjectLiteralType.js +++ b/tests/baselines/reference/typeofInObjectLiteralType.js @@ -2,4 +2,4 @@ var a: { b: number; c: typeof b }; // Should give error for attempting to use type query on b. //// [typeofInObjectLiteralType.js] -var a; // Should give error for attempting to use type query on b. +var a; // Should give error for attempting to use type query on b. diff --git a/tests/baselines/reference/typeofUndefined.js b/tests/baselines/reference/typeofUndefined.js index fa320c3516b..f21bc529f9e 100644 --- a/tests/baselines/reference/typeofUndefined.js +++ b/tests/baselines/reference/typeofUndefined.js @@ -5,7 +5,7 @@ var x: any; // shouldn't be an error since type is the same as the first declara //// [typeofUndefined.js] var x; -var x; // shouldn't be an error since type is the same as the first declaration +var x; // shouldn't be an error since type is the same as the first declaration //// [typeofUndefined.d.ts] diff --git a/tests/baselines/reference/undefinedInferentialTyping.js b/tests/baselines/reference/undefinedInferentialTyping.js index d4222bac447..e0d62a75cfe 100644 --- a/tests/baselines/reference/undefinedInferentialTyping.js +++ b/tests/baselines/reference/undefinedInferentialTyping.js @@ -9,4 +9,4 @@ var a = f([], 3); // should be number function f(arr, elemnt) { return null; } -var a = f([], 3); // should be number +var a = f([], 3); // should be number diff --git a/tests/baselines/reference/widenedTypes.js b/tests/baselines/reference/widenedTypes.js index a5648c6f93a..937cfd37520 100644 --- a/tests/baselines/reference/widenedTypes.js +++ b/tests/baselines/reference/widenedTypes.js @@ -42,4 +42,4 @@ u[3] = ""; var ob = { x: "" }; // Highlights the difference between array literals and object literals var arr = [3, null]; // not assignable because null is not widened. BCT is {} -var obj = { x: 3, y: null }; // assignable because null is widened, and therefore BCT is any +var obj = { x: 3, y: null }; // assignable because null is widened, and therefore BCT is any diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints2.js b/tests/baselines/reference/wrappedAndRecursiveConstraints2.js index c95e05a954c..4e752fd7ac3 100644 --- a/tests/baselines/reference/wrappedAndRecursiveConstraints2.js +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints2.js @@ -13,4 +13,4 @@ var C = (function () { return C; })(); var c = new C(1); -var c = new C(new C('')); // error +var c = new C(new C('')); // error diff --git a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js index 01a5b1fb2c8..da4117860a7 100644 --- a/tests/baselines/reference/wrappedAndRecursiveConstraints4.js +++ b/tests/baselines/reference/wrappedAndRecursiveConstraints4.js @@ -29,4 +29,4 @@ var c = new C({ length: 2 }); var r = c.foo(''); var r2 = r({ length: 3, charAt: function (x) { ''; -} }); // error +} }); // error