Revert "typeRelatedToSomeType passes through intersectionState (#43707)"

sandersn · sandersn · commit e99cc3592d5d · 2021-05-06T10:56:13.000-07:00
This reverts commit db09cb5.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17929,7 +17929,7 @@ namespace ts {
                 let result = Ternary.True;
                 const sourceTypes = source.types;
                 for (const sourceType of sourceTypes) {
-                    const related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false, IntersectionState.None);
+                    const related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false);
                     if (!related) {
                         return Ternary.False;
                     }
@@ -17938,29 +17938,29 @@ namespace ts {
                 return result;
             }
 
-            function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean, intersectionState: IntersectionState): Ternary {
+            function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {
                 const targetTypes = target.types;
                 if (target.flags & TypeFlags.Union) {
                     if (containsType(targetTypes, source)) {
                         return Ternary.True;
                     }
                     const match = getMatchingUnionConstituentForType(<UnionType>target, source);
                     if (match) {
-                        const related = isRelatedTo(source, match, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
+                        const related = isRelatedTo(source, match, /*reportErrors*/ false);
                         if (related) {
                             return related;
                         }
                     }
                 }
                 for (const type of targetTypes) {
-                    const related = isRelatedTo(source, type, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
+                    const related = isRelatedTo(source, type, /*reportErrors*/ false);
                     if (related) {
                         return related;
                     }
                 }
                 if (reportErrors) {
                     const bestMatchingType = getBestMatchingType(source, target, isRelatedTo);
-                    isRelatedTo(source, bestMatchingType || targetTypes[targetTypes.length - 1], /*reportErrors*/ true, /*headMessage*/ undefined, intersectionState);
+                    isRelatedTo(source, bestMatchingType || targetTypes[targetTypes.length - 1], /*reportErrors*/ true);
                 }
                 return Ternary.False;
             }
@@ -18220,7 +18220,7 @@ namespace ts {
                             eachTypeRelatedToType(source as UnionType, target, reportErrors && !(source.flags & TypeFlags.Primitive), intersectionState & ~IntersectionState.UnionIntersectionCheck);
                     }
                     if (target.flags & TypeFlags.Union) {
-                        return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), <UnionType>target, reportErrors && !(source.flags & TypeFlags.Primitive) && !(target.flags & TypeFlags.Primitive), intersectionState & ~IntersectionState.UnionIntersectionCheck);
+                        return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), <UnionType>target, reportErrors && !(source.flags & TypeFlags.Primitive) && !(target.flags & TypeFlags.Primitive));
                     }
                     if (target.flags & TypeFlags.Intersection) {
                         return typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target as IntersectionType, reportErrors, IntersectionState.Target);
