Skip to content

Commit f560560

Browse files
elibarzilayelibarzilay
committed
Fix two test typos
1 parent eb3645f commit f560560

9 files changed

+526
-589
lines changed

‎tests/baselines/reference/awaitUnionPromise.js

Lines changed: 10 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
//// [awaitUnionPromise.ts]
2-
/// @target: es2015
32
// https://github.com/Microsoft/TypeScript/issues/18186
43

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

2222
//// [awaitUnionPromise.js]
23-
/// @target: es2015
2423
// https://github.com/Microsoft/TypeScript/issues/18186
2524
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2625
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
3130
step((generator = generator.apply(thisArg, _arguments || [])).next());
3231
});
3332
};
34-
var __generator = (this && this.__generator) || function (thisArg, body) {
35-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
36-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
37-
function verb(n) { return function (v) { return step([n, v]); }; }
38-
function step(op) {
39-
if (f) throw new TypeError("Generator is already executing.");
40-
while (_) try {
41-
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;
42-
if (y = 0, t) op = [op[0] & 2, t.value];
43-
switch (op[0]) {
44-
case 0: case 1: t = op; break;
45-
case 4: _.label++; return { value: op[1], done: false };
46-
case 5: _.label++; y = op[1]; op = [0]; continue;
47-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
48-
default:
49-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
50-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
51-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
52-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
53-
if (t[2]) _.ops.pop();
54-
_.trys.pop(); continue;
55-
}
56-
op = body.call(thisArg, _);
57-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
58-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
59-
}
60-
};
61-
var AsyncEnumeratorDone = /** @class */ (function () {
62-
function AsyncEnumeratorDone() {
63-
}
64-
return AsyncEnumeratorDone;
65-
}());
33+
class AsyncEnumeratorDone {
34+
}
6635
;
6736
function main() {
68-
return __awaiter(this, void 0, void 0, function () {
69-
var x, a, b, c, d;
70-
return __generator(this, function (_a) {
71-
switch (_a.label) {
72-
case 0:
73-
x = null;
74-
return [4 /*yield*/, x.next1()];
75-
case 1:
76-
a = _a.sent();
77-
return [4 /*yield*/, x.next2()];
78-
case 2:
79-
b = _a.sent();
80-
return [4 /*yield*/, x.next3()];
81-
case 3:
82-
c = _a.sent();
83-
return [4 /*yield*/, x.next4()];
84-
case 4:
85-
d = _a.sent();
86-
return [2 /*return*/];
87-
}
88-
});
37+
return __awaiter(this, void 0, void 0, function* () {
38+
const x = null;
39+
let a = yield x.next1();
40+
let b = yield x.next2();
41+
let c = yield x.next3();
42+
let d = yield x.next4();
8943
});
9044
}

‎tests/baselines/reference/awaitUnionPromise.symbols

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,67 @@
11
=== tests/cases/compiler/awaitUnionPromise.ts ===
2-
/// @target: es2015
32
// https://github.com/Microsoft/TypeScript/issues/18186
43

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

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

1211
next1(): Promise<T | AsyncEnumeratorDone>;
13-
>next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 5, 31))
14-
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
15-
>T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
12+
>next1 : Symbol(IAsyncEnumerator.next1, Decl(awaitUnionPromise.ts, 4, 31))
13+
>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, --, --))
14+
>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))
1615
>AsyncEnumeratorDone : Symbol(AsyncEnumeratorDone, Decl(awaitUnionPromise.ts, 0, 0))
1716

1817
next2(): Promise<T> | Promise<AsyncEnumeratorDone>;
19-
>next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 6, 46))
20-
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
21-
>T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
22-
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
18+
>next2 : Symbol(IAsyncEnumerator.next2, Decl(awaitUnionPromise.ts, 5, 46))
19+
>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, --, --))
20+
>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))
21+
>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, --, --))
2322
>AsyncEnumeratorDone : Symbol(AsyncEnumeratorDone, Decl(awaitUnionPromise.ts, 0, 0))
2423

2524
next3(): Promise<T | {}>;
26-
>next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 7, 55))
27-
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
28-
>T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
25+
>next3 : Symbol(IAsyncEnumerator.next3, Decl(awaitUnionPromise.ts, 6, 55))
26+
>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, --, --))
27+
>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))
2928

3029
next4(): Promise<T | { x: string }>;
31-
>next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 8, 29))
32-
>Promise : Symbol(Promise, Decl(lib.es5.d.ts, --, --))
33-
>T : Symbol(T, Decl(awaitUnionPromise.ts, 5, 27))
34-
>x : Symbol(x, Decl(awaitUnionPromise.ts, 9, 26))
30+
>next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 7, 29))
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, --, --))
32+
>T : Symbol(T, Decl(awaitUnionPromise.ts, 4, 27))
33+
>x : Symbol(x, Decl(awaitUnionPromise.ts, 8, 26))
3534
}
3635

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

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

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

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

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

