@@ -17021,7 +17021,7 @@ namespace ts {
17021
17021
function couldContainTypeVariables(type: Type): boolean {
17022
17022
const objectFlags = getObjectFlags(type);
17023
17023
return !!(type.flags & TypeFlags.Instantiable ||
17024
- objectFlags & ObjectFlags.Reference && forEach(getTypeArguments(<TypeReference>type), couldContainTypeVariables) ||
17024
+ objectFlags & ObjectFlags.Reference && ((<TypeReference>type).node || forEach(getTypeArguments(<TypeReference>type), couldContainTypeVariables) ) ||
17025
17025
objectFlags & ObjectFlags.Anonymous && type.symbol && type.symbol.flags & (SymbolFlags.Function | SymbolFlags.Method | SymbolFlags.Class | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) && type.symbol.declarations ||
17026
17026
objectFlags & ObjectFlags.Mapped ||
17027
17027
type.flags & TypeFlags.UnionOrIntersection && !(type.flags & TypeFlags.EnumLiteral) && couldUnionOrIntersectionContainTypeVariables(<UnionOrIntersectionType>type));
@@ -17318,7 +17318,8 @@ namespace ts {
17318
17318
}
17319
17319
}
17320
17320
if (getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference && (
17321
- (<TypeReference>source).target === (<TypeReference>target).target || isArrayType(source) && isArrayType(target))) {
17321
+ (<TypeReference>source).target === (<TypeReference>target).target || isArrayType(source) && isArrayType(target)) &&
17322
+ !((<TypeReference>source).node && (<TypeReference>target).node)) {
17322
17323
// If source and target are references to the same generic type, infer from type arguments
17323
17324
inferFromTypeArguments(getTypeArguments(<TypeReference>source), getTypeArguments(<TypeReference>target), getVariances((<TypeReference>source).target));
17324
17325
}
@@ -17599,6 +17600,12 @@ namespace ts {
17599
17600
}
17600
17601
17601
17602
function inferFromObjectTypesWorker(source: Type, target: Type) {
17603
+ if (getObjectFlags(source) & ObjectFlags.Reference && getObjectFlags(target) & ObjectFlags.Reference && (
17604
+ (<TypeReference>source).target === (<TypeReference>target).target || isArrayType(source) && isArrayType(target))) {
17605
+ // If source and target are references to the same generic type, infer from type arguments
17606
+ inferFromTypeArguments(getTypeArguments(<TypeReference>source), getTypeArguments(<TypeReference>target), getVariances((<TypeReference>source).target));
17607
+ return;
17608
+ }
17602
17609
if (isGenericMappedType(source) && isGenericMappedType(target)) {
17603
17610
// The source and target types are generic types { [P in S]: X } and { [P in T]: Y }, so we infer
17604
17611
// from S to T and from X to Y.
0 commit comments