microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-07-02 14:48:32 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #26895 from Microsoft/callableErrors

Browse Source 
Find first callable/constructable type in union when appropriate
This commit is contained in:
Daniel Rosenwasser
2018-09-07 00:06:11 -07:00
committed by GitHub
parent d31973b905 d0673762f1
commit cf2f339a5c
8 changed files with 190 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/compiler/checker.ts
View File

@@ -11441,7 +11441,8 @@ namespace ts {
const bestMatchingType =
findMatchingDiscriminantType(source, target) ||
findMatchingTypeReferenceOrTypeAliasReference(source, target) ||
findBestTypeForObjectLiteral(source, target);
findBestTypeForObjectLiteral(source, target) ||
findBestTypeForInvokable(source, target);
isRelatedTo(source, bestMatchingType || targetTypes[targetTypes.length - 1], /*reportErrors*/ true);
}
@@ -11472,6 +11473,15 @@ namespace ts {
}
}
function findBestTypeForInvokable(source: Type, unionTarget: UnionOrIntersectionType) {
let signatureKind = SignatureKind.Call;
const hasSignatures = getSignaturesOfType(source, signatureKind).length > 0 ||
(signatureKind = SignatureKind.Construct, getSignaturesOfType(source, signatureKind).length > 0);
if (hasSignatures) {
return find(unionTarget.types, t => getSignaturesOfType(t, signatureKind).length > 0);
}
}
// Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
function findMatchingDiscriminantType(source: Type, target: UnionOrIntersectionType) {
let match: Type | undefined;