Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated logic for high-order type relationships

Browse Source
This commit is contained in:
Ron Buckton
2017-08-07 16:35:12 -07:00
parent ebaa253deb
commit b5cde15672
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+11 -15
View File
@@ -9226,20 +9226,13 @@ namespace ts {
}
}
}
else if (target.flags & TypeFlags.Promised) {
// A promised S is related to a promised T if S is related to T
if (source.flags & TypeFlags.Promised) {
if (result = isRelatedTo((<PromisedType>source).type, (<PromisedType>target).type, /*reportErrors*/ false)) {
return result;
}
}
// A type S is related to promised T if S is related to promised C, where C is the
// constraint of T.
const constraint = getConstraintOfType((<PromisedType>target).type);
if (constraint) {
if (result = isRelatedTo(source, getPromisedType(constraint), reportErrors)) {
return result;
}
else if (target.flags & TypeFlags.Promised && source.flags & TypeFlags.Promised) {
// A promised S is related to a promised T if S is related to T:
//
// S <: T ⇒ promised S <: promised T
//
if (result = isRelatedTo((<PromisedType>source).type, (<PromisedType>target).type, reportErrors)) {
return result;
}
}
@@ -9291,7 +9284,10 @@ namespace ts {
}
else if (source.flags & TypeFlags.Promised) {
// A promised S is related to T if promised C is related to T, where C is the
// constraint of S.
// constraint of S:
//
// S <: C ^ promised C <: T ⇒ promised S <: T
//
const constraint = getConstraintOfType((<PromisedType>source).type);
if (constraint) {
if (result = isRelatedTo(getPromisedType(constraint), target, reportErrors)) {