microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-14 19:16:17 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

PR feedback

Browse Source
This commit is contained in:
vvakame 2015-05-05 20:29:43 +09:00
parent ab10d509f5
commit 880ccf0221
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/checker.ts
View File

@ -3599,6 +3599,10 @@ module ts {
return type;
}
function getUnionTypeOfSubtypeConstituents(source: UnionType, target: Type): Type {
return getUnionType(filter(source.types, t => isTypeSubtypeOf(t, target)));
}
function getReducedTypeOfUnionType(type: UnionType): Type {
// If union type was created without subtype reduction, perform the deferred reduction now
if (!type.reducedType) {
@ -5354,26 +5358,26 @@ module ts {
if (prototypeProperty) {
let targetType = getTypeOfSymbol(prototypeProperty);
if (targetType !== anyType) {
// Narrow to target type if it is a subtype of current type
// Narrow to the target type if it's a subtype of the current type
if (isTypeSubtypeOf(targetType, type)) {
return targetType;
}
// If current type is a union type, remove all constituents that aren't subtypes of target type
// If the current type is a union type, remove all constituents that aren't subtypes of the target.
if (type.flags & TypeFlags.Union) {
return getUnionType(filter((<UnionType>type).types, t => isTypeSubtypeOf(t, targetType)));
return getUnionTypeOfSubtypeConstituents(<UnionType>type, targetType);
}
}
}
// Target type is type of constructor signiture
let constructSignitures: Signature[];
let constructSignatures: Signature[];
if (rightType.flags & TypeFlags.Interface) {
constructSignitures = (<InterfaceTypeWithDeclaredMembers>rightType).declaredConstructSignatures;
constructSignatures = (<InterfaceTypeWithDeclaredMembers>rightType).declaredConstructSignatures;
} else if (rightType.flags & TypeFlags.Anonymous) {
constructSignatures = (<ResolvedType>rightType).constructSignatures;
}
if (rightType.flags & TypeFlags.Anonymous) {
constructSignitures = (<ResolvedType>rightType).constructSignatures;
}
if (constructSignitures) {
let instanceType = getUnionType(map(constructSignitures, constructSignature => {
if (constructSignatures) {
let instanceType = getUnionType(map(constructSignatures, constructSignature => {
if (constructSignature.typeParameters && constructSignature.typeParameters.length !== 0) {
constructSignature = instantiateSignature(constructSignature, createTypeMapper(constructSignature.typeParameters, map(constructSignature.typeParameters, _ => anyType)), true)
}
@ -5381,7 +5385,7 @@ module ts {
}));
// Pickup type from union types
if (type.flags & TypeFlags.Union) {
return getUnionType(filter((<UnionType>type).types, t => isTypeSubtypeOf(t, instanceType)));
return getUnionTypeOfSubtypeConstituents(<UnionType>type, instanceType);
}
return instanceType;
}