Fix two test typos

2026-05-20 13:45:34 -05:00 · 2020-06-15 23:13:16 -04:00
parent eb3645f16b
commit f560560f82
9 changed files with 526 additions and 589 deletions
--- a/tests/baselines/reference/awaitUnionPromise.js
+++ b/tests/baselines/reference/awaitUnionPromise.js
@@ -1,5 +1,4 @@
 //// [awaitUnionPromise.ts]
-/// @target: es2015
 // https://github.com/Microsoft/TypeScript/issues/18186

 class AsyncEnumeratorDone { };
@@ -17,10 +16,10 @@ async function main() {
    let b = await x.next2();
    let c = await x.next3();
    let d = await x.next4();
-}
+}
+

 //// [awaitUnionPromise.js]
-/// @target: es2015
 // https://github.com/Microsoft/TypeScript/issues/18186
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -31,60 +30,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
        step((generator = generator.apply(thisArg, _arguments || [])).next());
    });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var AsyncEnumeratorDone = /** @class */ (function () {
-    function AsyncEnumeratorDone() {
-    }
-    return AsyncEnumeratorDone;
-}());
+class AsyncEnumeratorDone {
+}
 ;
 function main() {
-    return __awaiter(this, void 0, void 0, function () {
-        var x, a, b, c, d;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    x = null;
-                    return [4 /*yield*/, x.next1()];
-                case 1:
-                    a = _a.sent();
-                    return [4 /*yield*/, x.next2()];
-                case 2:
-                    b = _a.sent();
-                    return [4 /*yield*/, x.next3()];
-                case 3:
-                    c = _a.sent();
-                    return [4 /*yield*/, x.next4()];
-                case 4:
-                    d = _a.sent();
-                    return [2 /*return*/];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        const x = null;
+        let a = yield x.next1();
+        let b = yield x.next2();
+        let c = yield x.next3();
+        let d = yield x.next4();
    });
 }
--- a/tests/baselines/reference/awaitUnionPromise.symbols
+++ b/tests/baselines/reference/awaitUnionPromise.symbols
@@ -1,67 +1,67 @@
 === tests/cases/compiler/awaitUnionPromise.ts ===
-/// @target: es2015
 // https://github.com/Microsoft/TypeScript/issues/18186

 class AsyncEnumeratorDone { };
 >AsyncEnumeratorDone : Symbol(AsyncEnumeratorDone, Decl(awaitUnionPromise.ts, 0, 0))

 interface IAsyncEnumerator<T> {
->IAsyncEnumerator : Symbol(IAsyncEnumerator, Decl(awaitUnionPromise.ts, 3, 30))
->T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
+>IAsyncEnumerator : Symbol(IAsyncEnumerator, Decl(awaitUnionPromise.ts, 2, 30))
+>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))

    next1(): Promise<T | AsyncEnumeratorDone>;
->next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 5, 31))
->Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
+>next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 4, 31))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))
 >AsyncEnumeratorDone : Symbol(AsyncEnumeratorDone, Decl(awaitUnionPromise.ts, 0, 0))

    next2(): Promise<T> | Promise<AsyncEnumeratorDone>;
->next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 6, 46))
->Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
->Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
+>next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 5, 46))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
 >AsyncEnumeratorDone : Symbol(AsyncEnumeratorDone, Decl(awaitUnionPromise.ts, 0, 0))

    next3(): Promise<T | {}>;
->next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 7, 55))
->Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
+>next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 6, 55))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))

    next4(): Promise<T | { x: string }>;