6261
let d = await x.next4();
63-
>d : Symbol(d, Decl(awaitUnionPromise.ts, 17, 7))
64-
>x.next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 8, 29))
65-
>x : Symbol(x, Decl(awaitUnionPromise.ts, 13, 9))
66-
>next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 8, 29))
62+
>d : Symbol(d, Decl(awaitUnionPromise.ts, 16, 7))
63+
>x.next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 7, 29))
64+
>x : Symbol(x, Decl(awaitUnionPromise.ts, 12, 9))
65+
>next4 : Symbol(IAsyncEnumerator.next4, Decl(awaitUnionPromise.ts, 7, 29))
6766
}
67+

‎tests/baselines/reference/awaitUnionPromise.types

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
=== tests/cases/compiler/awaitUnionPromise.ts ===
2-
/// @target: es2015
32
// https://github.com/Microsoft/TypeScript/issues/18186
43

54
class AsyncEnumeratorDone { };
@@ -59,3 +58,4 @@ async function main() {
5958
>x : IAsyncEnumerator<number>
6059
>next4 : () => Promise<number | { x: string; }>
6160
}
61+

‎tests/baselines/reference/duplicateLocalVariable1.errors.txt

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
tests/cases/compiler/duplicateLocalVariable1.ts(1,4): error TS1005: ';' expected.
2-
tests/cases/compiler/duplicateLocalVariable1.ts(1,11): error TS1146: Declaration expected.
3-
tests/cases/compiler/duplicateLocalVariable1.ts(1,13): error TS2304: Cannot find name 'commonjs'.
4-
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'.
5-
tests/cases/compiler/duplicateLocalVariable1.ts(186,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
6-
tests/cases/compiler/duplicateLocalVariable1.ts(186,37): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
1+
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'.
2+
tests/cases/compiler/duplicateLocalVariable1.ts(184,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
3+
tests/cases/compiler/duplicateLocalVariable1.ts(184,37): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type.
74

85

9-
==== tests/cases/compiler/duplicateLocalVariable1.ts (6 errors) ====
10-
/ /@module: commonjs
11-
~
12-
!!! error TS1005: ';' expected.
13-
14-
!!! error TS1146: Declaration expected.
15-
~~~~~~~~
16-
!!! error TS2304: Cannot find name 'commonjs'.
17-
6+
==== tests/cases/compiler/duplicateLocalVariable1.ts (3 errors) ====
187
//import FileManager = require('filemanager');
198
//import App = require('app');
209

@@ -201,7 +190,7 @@ tests/cases/compiler/duplicateLocalVariable1.ts(186,37): error TS2356: An arithm
201190
for (var i = 0; i < 14; i++) {
202191
~
203192
!!! error TS2403: Subsequent variable declarations must have the same type. Variable 'i' must be of type 'string', but here has type 'number'.
204-
!!! related TS6203 tests/cases/compiler/duplicateLocalVariable1.ts:181:22: 'i' was also declared here.
193+
!!! related TS6203 tests/cases/compiler/duplicateLocalVariable1.ts:179:22: 'i' was also declared here.
205194
~~~~~~
206195
!!! error TS2365: Operator '<' cannot be applied to types 'string' and 'number'.
207196
~
@@ -363,4 +352,5 @@ tests/cases/compiler/duplicateLocalVariable1.ts(186,37): error TS2356: An arithm
363352
}, "Codepoint at index: 3 has control value: 8"));
364353

365354
return testRunner;
366-
})();
355+
})();
356+

‎tests/baselines/reference/duplicateLocalVariable1.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
//// [duplicateLocalVariable1.ts]
2-
/ /@module: commonjs
3-
42
//import FileManager = require('filemanager');
53
//import App = require('app');
64

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

344342
return testRunner;
345-
})();
343+
})();
344+
346345

347346
//// [duplicateLocalVariable1.js]
348347
"use strict";
348+
//import FileManager = require('filemanager');
349+
//import App = require('app');
349350
exports.__esModule = true;
350351
exports.tests = exports.TestRunner = exports.TestCase = void 0;
351-
/ /;
352-
commonjs;
353352
var TestFileDir = ".\\TempTestFiles";
354353
var TestCase = /** @class */ (function () {
355354
function TestCase(name, test, errorMessageRegEx) {

0 commit comments

Comments
 (0)