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

Revert previous changes, use flag to disable fixing during constraint check

Browse source
This commit is contained in:
Anders Hejlsberg 2019-01-31 15:32:52 -08:00
parent 390f20f4fc
commit 2a91e7aab2
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/compiler/checker.ts
View file

@ -14112,7 +14112,9 @@ namespace ts {
function mapper(t: Type): Type {
for (let i = 0; i < inferences.length; i++) {
if (t === inferences[i].typeParameter) {
inferences[i].isFixed = true;
if (!(context.flags & InferenceFlags.NoFixing)) {
inferences[i].isFixed = true;
}
return getInferredType(context, i);
}
}
@ -14788,7 +14790,7 @@ namespace ts {
return getWidenedType(unwidenedType);
}
function getInferredType(context: InferenceContext, index: number, ignoreConstraints = false): Type {
function getInferredType(context: InferenceContext, index: number): Type {
const inference = context.inferences[index];
let inferredType = inference.inferredType;
if (!inferredType) {
@ -14836,14 +14838,14 @@ namespace ts {
inference.inferredType = inferredType;
if (!ignoreConstraints) {
const constraint = getConstraintOfTypeParameter(inference.typeParameter);
if (constraint) {
const instantiatedConstraint = instantiateType(constraint, context);
if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
inference.inferredType = inferredType = instantiatedConstraint;
}
const constraint = getConstraintOfTypeParameter(inference.typeParameter);
if (constraint) {
context.flags |= InferenceFlags.NoFixing;
const instantiatedConstraint = instantiateType(constraint, context);
if (!context.compareTypes(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
inference.inferredType = inferredType = instantiatedConstraint;
}
context.flags &= ~InferenceFlags.NoFixing;
}
}
@ -14854,10 +14856,10 @@ namespace ts {
return isInJavaScriptFile ? anyType : emptyObjectType;
}
function getInferredTypes(context: InferenceContext, ignoreConstraints = false): Type[] {
function getInferredTypes(context: InferenceContext): Type[] {
const result: Type[] = [];
for (let i = 0; i < context.inferences.length; i++) {
result.push(getInferredType(context, i, ignoreConstraints));
result.push(getInferredType(context, i));
}
return result;
}
@ -19927,10 +19929,7 @@ namespace ts {
inferTypes(context.inferences, spreadType, restType);
}
// If we are excluding context sensitive arguments we know there is another round of type inference
// coming, so we omit constraint checking. Otherwise, when a type parameter's constraint is self-
// referential, checking the constraint would cause inferences to be fixed prematurely.
return getInferredTypes(context, !!excludeArgument);
return getInferredTypes(context);
}
function getArrayifiedType(type: Type) {

1
src/compiler/types.ts
View file

@ -4341,6 +4341,7 @@ namespace ts {
None = 0, // No special inference behaviors
NoDefault = 1 << 0, // Infer unknownType for no inferences (otherwise anyType or emptyObjectType)
AnyDefault = 1 << 1, // Infer anyType for no inferences (otherwise emptyObjectType)
NoFixing = 1 << 2, // Disable type parameter fixing
}
/**