->next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 8, 29))
->Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
->x : Symbol(x, Decl(awaitUnionPromise.ts, 9, 26))
+>next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 7, 29))
+>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --))
+>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))
+>x : Symbol(x, Decl(awaitUnionPromise.ts, 8, 26))
 }

 async function main() {
->main : Symbol(main, Decl(awaitUnionPromise.ts, 10, 1))
+>main : Symbol(main, Decl(awaitUnionPromise.ts, 9, 1))

    const x: IAsyncEnumerator<number> = null;
->x : Symbol(x, Decl(awaitUnionPromise.ts, 13, 9))
->IAsyncEnumerator : Symbol(IAsyncEnumerator, Decl(awaitUnionPromise.ts, 3, 30))
+>x : Symbol(x, Decl(awaitUnionPromise.ts, 12, 9))
+>IAsyncEnumerator : Symbol(IAsyncEnumerator, Decl(awaitUnionPromise.ts, 2, 30))

    let a = await x.next1();
->a : Symbol(a, Decl(awaitUnionPromise.ts, 14, 7))
->x.next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 5, 31))
->x : Symbol(x, Decl(awaitUnionPromise.ts, 13, 9))
->next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 5, 31))
+>a : Symbol(a, Decl(awaitUnionPromise.ts, 13, 7))
+>x.next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 4, 31))
+>x : Symbol(x, Decl(awaitUnionPromise.ts, 12, 9))
+>next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 4, 31))

    let b = await x.next2();
->b : Symbol(b, Decl(awaitUnionPromise.ts, 15, 7))
->x.next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 6, 46))
->x : Symbol(x, Decl(awaitUnionPromise.ts, 13, 9))
->next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 6, 46))
+>b : Symbol(b, Decl(awaitUnionPromise.ts, 14, 7))
+>x.next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 5, 46))
+>x : Symbol(x, Decl(awaitUnionPromise.ts, 12, 9))
+>next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 5, 46))

    let c = await x.next3();
->c : Symbol(c, Decl(awaitUnionPromise.ts, 16, 7))
->x.next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 7, 55))
->x : Symbol(x, Decl(awaitUnionPromise.ts, 13, 9))
->next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 7, 55))
+>c : Symbol(c, Decl(awaitUnionPromise.ts, 15, 7))
+>x.next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 6, 55))
+>x : Symbol(x, Decl(awaitUnionPromise.ts, 12, 9))
+>next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 6, 55))

    let d = await x.next4();
->d : Symbol(d, Decl(awaitUnionPromise.ts, 17, 7))
->x.next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 8, 29))
->x : Symbol(x, Decl(awaitUnionPromise.ts, 13, 9))
->next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 8, 29))
+>d : Symbol(d, Decl(awaitUnionPromise.ts, 16, 7))
+>x.next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 7, 29))
+>x : Symbol(x, Decl(awaitUnionPromise.ts, 12, 9))
+>next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 7, 29))
 }
+
--- a/tests/baselines/reference/awaitUnionPromise.types
+++ b/tests/baselines/reference/awaitUnionPromise.types
@@ -1,5 +1,4 @@
 === tests/cases/compiler/awaitUnionPromise.ts ===
-/// @target: es2015
 // https://github.com/Microsoft/TypeScript/issues/18186

 class AsyncEnumeratorDone { };
@@ -59,3 +58,4 @@ async function main() {
 >x : IAsyncEnumerator<number>
 >next4 : () => Promise<number | { x: string; }>
 }
