Skip to content

Commit 9c0d6b2

Browse files
rbucktonrbuckton
authored
Merge pull request microsoft#11431 from Microsoft/awaiterInES3
Fix syntax error in __awaiter when running in ES3
2 parents 94d8955 + 5b47853 commit 9c0d6b2

36 files changed

+37
-37
lines changed

‎src/compiler/emitter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
6868
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
6969
return new (P || (P = Promise))(function (resolve, reject) {
7070
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
71-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
71+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7272
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
7373
step((generator = generator.apply(thisArg, _arguments)).next());
7474
});

‎tests/baselines/reference/asyncAwaitIsolatedModules_es5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module M {
4444
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
4545
return new (P || (P = Promise))(function (resolve, reject) {
4646
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
47-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
47+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
4848
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
4949
step((generator = generator.apply(thisArg, _arguments)).next());
5050
});

‎tests/baselines/reference/asyncAwaitIsolatedModules_es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module M {
4343
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
4444
return new (P || (P = Promise))(function (resolve, reject) {
4545
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
46-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
46+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
4747
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
4848
step((generator = generator.apply(thisArg, _arguments)).next());
4949
});

‎tests/baselines/reference/asyncAwait_es5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module M {
4343
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
4444
return new (P || (P = Promise))(function (resolve, reject) {
4545
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
46-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
46+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
4747
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
4848
step((generator = generator.apply(thisArg, _arguments)).next());
4949
});

‎tests/baselines/reference/asyncAwait_es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ module M {
4343
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
4444
return new (P || (P = Promise))(function (resolve, reject) {
4545
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
46-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
46+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
4747
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
4848
step((generator = generator.apply(thisArg, _arguments)).next());
4949
});

‎tests/baselines/reference/asyncFunctionNoReturnType.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ async () => {
99
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
1010
return new (P || (P = Promise))(function (resolve, reject) {
1111
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
12+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
1313
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
1414
step((generator = generator.apply(thisArg, _arguments)).next());
1515
});

‎tests/baselines/reference/asyncFunctionReturnType.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ async function fAsyncExplicit(): Promise<[number, boolean]> {
1414
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
1515
return new (P || (P = Promise))(function (resolve, reject) {
1616
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
17-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
17+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
1818
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
1919
step((generator = generator.apply(thisArg, _arguments)).next());
2020
});

‎tests/baselines/reference/asyncFunctionsAcrossFiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const b = {
1919
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2020
return new (P || (P = Promise))(function (resolve, reject) {
2121
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
22-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
22+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2323
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
2424
step((generator = generator.apply(thisArg, _arguments)).next());
2525
});
@@ -34,7 +34,7 @@ export const b = {
3434
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3535
return new (P || (P = Promise))(function (resolve, reject) {
3636
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
37-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
37+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
3838
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
3939
step((generator = generator.apply(thisArg, _arguments)).next());
4040
});

‎tests/baselines/reference/asyncFunctionsAndStrictNullChecks.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ async function sample2(x?: number) {
3030
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3131
return new (P || (P = Promise))(function (resolve, reject) {
3232
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
33-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
33+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
3434
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
3535
step((generator = generator.apply(thisArg, _arguments)).next());
3636
});

‎tests/baselines/reference/asyncImportedPromise_es5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ exports.Task = Task;
2929
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3030
return new (P || (P = Promise))(function (resolve, reject) {
3131
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
32-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
32+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
3333
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
3434
step((generator = generator.apply(thisArg, _arguments)).next());
3535
});

‎tests/baselines/reference/asyncImportedPromise_es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exports.Task = Task;
1919
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2020
return new (P || (P = Promise))(function (resolve, reject) {
2121
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
22-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
22+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2323
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
2424
step((generator = generator.apply(thisArg, _arguments)).next());
2525
});

‎tests/baselines/reference/asyncMultiFile_es5.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function g() { }
99
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
1010
return new (P || (P = Promise))(function (resolve, reject) {
1111
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
12+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
1313
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
1414
step((generator = generator.apply(thisArg, _arguments)).next());
1515
});

‎tests/baselines/reference/asyncMultiFile_es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function g() { }
99
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
1010
return new (P || (P = Promise))(function (resolve, reject) {
1111
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
12-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
12+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
1313
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
1414
step((generator = generator.apply(thisArg, _arguments)).next());
1515
});

‎tests/baselines/reference/await_unaryExpression_es6.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ async function bar4() {
2020
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2121
return new (P || (P = Promise))(function (resolve, reject) {
2222
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
23-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
23+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2424
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
2525
step((generator = generator.apply(thisArg, _arguments)).next());
2626
});

‎tests/baselines/reference/await_unaryExpression_es6_1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async function bar4() {
2424
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2525
return new (P || (P = Promise))(function (resolve, reject) {
2626
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
27-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
27+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2828
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
2929
step((generator = generator.apply(thisArg, _arguments)).next());
3030
});

‎tests/baselines/reference/await_unaryExpression_es6_2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ async function bar3() {
1616
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
1717
return new (P || (P = Promise))(function (resolve, reject) {
1818
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
19-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
19+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2020
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
2121
step((generator = generator.apply(thisArg, _arguments)).next());
2222
});

‎tests/baselines/reference/await_unaryExpression_es6_3.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async function bar4() {
2222
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2323
return new (P || (P = Promise))(function (resolve, reject) {
2424
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
25-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
25+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2626
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
2727
step((generator = generator.apply(thisArg, _arguments)).next());
2828
});

‎tests/baselines/reference/castOfAwait.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ async function f() {
1212
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
1313
return new (P || (P = Promise))(function (resolve, reject) {
1414
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
15-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
15+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
1616
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
1717
step((generator = generator.apply(thisArg, _arguments)).next());
1818
});

‎tests/baselines/reference/declarationEmitPromise.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export async function runSampleBreaks<A, B, C, D, E>(
2727
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2828
return new (P || (P = Promise))(function (resolve, reject) {
2929
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
30-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
30+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
3131
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
3232
step((generator = generator.apply(thisArg, _arguments)).next());
3333
});

‎tests/baselines/reference/decoratorMetadataPromise.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
2525
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2626
return new (P || (P = Promise))(function (resolve, reject) {
2727
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
28-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
28+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2929
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
3030
step((generator = generator.apply(thisArg, _arguments)).next());
3131
});

‎tests/baselines/reference/defaultExportInAwaitExpression01.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import x from './a';
3030
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3131
return new (P || (P = Promise))(function (resolve, reject) {
3232
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
33-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
33+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
3434
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
3535
step((generator = generator.apply(thisArg, _arguments)).next());
3636
});

‎tests/baselines/reference/defaultExportInAwaitExpression02.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ exports.default = x;
2222
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2323
return new (P || (P = Promise))(function (resolve, reject) {
2424
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
25-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
25+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
2626
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
2727
step((generator = generator.apply(thisArg, _arguments)).next());
2828
});

‎tests/baselines/reference/es5-asyncFunction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ async function singleAwait() {
1212
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
1313
return new (P || (P = Promise))(function (resolve, reject) {
1414
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
15-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
15+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
1616
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
1717
step((generator = generator.apply(thisArg, _arguments)).next());
1818
});

‎tests/baselines/reference/es5-importHelpersAsyncFunctions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ exports.foo = foo;
3232
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3333
return new (P || (P = Promise))(function (resolve, reject) {
3434
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
35-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
35+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
3636
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
3737
step((generator = generator.apply(thisArg, _arguments)).next());
3838
});

‎tests/baselines/reference/exportDefaultAsyncFunction.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ foo();
77
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
88
return new (P || (P = Promise))(function (resolve, reject) {
99
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
10-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
10+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
1111
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
1212
step((generator = generator.apply(thisArg, _arguments)).next());
1313
});

‎tests/baselines/reference/exportDefaultAsyncFunction2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default async(() => await(Promise.resolve(1)));
3838
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3939
return new (P || (P = Promise))(function (resolve, reject) {
4040
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
41-
function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }
41+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
4242
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
4343
step((generator = generator.apply(thisArg, _arguments)).next());
4444
});

0 commit comments

Comments
 (0)