microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 11:24:29 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Covered more cases for arrow functions omitting arrows.

Browse Source 
Specifically where we have a full signature followed by an open curly brace.
This commit is contained in:
Daniel Rosenwasser
2014-07-23 11:49:51 -07:00
parent 5b6bb5b649
commit 5fc2792297
4 changed files with 22 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/parser.ts
View File

@@ -1445,7 +1445,7 @@ module ts {
function tryParseParenthesizedArrowFunctionExpression(): Expression {
var pos = getNodePos();
// Whether we are certain that we should parse an arrow expression.
// Indicates whether we are certain that we should parse an arrow expression.
var triState = isParenthesizedArrowFunctionExpression();
// It is not a parenthesized arrow function.
@@ -1470,11 +1470,12 @@ module ts {
// Otherwise, *maybe* we had an arrow function and we need to *try* to parse it out
// (which will ensure we rollback if we fail).
var sig = tryParse(parseSignatureAndArrow);
var sig = tryParse(parseSignatureIfArrowOrBraceFollows);
if (sig === undefined) {
return undefined;
}
else {
parseExpected(SyntaxKind.EqualsGreaterThanToken);
return parseArrowExpressionTail(pos, sig, /*noIn:*/ false);
}
}
@@ -1512,8 +1513,9 @@ module ts {
return Tristate.True;
}
// We had "(" not followed by an identifier. This definitely doesn't
// look like a lambda. Note: we could be a little more lenient and allow
// If we had "(" followed by something that's not an identifier,
// then this definitely doesn't look like a lambda.
// Note: we could be a little more lenient and allow
// "(public" or "(private". These would not ever actually be allowed,
// but we could provide a good error message instead of bailing out.
if (!isIdentifier()) {
@@ -1543,10 +1545,12 @@ module ts {
return Tristate.False;
}
function parseSignatureAndArrow(): ParsedSignature {
function parseSignatureIfArrowOrBraceFollows(): ParsedSignature {
var sig = parseSignature(SyntaxKind.CallSignature, SyntaxKind.ColonToken);
parseExpected(SyntaxKind.EqualsGreaterThanToken);
return sig;
if (token === SyntaxKind.EqualsGreaterThanToken || token === SyntaxKind.OpenBraceToken) {
return sig;
}
return undefined;
}
function parseArrowExpressionTail(pos: number, sig: ParsedSignature, noIn: boolean): FunctionExpression {