From 00a4aab88da937e0adb0ad22a12f02390f6ca4a7 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Tue, 12 Apr 2016 16:32:24 -0700 Subject: [PATCH] Accept baselines: better comment output --- ...WithStaticFunctionAndExportedFunctionThatShareAName.js | 8 ++++---- tests/baselines/reference/bind1.js | 4 ++-- .../reference/callSignaturesWithParameterInitializers2.js | 3 ++- .../reference/declarationEmit_inferedDefaultExportType.js | 1 + .../duplicateIdentifiersAcrossContainerBoundaries.js | 8 ++++---- .../baselines/reference/duplicateSymbolsExportMatching.js | 4 ++-- .../emitArrowFunctionWhenUsingArguments01_ES6.js | 8 ++++---- tests/baselines/reference/invalidTryStatements2.js | 2 +- tests/baselines/reference/modifierOnParameter1.js | 2 +- tests/baselines/reference/promiseChaining.js | 2 +- tests/baselines/reference/promiseChaining1.js | 2 +- tests/baselines/reference/qualifiedModuleLocals.js | 4 ++-- .../stringIndexerConstrainsPropertyDeclarations.js | 3 ++- 13 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js index d971dd160db..b8e332f1932 100644 --- a/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js +++ b/tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js @@ -33,8 +33,8 @@ var Point = (function () { }()); var Point; (function (Point) { - function Origin() { return null; } - Point.Origin = Origin; //expected duplicate identifier error + function Origin() { return null; } //expected duplicate identifier error + Point.Origin = Origin; })(Point || (Point = {})); var A; (function (A) { @@ -49,7 +49,7 @@ var A; A.Point = Point; var Point; (function (Point) { - function Origin() { return ""; } - Point.Origin = Origin; //expected duplicate identifier error + function Origin() { return ""; } //expected duplicate identifier error + Point.Origin = Origin; })(Point = A.Point || (A.Point = {})); })(A || (A = {})); diff --git a/tests/baselines/reference/bind1.js b/tests/baselines/reference/bind1.js index c658384db85..93eafedf81b 100644 --- a/tests/baselines/reference/bind1.js +++ b/tests/baselines/reference/bind1.js @@ -12,6 +12,6 @@ var M; function C() { } return C; - }()); - M.C = C; // this should be an unresolved symbol I error + }()); // this should be an unresolved symbol I error + M.C = C; })(M || (M = {})); diff --git a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js index fd1dd369010..10fd481d7c6 100644 --- a/tests/baselines/reference/callSignaturesWithParameterInitializers2.js +++ b/tests/baselines/reference/callSignaturesWithParameterInitializers2.js @@ -48,7 +48,8 @@ var b = { foo: function (x) { if (x === void 0) { x = 1; } }, - foo: function (x) { + foo: // error + function (x) { if (x === void 0) { x = 1; } } }; diff --git a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js index ee80738a269..4fa998f86b8 100644 --- a/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js +++ b/tests/baselines/reference/declarationEmit_inferedDefaultExportType.js @@ -10,6 +10,7 @@ export default { //// [declarationEmit_inferedDefaultExportType.js] "use strict"; exports.__esModule = true; +// test.ts exports["default"] = { foo: [], bar: undefined, diff --git a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js index 21733e2cebf..eae9e9e4de1 100644 --- a/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js +++ b/tests/baselines/reference/duplicateIdentifiersAcrossContainerBoundaries.js @@ -73,8 +73,8 @@ var M; function f() { } return f; - }()); - M.f = f; // error + }()); // error + M.f = f; })(M || (M = {})); var M; (function (M) { @@ -86,8 +86,8 @@ var M; function g() { } return g; - }()); - M.g = g; // no error + }()); // no error + M.g = g; })(M || (M = {})); var M; (function (M) { diff --git a/tests/baselines/reference/duplicateSymbolsExportMatching.js b/tests/baselines/reference/duplicateSymbolsExportMatching.js index d37d1efb3bb..bb04e3c72a4 100644 --- a/tests/baselines/reference/duplicateSymbolsExportMatching.js +++ b/tests/baselines/reference/duplicateSymbolsExportMatching.js @@ -92,8 +92,8 @@ define(["require", "exports"], function (require, exports) { (function (F) { var t; })(F || (F = {})); - function F() { } - M.F = F; // Only one error for duplicate identifier (don't consider visibility) + function F() { } // Only one error for duplicate identifier (don't consider visibility) + M.F = F; })(M || (M = {})); var M; (function (M) { diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js index 6641e28b867..8434d0a5251 100644 --- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js +++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01_ES6.js @@ -41,9 +41,9 @@ var b = function () { }; }; function baz() { - (() => { + () => { var arg = arguments[0]; - }); + }; } function foo(inputFunc) { } foo(() => { @@ -52,8 +52,8 @@ foo(() => { function bar() { var arg = arguments[0]; // no error } -(() => { +() => { function foo() { var arg = arguments[0]; // no error } -}); +}; diff --git a/tests/baselines/reference/invalidTryStatements2.js b/tests/baselines/reference/invalidTryStatements2.js index 1b2976dc4e7..118b607817a 100644 --- a/tests/baselines/reference/invalidTryStatements2.js +++ b/tests/baselines/reference/invalidTryStatements2.js @@ -44,7 +44,7 @@ function fn2() { } finally { } // error missing try try { - } // error missing try + } catch (x) { } // error missing try // no error try { diff --git a/tests/baselines/reference/modifierOnParameter1.js b/tests/baselines/reference/modifierOnParameter1.js index 7b76a805c99..dd800aeb886 100644 --- a/tests/baselines/reference/modifierOnParameter1.js +++ b/tests/baselines/reference/modifierOnParameter1.js @@ -5,7 +5,7 @@ class C { //// [modifierOnParameter1.js] var C = (function () { - function C() { + function C(p) { } return C; }()); diff --git a/tests/baselines/reference/promiseChaining.js b/tests/baselines/reference/promiseChaining.js index 3f0900f7748..afa55acb894 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; }) /*S*/.then(function (x) { return "abc"; }) /*string*/.then(function (x) { return x.length; }); // No error + var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*string*/.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 b396261a59e..ad2ddcf694b 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; }) /*S*/.then(function (x) { return "abc"; }) /*Function*/.then(function (x) { return x.length; }); // Should error on "abc" because it is not a Function + var z = this.then(function (x) { return result; }) /*S*/.then(function (x) { return "abc"; }) /*Function*/.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/qualifiedModuleLocals.js b/tests/baselines/reference/qualifiedModuleLocals.js index b7ba5b70e81..7fcbc0700f8 100644 --- a/tests/baselines/reference/qualifiedModuleLocals.js +++ b/tests/baselines/reference/qualifiedModuleLocals.js @@ -14,7 +14,7 @@ A.a(); var A; (function (A) { function b() { } - function a() { A.b(); } - A.a = a; // A.b should be an unresolved symbol error + function a() { A.b(); } // A.b should be an unresolved symbol error + A.a = a; })(A || (A = {})); A.a(); diff --git a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js index 57df8ce2883..92a7f353ba5 100644 --- a/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js +++ b/tests/baselines/reference/stringIndexerConstrainsPropertyDeclarations.js @@ -103,7 +103,8 @@ var C = (function () { function C() { } // ok Object.defineProperty(C.prototype, "X", { - get: function () { + get: // error + function () { return ''; }, set: function (v) { } // ok