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

Fix parsing of parenthesized functions in conditional expressions (#46960)

Browse Source
This commit is contained in:
Jake Bailey
2021-11-30 12:57:37 -08:00
committed by GitHub
parent 0f3d0e0470
commit cdf12f91c7
5 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/parser.ts
View File

@@ -4539,9 +4539,10 @@ namespace ts {
// - "(x,y)" is a comma expression parsed as a signature with two parameters.
// - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
// - "a ? (b): function() {}" will too, since function() is a valid JSDoc function type.
// - "a ? (b): (function() {})" as well, but inside of a parenthesized type.
//
// So we need just a bit of lookahead to ensure that it can only be a signature.
const hasJSDocFunctionType = type && isJSDocFunctionType(type);
const hasJSDocFunctionType = type && (isJSDocFunctionType(type) || isParenthesizedTypeNode(type) && isJSDocFunctionType(type.type));
if (!allowAmbiguity && token() !== SyntaxKind.EqualsGreaterThanToken && (hasJSDocFunctionType || token() !== SyntaxKind.OpenBraceToken)) {
// Returning undefined here will cause our caller to rewind to where we started from.
return undefined;

8
tests/baselines/reference/parserParenthesizedVariableAndParenthesizedFunctionInTernary.js Normal file
View File

@@ -0,0 +1,8 @@
//// [parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts]
let a: any;
const c = true ? (a) : (function() {});
//// [parserParenthesizedVariableAndParenthesizedFunctionInTernary.js]
var a;
var c = true ? (a) : (function () { });

8
tests/baselines/reference/parserParenthesizedVariableAndParenthesizedFunctionInTernary.symbols Normal file
View File

@@ -0,0 +1,8 @@
=== tests/cases/conformance/parser/ecmascript5/parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts ===
let a: any;
>a : Symbol(a, Decl(parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts, 0, 3))
const c = true ? (a) : (function() {});
>c : Symbol(c, Decl(parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts, 1, 5))
>a : Symbol(a, Decl(parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts, 0, 3))

13
tests/baselines/reference/parserParenthesizedVariableAndParenthesizedFunctionInTernary.types Normal file
View File

@@ -0,0 +1,13 @@
=== tests/cases/conformance/parser/ecmascript5/parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts ===
let a: any;
>a : any
const c = true ? (a) : (function() {});
>c : any
>true ? (a) : (function() {}) : any
>true : true
>(a) : any
>a : any
>(function() {}) : () => void
>function() {} : () => void

2
tests/cases/conformance/parser/ecmascript5/parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts Normal file
View File

@@ -0,0 +1,2 @@
let a: any;
const c = true ? (a) : (function() {});