microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-04 03:09:39 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Move this check and remove unnecessary symmetry

Browse Source
This commit is contained in:
Ryan Cavanaugh 2025-07-15 09:20:17 -07:00
parent 5754edce4b
commit ba8ae71998
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/checker.ts
View File

@ -22145,21 +22145,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (s & TypeFlags.BigIntLike && t & TypeFlags.BigInt) return true;
if (s & TypeFlags.BooleanLike && t & TypeFlags.Boolean) return true;
if (s & TypeFlags.ESSymbolLike && t & TypeFlags.ESSymbol) return true;
// For comparable relation, revert `this` type parameters back to their constrained class type
if (relation === comparableRelation) {
if (s & TypeFlags.TypeParameter && (source as TypeParameter).isThisType) {
const constraint = getConstraintOfTypeParameter(source as TypeParameter);
if (constraint && isTypeRelatedTo(constraint, target, relation)) {
return true;
}
}
if (t & TypeFlags.TypeParameter && (target as TypeParameter).isThisType) {
const constraint = getConstraintOfTypeParameter(target as TypeParameter);
if (constraint && isTypeRelatedTo(source, constraint, relation)) {
return true;
}
}
}
if (
s & TypeFlags.Enum && t & TypeFlags.Enum && source.symbol.escapedName === target.symbol.escapedName &&
isEnumTypeRelatedTo(source.symbol, target.symbol, errorReporter)
@ -22213,6 +22198,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (source.flags !== target.flags) return false;
if (source.flags & TypeFlags.Singleton) return true;
}
if (relation === comparableRelation) {
// Allow comparability between 'this' and derived classes
if (source.flags & TypeFlags.TypeParameter && (source as TypeParameter).isThisType) {
const constraint = getConstraintOfTypeParameter(source as TypeParameter);
if (constraint && isTypeRelatedTo(constraint, target, relation)) {
return true;
}
}
}
if (source.flags & TypeFlags.Object && target.flags & TypeFlags.Object) {
const related = relation.get(getRelationKey(source, target, IntersectionState.None, relation, /*ignoreConstraints*/ false));
if (related !== undefined) {