Handle intersections in isGenericTypeWithoutNullableConstraint

ahejlsberg · ahejlsberg · commit 40a5fc1189d7 · 2022-08-28T08:11:10.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -25789,8 +25789,10 @@ namespace ts {
                 !!(type.flags & TypeFlags.Instantiable && getBaseConstraintOrType(type).flags & (TypeFlags.Nullable | TypeFlags.Union));
         }
 
-        function isGenericTypeWithoutNullableConstraint(type: Type) {
-            return !!(type.flags & TypeFlags.Instantiable && !maybeTypeOfKind(getBaseConstraintOrType(type), TypeFlags.Nullable));
+        function isGenericTypeWithoutNullableConstraint(type: Type): boolean {
+            return type.flags & TypeFlags.Intersection ?
+                some((type as IntersectionType).types, isGenericTypeWithoutNullableConstraint) :
+                !!(type.flags & TypeFlags.Instantiable && !maybeTypeOfKind(getBaseConstraintOrType(type), TypeFlags.Nullable));
         }
 
         function hasContextualTypeWithNoGenericTypes(node: Node, checkMode: CheckMode | undefined) {

Original file line number	Diff line number	Diff line change
`@@ -25789,8 +25789,10 @@ namespace ts {`
`25789`	`25789`	`!!(type.flags & TypeFlags.Instantiable && getBaseConstraintOrType(type).flags & (TypeFlags.Nullable \| TypeFlags.Union));`
`25790`	`25790`	`}`
`25791`	`25791`
`25792`		`- function isGenericTypeWithoutNullableConstraint(type: Type) {`
`25793`		`- return !!(type.flags & TypeFlags.Instantiable && !maybeTypeOfKind(getBaseConstraintOrType(type), TypeFlags.Nullable));`
	`25792`	`+ function isGenericTypeWithoutNullableConstraint(type: Type): boolean {`
	`25793`	`+ return type.flags & TypeFlags.Intersection ?`
	`25794`	`+ some((type as IntersectionType).types, isGenericTypeWithoutNullableConstraint) :`
	`25795`	`+ !!(type.flags & TypeFlags.Instantiable && !maybeTypeOfKind(getBaseConstraintOrType(type), TypeFlags.Nullable));`
`25794`	`25796`	`}`
`25795`	`25797`
`25796`	`25798`	`function hasContextualTypeWithNoGenericTypes(node: Node, checkMode: CheckMode \| undefined) {`