microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-11 10:46:28 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Prevent ObjectFlags.IdenticalBaseTypeExists and ObjectFlags.IsConstrainedTypeVariable confusion (#56711)

Browse Source
This commit is contained in:
Mateusz Burzyński
2023-12-11 19:24:32 +01:00
committed by GitHub
parent 769453003c
commit 5b10466b63
4 changed files with 559 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@@ -17006,7 +17006,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const typeVariables: TypeVariable[] = [];
// First collect a list of the type variables occurring in constraining intersections.
for (const type of types) {
if (getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) {
if (type.flags & TypeFlags.Intersection && getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) {
const index = (type as IntersectionType).types[0].flags & TypeFlags.TypeVariable ? 0 : 1;
pushIfUnique(typeVariables, (type as IntersectionType).types[index]);
}
@@ -17018,7 +17018,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const primitives: Type[] = [];
// First collect the primitive types from the constraining intersections.
for (const type of types) {
if (getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) {
if (type.flags & TypeFlags.Intersection && getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) {
const index = (type as IntersectionType).types[0].flags & TypeFlags.TypeVariable ? 0 : 1;
if ((type as IntersectionType).types[index] === typeVariable) {
insertType(primitives, (type as IntersectionType).types[1 - index]);
@@ -17033,7 +17033,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
while (i > 0) {
i--;
const type = types[i];
if (getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) {
if (type.flags & TypeFlags.Intersection && getObjectFlags(type) & ObjectFlags.IsConstrainedTypeVariable) {
const index = (type as IntersectionType).types[0].flags & TypeFlags.TypeVariable ? 0 : 1;
if ((type as IntersectionType).types[index] === typeVariable && containsType(primitives, (type as IntersectionType).types[1 - index])) {
orderedRemoveItemAt(types, i);