diff --git a/tests/baselines/reference/recursiveExcessPropertyChecks.js b/tests/baselines/reference/recursiveExcessPropertyChecks.js
@@ -12,59 +12,12 @@ function getMaxId(items: NodeWithId[]) {
 
 const nodes = [] as ITreeItem[];
 getMaxId(nodes);
-
-
-// Repro from #42715
-export interface Donkey {
-    donkey: string;
-}
-
-interface Diddy {
-    diddy: string;
-    children?: Diddy[] | Donkey;
-}
-
-interface Cranky {
-    cranky: string;
-    children: Diddy;
-}
-
-type Dandy = Diddy & {
-    children: (Diddy & { funky?: string })[];
-};
-type X = Dandy["children"]
-var x: X
-
-const mainView: Dandy = {
-    diddy: "",
-    children: [
-        {
-            diddy: "",
-            funky: "Empty" // <- Incorrect error
-        }
-    ],
-};
-// Legal
-const p = mainView.children[0].funky
 
 
 //// [recursiveExcessPropertyChecks.js]
 "use strict";
 // Repro from #35804
-exports.__esModule = true;
 function getMaxId(items) {
 }
 var nodes = [];
 getMaxId(nodes);
-var x;
-var mainView = {
-    diddy: "",
-    children: [
-        {
-            diddy: "",
-            funky: "Empty" // <- Incorrect error
-        }
-    ]
-};
-// Legal
-var p = mainView.children[0].funky;
diff --git a/tests/baselines/reference/recursiveExcessPropertyChecks.symbols b/tests/baselines/reference/recursiveExcessPropertyChecks.symbols
@@ -27,80 +27,3 @@ getMaxId(nodes);
 >getMaxId : Symbol(getMaxId, Decl(recursiveExcessPropertyChecks.ts, 6, 46))
 >nodes : Symbol(nodes, Decl(recursiveExcessPropertyChecks.ts, 11, 5))
 
-
-// Repro from #42715
-export interface Donkey {
->Donkey : Symbol(Donkey, Decl(recursiveExcessPropertyChecks.ts, 12, 16))
-
-    donkey: string;
->donkey : Symbol(Donkey.donkey, Decl(recursiveExcessPropertyChecks.ts, 16, 25))
-}
-
-interface Diddy {
->Diddy : Symbol(Diddy, Decl(recursiveExcessPropertyChecks.ts, 18, 1))
-
-    diddy: string;
->diddy : Symbol(Diddy.diddy, Decl(recursiveExcessPropertyChecks.ts, 20, 17))
-
-    children?: Diddy[] | Donkey;
->children : Symbol(Diddy.children, Decl(recursiveExcessPropertyChecks.ts, 21, 18))
->Diddy : Symbol(Diddy, Decl(recursiveExcessPropertyChecks.ts, 18, 1))
->Donkey : Symbol(Donkey, Decl(recursiveExcessPropertyChecks.ts, 12, 16))
-}
-
-interface Cranky {
->Cranky : Symbol(Cranky, Decl(recursiveExcessPropertyChecks.ts, 23, 1))
-
-    cranky: string;
->cranky : Symbol(Cranky.cranky, Decl(recursiveExcessPropertyChecks.ts, 25, 18))
-
-    children: Diddy;
->children : Symbol(Cranky.children, Decl(recursiveExcessPropertyChecks.ts, 26, 19))
->Diddy : Symbol(Diddy, Decl(recursiveExcessPropertyChecks.ts, 18, 1))
-}
-
-type Dandy = Diddy & {
->Dandy : Symbol(Dandy, Decl(recursiveExcessPropertyChecks.ts, 28, 1))
->Diddy : Symbol(Diddy, Decl(recursiveExcessPropertyChecks.ts, 18, 1))
-
-    children: (Diddy & { funky?: string })[];
->children : Symbol(children, Decl(recursiveExcessPropertyChecks.ts, 30, 22))
->Diddy : Symbol(Diddy, Decl(recursiveExcessPropertyChecks.ts, 18, 1))
->funky : Symbol(funky, Decl(recursiveExcessPropertyChecks.ts, 31, 24))
-
-};
-type X = Dandy["children"]
->X : Symbol(X, Decl(recursiveExcessPropertyChecks.ts, 32, 2))
->Dandy : Symbol(Dandy, Decl(recursiveExcessPropertyChecks.ts, 28, 1))
-
-var x: X
->x : Symbol(x, Decl(recursiveExcessPropertyChecks.ts, 34, 3))
->X : Symbol(X, Decl(recursiveExcessPropertyChecks.ts, 32, 2))
-
-const mainView: Dandy = {
->mainView : Symbol(mainView, Decl(recursiveExcessPropertyChecks.ts, 36, 5))
->Dandy : Symbol(Dandy, Decl(recursiveExcessPropertyChecks.ts, 28, 1))
-
-    diddy: "",
->diddy : Symbol(diddy, Decl(recursiveExcessPropertyChecks.ts, 36, 25))
-
-    children: [
->children : Symbol(children, Decl(recursiveExcessPropertyChecks.ts, 37, 14))
-        {
-            diddy: "",
->diddy : Symbol(diddy, Decl(recursiveExcessPropertyChecks.ts, 39, 9))
-
-            funky: "Empty" // <- Incorrect error
->funky : Symbol(funky, Decl(recursiveExcessPropertyChecks.ts, 40, 22))
-        }
-    ],
-};
-// Legal
-const p = mainView.children[0].funky
->p : Symbol(p, Decl(recursiveExcessPropertyChecks.ts, 46, 5))
->mainView.children[0].funky : Symbol(funky, Decl(recursiveExcessPropertyChecks.ts, 31, 24))
->mainView.children : Symbol(children, Decl(recursiveExcessPropertyChecks.ts, 21, 18), Decl(recursiveExcessPropertyChecks.ts, 30, 22))
->mainView : Symbol(mainView, Decl(recursiveExcessPropertyChecks.ts, 36, 5))
->children : Symbol(children, Decl(recursiveExcessPropertyChecks.ts, 21, 18), Decl(recursiveExcessPropertyChecks.ts, 30, 22))
->funky : Symbol(funky, Decl(recursiveExcessPropertyChecks.ts, 31, 24))
-
diff --git a/tests/baselines/reference/recursiveExcessPropertyChecks.types b/tests/baselines/reference/recursiveExcessPropertyChecks.types
@@ -25,75 +25,3 @@ getMaxId(nodes);
 >getMaxId : (items: NodeWithId[]) => void
 >nodes : ITreeItem[]
 
-
-// Repro from #42715
-export interface Donkey {
-    donkey: string;
->donkey : string
-}
-
-interface Diddy {
-    diddy: string;
->diddy : string
-
-    children?: Diddy[] | Donkey;
->children : Donkey | Diddy[] | undefined
-}
-
-interface Cranky {
-    cranky: string;
->cranky : string
-
-    children: Diddy;
->children : Diddy
-}
-
-type Dandy = Diddy & {
->Dandy : Dandy
-
-    children: (Diddy & { funky?: string })[];
->children : (Diddy & { funky?: string | undefined; })[]
->funky : string | undefined
-
-};
-type X = Dandy["children"]
->X : (Donkey | Diddy[] | undefined) & (Diddy & { funky?: string | undefined; })[]
-
-var x: X
->x : (Donkey | Diddy[] | undefined) & (Diddy & { funky?: string | undefined; })[]
-
-const mainView: Dandy = {
->mainView : Dandy
->{    diddy: "",    children: [        {            diddy: "",            funky: "Empty" // <- Incorrect error        }    ],} : { diddy: string; children: { diddy: string; funky: string; }[]; }
-
-    diddy: "",
->diddy : string
->"" : ""
-
-    children: [
->children : { diddy: string; funky: string; }[]
->[        {            diddy: "",            funky: "Empty" // <- Incorrect error        }    ] : { diddy: string; funky: string; }[]
-        {
->{            diddy: "",            funky: "Empty" // <- Incorrect error        } : { diddy: string; funky: string; }
-
-            diddy: "",
->diddy : string
->"" : ""
-
-            funky: "Empty" // <- Incorrect error
->funky : string
->"Empty" : "Empty"
-        }
-    ],
-};
-// Legal
-const p = mainView.children[0].funky
->p : string | undefined
->mainView.children[0].funky : string | undefined
->mainView.children[0] : Diddy & { funky?: string | undefined; }
->mainView.children : (Donkey | Diddy[] | undefined) & (Diddy & { funky?: string | undefined; })[]
->mainView : Dandy
->children : (Donkey | Diddy[] | undefined) & (Diddy & { funky?: string | undefined; })[]
->0 : 0
->funky : string | undefined
-
diff --git a/tests/cases/compiler/recursiveExcessPropertyChecks.ts b/tests/cases/compiler/recursiveExcessPropertyChecks.ts
@@ -13,37 +13,3 @@ function getMaxId(items: NodeWithId[]) {
 
 const nodes = [] as ITreeItem[];
 getMaxId(nodes);
-
-
-// Repro from #42715
-export interface Donkey {
-    donkey: string;
-}
-
-interface Diddy {
-    diddy: string;
-    children?: Diddy[] | Donkey;
-}
-
-interface Cranky {
-    cranky: string;
-    children: Diddy;
-}
-
-type Dandy = Diddy & {
-    children: (Diddy & { funky?: string })[];
-};
-type X = Dandy["children"]
-var x: X
-
-const mainView: Dandy = {
-    diddy: "",
-    children: [
-        {
-            diddy: "",
-            funky: "Empty" // <- Incorrect error
-        }
-    ],
-};
-// Legal
-const p = mainView.children[0].funky

Original file line number	Diff line number	Diff line change
`@@ -17929,7 +17929,7 @@ namespace ts {`
`17929`	`17929`	`let result = Ternary.True;`
`17930`	`17930`	`const sourceTypes = source.types;`
`17931`	`17931`	`for (const sourceType of sourceTypes) {`
`17932`		`- const related = typeRelatedToSomeType(sourceType, target, /reportErrors/ false, IntersectionState.None);`
	`17932`	`+ const related = typeRelatedToSomeType(sourceType, target, /reportErrors/ false);`
`17933`	`17933`	`if (!related) {`
`17934`	`17934`	`return Ternary.False;`
`17935`	`17935`	`}`
`@@ -17938,29 +17938,29 @@ namespace ts {`
`17938`	`17938`	`return result;`
`17939`	`17939`	`}`
`17940`	`17940`
`17941`		`- function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean, intersectionState: IntersectionState): Ternary {`
	`17941`	`+ function typeRelatedToSomeType(source: Type, target: UnionOrIntersectionType, reportErrors: boolean): Ternary {`
`17942`	`17942`	`const targetTypes = target.types;`
`17943`	`17943`	`if (target.flags & TypeFlags.Union) {`
`17944`	`17944`	`if (containsType(targetTypes, source)) {`
`17945`	`17945`	`return Ternary.True;`
`17946`	`17946`	`}`
`17947`	`17947`	`const match = getMatchingUnionConstituentForType(<UnionType>target, source);`
`17948`	`17948`	`if (match) {`
`17949`		`- const related = isRelatedTo(source, match, /reportErrors/ false, /headMessage/ undefined, intersectionState);`
	`17949`	`+ const related = isRelatedTo(source, match, /reportErrors/ false);`
`17950`	`17950`	`if (related) {`
`17951`	`17951`	`return related;`
`17952`	`17952`	`}`
`17953`	`17953`	`}`
`17954`	`17954`	`}`
`17955`	`17955`	`for (const type of targetTypes) {`
`17956`		`- const related = isRelatedTo(source, type, /reportErrors/ false, /headMessage/ undefined, intersectionState);`
	`17956`	`+ const related = isRelatedTo(source, type, /reportErrors/ false);`
`17957`	`17957`	`if (related) {`
`17958`	`17958`	`return related;`
`17959`	`17959`	`}`
`17960`	`17960`	`}`
`17961`	`17961`	`if (reportErrors) {`
`17962`	`17962`	`const bestMatchingType = getBestMatchingType(source, target, isRelatedTo);`
`17963`		`- isRelatedTo(source, bestMatchingType \|\| targetTypes[targetTypes.length - 1], /reportErrors/ true, /headMessage/ undefined, intersectionState);`
	`17963`	`+ isRelatedTo(source, bestMatchingType \|\| targetTypes[targetTypes.length - 1], /reportErrors/ true);`
`17964`	`17964`	`}`
`17965`	`17965`	`return Ternary.False;`
`17966`	`17966`	`}`
`@@ -18220,7 +18220,7 @@ namespace ts {`
`18220`	`18220`	`eachTypeRelatedToType(source as UnionType, target, reportErrors && !(source.flags & TypeFlags.Primitive), intersectionState & ~IntersectionState.UnionIntersectionCheck);`
`18221`	`18221`	`}`
`18222`	`18222`	`if (target.flags & TypeFlags.Union) {`
`18223`		`- return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), <UnionType>target, reportErrors && !(source.flags & TypeFlags.Primitive) && !(target.flags & TypeFlags.Primitive), intersectionState & ~IntersectionState.UnionIntersectionCheck);`
	`18223`	`+ return typeRelatedToSomeType(getRegularTypeOfObjectLiteral(source), <UnionType>target, reportErrors && !(source.flags & TypeFlags.Primitive) && !(target.flags & TypeFlags.Primitive));`
`18224`	`18224`	`}`
`18225`	`18225`	`if (target.flags & TypeFlags.Intersection) {`
`18226`	`18226`	`return typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target as IntersectionType, reportErrors, IntersectionState.Target);`