Simplify keyof NoInfer<T> ==> NoInfer<keyof T> transformation

microsoft · Dec 20, 2023 · 14b90c2 · 14b90c2
1 parent 63b6713
commit 14b90c2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -17760,7 +17760,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     }
 
     function shouldDeferIndexType(type: Type, indexFlags = IndexFlags.None) {
-        return !!(type.flags & TypeFlags.InstantiableNonPrimitive && !isNoInferType(type) ||
+        return !!(type.flags & TypeFlags.InstantiableNonPrimitive ||
             isGenericTupleType(type) ||
             isGenericMappedType(type) && (!hasDistributiveNameType(type) || getMappedTypeNameTypeKind(type) === MappedTypeNameTypeKind.Remapping) ||
             type.flags & TypeFlags.Union && !(indexFlags & IndexFlags.NoReducibleCheck) && isGenericReducibleType(type) ||
@@ -17769,10 +17769,10 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
 
     function getIndexType(type: Type, indexFlags = defaultIndexFlags): Type {
         type = getReducedType(type);
-        return shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type as InstantiableType | UnionOrIntersectionType, indexFlags) :
+        return isNoInferType(type) ? getNoInferType(getIndexType((type as SubstitutionType).baseType, indexFlags)) :
+            shouldDeferIndexType(type, indexFlags) ? getIndexTypeForGenericType(type as InstantiableType | UnionOrIntersectionType, indexFlags) :
             type.flags & TypeFlags.Union ? getIntersectionType(map((type as UnionType).types, t => getIndexType(t, indexFlags))) :
             type.flags & TypeFlags.Intersection ? getUnionType(map((type as IntersectionType).types, t => getIndexType(t, indexFlags))) :
-            type.flags & TypeFlags.Substitution ? getNoInferType(getIndexType((type as SubstitutionType).baseType, indexFlags)) :
             getObjectFlags(type) & ObjectFlags.Mapped ? getIndexTypeForMappedType(type as MappedType, indexFlags) :
             type === wildcardType ? wildcardType :
             type.flags & TypeFlags.Unknown ? neverType :