From b4b9edc04ca081d0bca04cd7f851a83ea3f6888c Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Tue, 21 Nov 2017 18:39:01 -0800 Subject: [PATCH 1/3] Make sure 'async' isn't treated as a parameter modifier --- src/compiler/parser.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index b13aaac792f..cb28be4677a 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -3281,7 +3281,7 @@ namespace ts { // Check for "(xxx yyy", where xxx is a modifier and yyy is an identifier. This // isn't actually allowed, but we want to treat it as a lambda so we can provide // a good error message. - if (isModifierKind(second) && lookAhead(nextTokenIsIdentifier)) { + if (isModifierKind(second) && second !== SyntaxKind.AsyncKeyword && lookAhead(nextTokenIsIdentifier)) { return Tristate.True; } @@ -3298,7 +3298,7 @@ namespace ts { return Tristate.True; case SyntaxKind.QuestionToken: nextToken(); - // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lamnda. + // If we have "(a?:" or "(a?," or "(a?=" or "(a?)" then it is definitely a lambda. if (token() === SyntaxKind.ColonToken || token() === SyntaxKind.CommaToken || token() === SyntaxKind.EqualsToken || token() === SyntaxKind.CloseParenToken) { return Tristate.True; } From 3a00b76cff12c8eaf5061a412588d4495dba57b4 Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 22 Nov 2017 10:50:49 -0800 Subject: [PATCH 2/3] Add regression test --- tests/cases/compiler/parenthesizedAsyncArrowFunction.ts | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/cases/compiler/parenthesizedAsyncArrowFunction.ts diff --git a/tests/cases/compiler/parenthesizedAsyncArrowFunction.ts b/tests/cases/compiler/parenthesizedAsyncArrowFunction.ts new file mode 100644 index 00000000000..00c1aca6533 --- /dev/null +++ b/tests/cases/compiler/parenthesizedAsyncArrowFunction.ts @@ -0,0 +1,3 @@ +// Repro from #20096 + +let foo = (async bar => bar); From c8c46f6d45f82a30f64d55e055585201deb1764c Mon Sep 17 00:00:00 2001 From: Anders Hejlsberg Date: Wed, 22 Nov 2017 10:50:58 -0800 Subject: [PATCH 3/3] Accept new baselines --- .../parenthesizedAsyncArrowFunction.js | 47 +++++++++++++++++++ .../parenthesizedAsyncArrowFunction.symbols | 8 ++++ .../parenthesizedAsyncArrowFunction.types | 10 ++++ 3 files changed, 65 insertions(+) create mode 100644 tests/baselines/reference/parenthesizedAsyncArrowFunction.js create mode 100644 tests/baselines/reference/parenthesizedAsyncArrowFunction.symbols create mode 100644 tests/baselines/reference/parenthesizedAsyncArrowFunction.types diff --git a/tests/baselines/reference/parenthesizedAsyncArrowFunction.js b/tests/baselines/reference/parenthesizedAsyncArrowFunction.js new file mode 100644 index 00000000000..1f2cbc722e0 --- /dev/null +++ b/tests/baselines/reference/parenthesizedAsyncArrowFunction.js @@ -0,0 +1,47 @@ +//// [parenthesizedAsyncArrowFunction.ts] +// Repro from #20096 + +let foo = (async bar => bar); + + +//// [parenthesizedAsyncArrowFunction.js] +// Repro from #20096 +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); } + 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 = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [0, 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 _this = this; +var foo = (function (bar) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) { + return [2 /*return*/, bar]; +}); }); }); diff --git a/tests/baselines/reference/parenthesizedAsyncArrowFunction.symbols b/tests/baselines/reference/parenthesizedAsyncArrowFunction.symbols new file mode 100644 index 00000000000..a6428c3e998 --- /dev/null +++ b/tests/baselines/reference/parenthesizedAsyncArrowFunction.symbols @@ -0,0 +1,8 @@ +=== tests/cases/compiler/parenthesizedAsyncArrowFunction.ts === +// Repro from #20096 + +let foo = (async bar => bar); +>foo : Symbol(foo, Decl(parenthesizedAsyncArrowFunction.ts, 2, 3)) +>bar : Symbol(bar, Decl(parenthesizedAsyncArrowFunction.ts, 2, 16)) +>bar : Symbol(bar, Decl(parenthesizedAsyncArrowFunction.ts, 2, 16)) + diff --git a/tests/baselines/reference/parenthesizedAsyncArrowFunction.types b/tests/baselines/reference/parenthesizedAsyncArrowFunction.types new file mode 100644 index 00000000000..cb1461764cb --- /dev/null +++ b/tests/baselines/reference/parenthesizedAsyncArrowFunction.types @@ -0,0 +1,10 @@ +=== tests/cases/compiler/parenthesizedAsyncArrowFunction.ts === +// Repro from #20096 + +let foo = (async bar => bar); +>foo : (bar: any) => Promise +>(async bar => bar) : (bar: any) => Promise +>async bar => bar : (bar: any) => Promise +>bar : any +>bar : any +