maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Defer computation of isDistributionDependent to avoid circularities (#46474)

Browse source 
* Defer computation of isDistributionDependent to avoid circularities

* Accept new API baselines
This commit is contained in:
Anders Hejlsberg 2021-10-22 09:13:54 -07:00 committed by GitHub
parent 65ae16cdea
commit 449aaa118f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/compiler/checker.ts
View file

@ -15638,14 +15638,16 @@ namespace ts {
return result;
}
function isDistributionDependent(root: ConditionalRoot) {
return root.isDistributive && (
isTypeParameterPossiblyReferenced(root.checkType as TypeParameter, root.node.trueType) ||
isTypeParameterPossiblyReferenced(root.checkType as TypeParameter, root.node.falseType));
}
function getTypeFromConditionalTypeNode(node: ConditionalTypeNode): Type {
const links = getNodeLinks(node);
if (!links.resolvedType) {
const checkType = getTypeFromTypeNode(node.checkType);
const isDistributive = !!(checkType.flags & TypeFlags.TypeParameter);
const isDistributionDependent = isDistributive && (
isTypeParameterPossiblyReferenced(checkType as TypeParameter, node.trueType) ||
isTypeParameterPossiblyReferenced(checkType as TypeParameter, node.falseType));
const aliasSymbol = getAliasSymbolForTypeNode(node);
const aliasTypeArguments = getTypeArgumentsForAliasSymbol(aliasSymbol);
const allOuterTypeParameters = getOuterTypeParameters(node, /*includeThisTypes*/ true);
@ -15654,8 +15656,7 @@ namespace ts {
node,
checkType,
extendsType: getTypeFromTypeNode(node.extendsType),
isDistributive,
isDistributionDependent,
isDistributive: !!(checkType.flags & TypeFlags.TypeParameter),
inferTypeParameters: getInferTypeParameters(node),
outerTypeParameters,
instantiations: undefined,
@ -19032,7 +19033,7 @@ namespace ts {
// We check for a relationship to a conditional type target only when the conditional type has no
// 'infer' positions and is not distributive or is distributive but doesn't reference the check type
// parameter in either of the result types.
if (!c.root.inferTypeParameters && !c.root.isDistributionDependent) {
if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
// Check if the conditional is always true or always false but still deferred for distribution purposes.
const skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
const skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));

1
src/compiler/types.ts
View file

@ -5648,7 +5648,6 @@ namespace ts {
checkType: Type;
extendsType: Type;
isDistributive: boolean;
isDistributionDependent: boolean;
inferTypeParameters?: TypeParameter[];
outerTypeParameters?: TypeParameter[];
instantiations?: Map<Type>;

1
tests/baselines/reference/api/tsserverlibrary.d.ts vendored
View file

@ -2747,7 +2747,6 @@ declare namespace ts {
checkType: Type;
extendsType: Type;
isDistributive: boolean;
isDistributionDependent: boolean;
inferTypeParameters?: TypeParameter[];
outerTypeParameters?: TypeParameter[];
instantiations?: Map<Type>;

1
tests/baselines/reference/api/typescript.d.ts vendored
View file

@ -2747,7 +2747,6 @@ declare namespace ts {
checkType: Type;
extendsType: Type;
isDistributive: boolean;
isDistributionDependent: boolean;
inferTypeParameters?: TypeParameter[];
outerTypeParameters?: TypeParameter[];
instantiations?: Map<Type>;