Skip to content

Unwrap parens when checking for JSDocFunctionType in conditional expression #46962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/compiler/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4539,10 +4539,16 @@ 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.
// - "a ? (b): (function() {})" as well, but inside of a parenthesized type with an arbitrary amount of nesting.
//
// So we need just a bit of lookahead to ensure that it can only be a signature.
const hasJSDocFunctionType = type && (isJSDocFunctionType(type) || isParenthesizedTypeNode(type) && isJSDocFunctionType(type.type));

let unwrappedType = type;
while (unwrappedType?.kind === SyntaxKind.ParenthesizedType) {
unwrappedType = (unwrappedType as ParenthesizedTypeNode).type; // Skip parens if need be
}

const hasJSDocFunctionType = unwrappedType && isJSDocFunctionType(unwrappedType);
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
//// [parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts]
let a: any;
const c = true ? (a) : (function() {});
const d = true ? (a) : ((function() {}));


//// [parserParenthesizedVariableAndParenthesizedFunctionInTernary.js]
var a;
var c = true ? (a) : (function () { });
var d = true ? (a) : ((function () { }));
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ const c = true ? (a) : (function() {});
>c : Symbol(c, Decl(parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts, 1, 5))
>a : Symbol(a, Decl(parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts, 0, 3))

const d = true ? (a) : ((function() {}));
>d : Symbol(d, Decl(parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts, 2, 5))
>a : Symbol(a, Decl(parserParenthesizedVariableAndParenthesizedFunctionInTernary.ts, 0, 3))

Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ const c = true ? (a) : (function() {});
>(function() {}) : () => void
>function() {} : () => void

const d = true ? (a) : ((function() {}));
>d : any
>true ? (a) : ((function() {})) : any
>true : true
>(a) : any
>a : any
>((function() {})) : () => void
>(function() {}) : () => void
>function() {} : () => void

Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
let a: any;
const c = true ? (a) : (function() {});
const d = true ? (a) : ((function() {}));