+
--- a/tests/baselines/reference/duplicateLocalVariable1.errors.txt
+++ b/tests/baselines/reference/duplicateLocalVariable1.errors.txt
@@ -1,20 +1,9 @@
-tests/cases/compiler/duplicateLocalVariable1.ts(1,4): error TS1005: ';' expected.
-tests/cases/compiler/duplicateLocalVariable1.ts(1,11): error TS1146: Declaration expected.
-tests/cases/compiler/duplicateLocalVariable1.ts(1,13): error TS2304: Cannot find name 'commonjs'.
-tests/cases/compiler/duplicateLocalVariable1.ts(186,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
-tests/cases/compiler/duplicateLocalVariable1.ts(186,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
-tests/cases/compiler/duplicateLocalVariable1.ts(186,37): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
+tests/cases/compiler/duplicateLocalVariable1.ts(184,22): error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
+tests/cases/compiler/duplicateLocalVariable1.ts(184,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
+tests/cases/compiler/duplicateLocalVariable1.ts(184,37): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.


-==== tests/cases/compiler/duplicateLocalVariable1.ts (6 errors) ====
-    / /@module: commonjs
-       ~
-!!! error TS1005: ';' expected.
-              
-!!! error TS1146: Declaration expected.
-                ~~~~~~~~
-!!! error TS2304: Cannot find name 'commonjs'.
-    
+==== tests/cases/compiler/duplicateLocalVariable1.ts (3 errors) ====
    //import FileManager = require('filemanager');
    //import App = require('app');
    
@@ -201,7 +190,7 @@ tests/cases/compiler/duplicateLocalVariable1.ts(186,37): error TS2356: An arithm
                for (var i = 0; i < 14; i++) {
                         ~
 !!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'i' must be of type 'string', but here has type 'number'.
-!!! related TS6203 tests/cases/compiler/duplicateLocalVariable1.ts:181:22: 'i' was also declared here.
+!!! related TS6203 tests/cases/compiler/duplicateLocalVariable1.ts:179:22: 'i' was also declared here.
                                ~~~~~~
 !!! error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
                                        ~
@@ -363,4 +352,5 @@ tests/cases/compiler/duplicateLocalVariable1.ts(186,37): error TS2356: An arithm
            }, "Codepoint at index: 3 has control value: 8"));
    
        return testRunner;
-    })();
+    })();
+    
--- a/tests/baselines/reference/duplicateLocalVariable1.js
+++ b/tests/baselines/reference/duplicateLocalVariable1.js
@@ -1,6 +1,4 @@
 //// [duplicateLocalVariable1.ts]
-/ /@module: commonjs
-
 //import FileManager = require('filemanager');
 //import App = require('app');

@@ -342,14 +340,15 @@ export var tests: TestRunner = (function () {
        }, "Codepoint at index: 3 has control value: 8"));

    return testRunner;
-})();
+})();
+

 //// [duplicateLocalVariable1.js]
 "use strict";
+//import FileManager = require('filemanager');
+//import App = require('app');
 exports.__esModule = true;
 exports.tests = exports.TestRunner = exports.TestCase = void 0;
-/ /;
-commonjs;
 var TestFileDir = ".\\TempTestFiles";
 var TestCase = /** @class */ (function () {
    function TestCase(name, test, errorMessageRegEx) {
--- a/tests/baselines/reference/duplicateLocalVariable1.symbols
+++ b/tests/baselines/reference/duplicateLocalVariable1.symbols
--- a/tests/baselines/reference/duplicateLocalVariable1.types
+++ b/tests/baselines/reference/duplicateLocalVariable1.types
@@ -1,9 +1,4 @@
 === tests/cases/compiler/duplicateLocalVariable1.ts ===
-/ /@module: commonjs
->/ / : RegExp
->module : any
->commonjs : any
-
 //import FileManager = require('filemanager');
 //import App = require('app');

@@ -1873,3 +1868,4 @@ export var tests: TestRunner = (function () {
 >testRunner : TestRunner

 })();
+
--- a/tests/cases/compiler/awaitUnionPromise.ts
+++ b/tests/cases/compiler/awaitUnionPromise.ts
@@ -1,4 +1,4 @@
-/// @target: es2015
+// @target: es2015
 // https://github.com/Microsoft/TypeScript/issues/18186

 class AsyncEnumeratorDone { };
@@ -16,4 +16,4 @@ async function main() {
    let b = await x.next2();
    let c = await x.next3();
    let d = await x.next4();
-}
+}
--- a/tests/cases/compiler/duplicateLocalVariable1.ts
+++ b/tests/cases/compiler/duplicateLocalVariable1.ts
@@ -1,6 +1,5 @@
-
 // @allowUnreachableCode: true
-/ /@module: commonjs
+// @module: commonjs

 //import FileManager = require('filemanager');
 //import App = require('app');
@@ -343,4 +342,4 @@ export var tests: TestRunner = (function () {
        }, "Codepoint at index: 3 has control value: 8"));

    return testRunner;
-})();
+})();