Skip to content

Fix missing constraints for parenthesized infer T #40406

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
Sep 23, 2020
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
4 changes: 2 additions & 2 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11864,12 +11864,12 @@ namespace ts {
// (such as 'Foo<infer T>'), T's constraint is inferred from the constraint of the
// corresponding type parameter in 'Foo'. When multiple 'infer T' declarations are
// present, we form an intersection of the inferred constraint types.
const grandParent = declaration.parent.parent;
const [childTypeParameter = declaration.parent, grandParent] = walkUpParenthesizedTypesAndGetParentAndChild(declaration.parent.parent);
if (grandParent.kind === SyntaxKind.TypeReference) {
const typeReference = <TypeReferenceNode>grandParent;
const typeParameters = getTypeParametersForTypeReference(typeReference);
if (typeParameters) {
const index = typeReference.typeArguments!.indexOf(<TypeNode>declaration.parent);
const index = typeReference.typeArguments!.indexOf(<TypeNode>childTypeParameter);
if (index < typeParameters.length) {
const declaredConstraint = getConstraintOfTypeParameter(typeParameters[index]);
if (declaredConstraint) {
Expand Down
14 changes: 14 additions & 0 deletions src/compiler/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2728,6 +2728,20 @@ namespace ts {
return walkUp(node, SyntaxKind.ParenthesizedExpression);
}

/**
* Walks up parenthesized types.
* It returns both the outermost parenthesized type and its parent.
* If given node is not a parenthesiezd type, undefined is return as the former.
*/
export function walkUpParenthesizedTypesAndGetParentAndChild(node: Node): [ParenthesizedTypeNode | undefined, Node] {
let child: ParenthesizedTypeNode | undefined;
while (node && node.kind === SyntaxKind.ParenthesizedType) {
child = <ParenthesizedTypeNode>node;
node = node.parent;
}
return [child, node];
}

export function skipParentheses(node: Expression): Expression;
export function skipParentheses(node: Node): Node;
export function skipParentheses(node: Node): Node {
Expand Down
17 changes: 17 additions & 0 deletions tests/baselines/reference/inferTInParentheses.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//// [inferTInParentheses.ts]
type F1 = (num: [number]) => void;
type IsNumber<T extends number> = T;

type T1 = F1 extends (...args: (infer T)) => void ? T : never;
type T2 = F1 extends (args: [...(infer T)]) => void ? T : never;
type T3<T> = T extends IsNumber<(infer N)> ? true : false;

type T4 = F1 extends (...args: ((infer T))) => void ? T : never;
type T5 = F1 extends (args: [...((infer T))]) => void ? T : never;
type T6<T> = T extends IsNumber<((infer N))> ? true : false;

type T7 = F1 extends (...args: ((((infer T))))) => void ? T : never;
type T8 = F1 extends (args: [...((((infer T))))]) => void ? T : never;
type T9<T> = T extends IsNumber<((((infer N))))> ? true : false;

//// [inferTInParentheses.js]
73 changes: 73 additions & 0 deletions tests/baselines/reference/inferTInParentheses.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
=== tests/cases/compiler/inferTInParentheses.ts ===
type F1 = (num: [number]) => void;
>F1 : Symbol(F1, Decl(inferTInParentheses.ts, 0, 0))
>num : Symbol(num, Decl(inferTInParentheses.ts, 0, 11))

type IsNumber<T extends number> = T;
>IsNumber : Symbol(IsNumber, Decl(inferTInParentheses.ts, 0, 34))
>T : Symbol(T, Decl(inferTInParentheses.ts, 1, 14))
>T : Symbol(T, Decl(inferTInParentheses.ts, 1, 14))

type T1 = F1 extends (...args: (infer T)) => void ? T : never;
>T1 : Symbol(T1, Decl(inferTInParentheses.ts, 1, 36))
>F1 : Symbol(F1, Decl(inferTInParentheses.ts, 0, 0))
>args : Symbol(args, Decl(inferTInParentheses.ts, 3, 22))
>T : Symbol(T, Decl(inferTInParentheses.ts, 3, 37))
>T : Symbol(T, Decl(inferTInParentheses.ts, 3, 37))

type T2 = F1 extends (args: [...(infer T)]) => void ? T : never;
>T2 : Symbol(T2, Decl(inferTInParentheses.ts, 3, 62))
>F1 : Symbol(F1, Decl(inferTInParentheses.ts, 0, 0))
>args : Symbol(args, Decl(inferTInParentheses.ts, 4, 22))
>T : Symbol(T, Decl(inferTInParentheses.ts, 4, 38))
>T : Symbol(T, Decl(inferTInParentheses.ts, 4, 38))

type T3<T> = T extends IsNumber<(infer N)> ? true : false;
>T3 : Symbol(T3, Decl(inferTInParentheses.ts, 4, 64))
>T : Symbol(T, Decl(inferTInParentheses.ts, 5, 8))
>T : Symbol(T, Decl(inferTInParentheses.ts, 5, 8))
>IsNumber : Symbol(IsNumber, Decl(inferTInParentheses.ts, 0, 34))
>N : Symbol(N, Decl(inferTInParentheses.ts, 5, 38))

type T4 = F1 extends (...args: ((infer T))) => void ? T : never;
>T4 : Symbol(T4, Decl(inferTInParentheses.ts, 5, 58))
>F1 : Symbol(F1, Decl(inferTInParentheses.ts, 0, 0))
>args : Symbol(args, Decl(inferTInParentheses.ts, 7, 22))
>T : Symbol(T, Decl(inferTInParentheses.ts, 7, 38))
>T : Symbol(T, Decl(inferTInParentheses.ts, 7, 38))

type T5 = F1 extends (args: [...((infer T))]) => void ? T : never;
>T5 : Symbol(T5, Decl(inferTInParentheses.ts, 7, 64))
>F1 : Symbol(F1, Decl(inferTInParentheses.ts, 0, 0))
>args : Symbol(args, Decl(inferTInParentheses.ts, 8, 22))
>T : Symbol(T, Decl(inferTInParentheses.ts, 8, 39))
>T : Symbol(T, Decl(inferTInParentheses.ts, 8, 39))

type T6<T> = T extends IsNumber<((infer N))> ? true : false;
>T6 : Symbol(T6, Decl(inferTInParentheses.ts, 8, 66))
>T : Symbol(T, Decl(inferTInParentheses.ts, 9, 8))
>T : Symbol(T, Decl(inferTInParentheses.ts, 9, 8))
>IsNumber : Symbol(IsNumber, Decl(inferTInParentheses.ts, 0, 34))
>N : Symbol(N, Decl(inferTInParentheses.ts, 9, 39))

type T7 = F1 extends (...args: ((((infer T))))) => void ? T : never;
>T7 : Symbol(T7, Decl(inferTInParentheses.ts, 9, 60))
>F1 : Symbol(F1, Decl(inferTInParentheses.ts, 0, 0))
>args : Symbol(args, Decl(inferTInParentheses.ts, 11, 22))
>T : Symbol(T, Decl(inferTInParentheses.ts, 11, 40))
>T : Symbol(T, Decl(inferTInParentheses.ts, 11, 40))

type T8 = F1 extends (args: [...((((infer T))))]) => void ? T : never;
>T8 : Symbol(T8, Decl(inferTInParentheses.ts, 11, 68))
>F1 : Symbol(F1, Decl(inferTInParentheses.ts, 0, 0))
>args : Symbol(args, Decl(inferTInParentheses.ts, 12, 22))
>T : Symbol(T, Decl(inferTInParentheses.ts, 12, 41))
>T : Symbol(T, Decl(inferTInParentheses.ts, 12, 41))

type T9<T> = T extends IsNumber<((((infer N))))> ? true : false;
>T9 : Symbol(T9, Decl(inferTInParentheses.ts, 12, 70))
>T : Symbol(T, Decl(inferTInParentheses.ts, 13, 8))
>T : Symbol(T, Decl(inferTInParentheses.ts, 13, 8))
>IsNumber : Symbol(IsNumber, Decl(inferTInParentheses.ts, 0, 34))
>N : Symbol(N, Decl(inferTInParentheses.ts, 13, 41))

47 changes: 47 additions & 0 deletions tests/baselines/reference/inferTInParentheses.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
=== tests/cases/compiler/inferTInParentheses.ts ===
type F1 = (num: [number]) => void;
>F1 : F1
>num : [number]

type IsNumber<T extends number> = T;
>IsNumber : T

type T1 = F1 extends (...args: (infer T)) => void ? T : never;
>T1 : [num: [number]]
>args : T

type T2 = F1 extends (args: [...(infer T)]) => void ? T : never;
>T2 : [number]
>args : [...T]

type T3<T> = T extends IsNumber<(infer N)> ? true : false;
>T3 : T3<T>
>true : true
>false : false

type T4 = F1 extends (...args: ((infer T))) => void ? T : never;
>T4 : [num: [number]]
>args : T

type T5 = F1 extends (args: [...((infer T))]) => void ? T : never;
>T5 : [number]
>args : [...T]

type T6<T> = T extends IsNumber<((infer N))> ? true : false;
>T6 : T6<T>
>true : true
>false : false

type T7 = F1 extends (...args: ((((infer T))))) => void ? T : never;
>T7 : [num: [number]]
>args : T

type T8 = F1 extends (args: [...((((infer T))))]) => void ? T : never;
>T8 : [number]
>args : [...T]

type T9<T> = T extends IsNumber<((((infer N))))> ? true : false;
>T9 : T9<T>
>true : true
>false : false

14 changes: 14 additions & 0 deletions tests/cases/compiler/inferTInParentheses.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
type F1 = (num: [number]) => void;
type IsNumber<T extends number> = T;

type T1 = F1 extends (...args: (infer T)) => void ? T : never;
type T2 = F1 extends (args: [...(infer T)]) => void ? T : never;
type T3<T> = T extends IsNumber<(infer N)> ? true : false;

type T4 = F1 extends (...args: ((infer T))) => void ? T : never;
type T5 = F1 extends (args: [...((infer T))]) => void ? T : never;
type T6<T> = T extends IsNumber<((infer N))> ? true : false;

type T7 = F1 extends (...args: ((((infer T))))) => void ? T : never;
type T8 = F1 extends (args: [...((((infer T))))]) => void ? T : never;
type T9<T> = T extends IsNumber<((((infer N))))> ? true : false;