Skip to content

Commit

Permalink
Inherit allowReturnTypeInArrowFunction in parseConditionalExpressionRest
Browse files Browse the repository at this point in the history
  • Loading branch information
jakebailey committed Jun 17, 2022
1 parent 22c476c commit 8675dc1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/compiler/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4422,7 +4422,7 @@ namespace ts {
}

// It wasn't an assignment or a lambda. This is a conditional expression:
return parseConditionalExpressionRest(expr, pos);
return parseConditionalExpressionRest(expr, pos, allowReturnTypeInArrowFunction);
}

function isYieldExpression(): boolean {
Expand Down Expand Up @@ -4853,7 +4853,7 @@ namespace ts {
return node;
}

function parseConditionalExpressionRest(leftOperand: Expression, pos: number): Expression {
function parseConditionalExpressionRest(leftOperand: Expression, pos: number, allowReturnTypeInArrowFunction: boolean): Expression {
// Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher.
const questionToken = parseOptionalToken(SyntaxKind.QuestionToken);
if (!questionToken) {
Expand All @@ -4870,7 +4870,7 @@ namespace ts {
doOutsideOfContext(disallowInAndDecoratorContext, () => parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ false)),
colonToken = parseExpectedToken(SyntaxKind.ColonToken),
nodeIsPresent(colonToken)
? parseAssignmentExpressionOrHigher(/*allowReturnTypeInArrowFunction*/ false)
? parseAssignmentExpressionOrHigher(allowReturnTypeInArrowFunction)
: createMissingNode(SyntaxKind.Identifier, /*reportAtCurrentPosition*/ false, Diagnostics._0_expected, tokenToString(SyntaxKind.ColonToken))
),
pos
Expand Down

0 comments on commit 8675dc1

Please sign in to comment.