Revert "Filter out non-array types when contextually typing array literal elements (microsoft#52589)"

This reverts commit e775383.

Author: jakebailey

src/compiler/checker.ts

@@ -19592,8 +19592,18 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                 return result;
             }
             const moreThanOneRealChildren = length(validChildren) > 1;
-            const arrayLikeTargetParts = filterType(childrenTargetType, isAssignableToAvailableAnyIterable);
-            const nonArrayLikeTargetParts = filterType(childrenTargetType, t => !isAssignableToAvailableAnyIterable(t));
+            let arrayLikeTargetParts: Type;
+            let nonArrayLikeTargetParts: Type;
+            const iterableType = getGlobalIterableType(/*reportErrors*/ false);
+            if (iterableType !== emptyGenericType) {
+                const anyIterable = createIterableType(anyType);
+                arrayLikeTargetParts = filterType(childrenTargetType, t => isTypeAssignableTo(t, anyIterable));
+                nonArrayLikeTargetParts = filterType(childrenTargetType, t => !isTypeAssignableTo(t, anyIterable));
+            }
+            else {
+                arrayLikeTargetParts = filterType(childrenTargetType, isArrayOrTupleLikeType);
+                nonArrayLikeTargetParts = filterType(childrenTargetType, t => !isArrayOrTupleLikeType(t));
+            }
             if (moreThanOneRealChildren) {
                 if (arrayLikeTargetParts !== neverType) {
                     const realSource = createTupleType(checkJsxChildren(containingElement, CheckMode.Normal));
@@ -23116,11 +23126,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         return isArrayLikeType(type) || isTupleLikeType(type);
     }
 
-    function isAssignableToAvailableAnyIterable(type: Type): boolean {
-        const anyIterable = getGlobalIterableType(/*reportErrors*/ false) !== emptyGenericType && createIterableType(anyType);
-        return anyIterable ? isTypeAssignableTo(type, anyIterable) : isArrayOrTupleLikeType(type);
-    }
-
     function getTupleElementType(type: Type, index: number) {
         const propType = getTypeOfPropertyOfType(type, "" + index as __String);
         if (propType) {
@@ -29080,7 +29085,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
     // type of T.
     function getContextualTypeForElementExpression(arrayContextualType: Type | undefined, index: number): Type | undefined {
         return arrayContextualType && (
-            index >= 0 && getTypeOfPropertyOfContextualType(filterType(arrayContextualType, t => !!getIndexTypeOfType(t, numberType) || isAssignableToAvailableAnyIterable(t)), "" + index as __String) ||
+            index >= 0 && getTypeOfPropertyOfContextualType(arrayContextualType, "" + index as __String) ||
             mapType(arrayContextualType, t =>
                 isTupleType(t) ?
                     getElementTypeOfSliceOfTupleType(t, 0, /*endSkipCount*/ 0, /*writing*/ false, /*noReductions*/ true) :

tests/baselines/reference/contextualSignatureInArrayElementPrefersArrayUnionMemberLibEs2015.symbols

@@ -60,70 +60,3 @@ emit('a', {
     },
 });
 
-// simplified repro from 52589#issuecomment-1416180638
-declare class MyCompiler {
->MyCompiler : Symbol(MyCompiler, Decl(contextualTypeCaching.ts, 21, 3))
-
-  compile(): void;
->compile : Symbol(MyCompiler.compile, Decl(contextualTypeCaching.ts, 24, 26))
-}
-interface WebpackPluginInstance {
->WebpackPluginInstance : Symbol(WebpackPluginInstance, Decl(contextualTypeCaching.ts, 26, 1))
-
-  apply: (compiler: MyCompiler) => void;
->apply : Symbol(WebpackPluginInstance.apply, Decl(contextualTypeCaching.ts, 27, 33))
->compiler : Symbol(compiler, Decl(contextualTypeCaching.ts, 28, 10))
->MyCompiler : Symbol(MyCompiler, Decl(contextualTypeCaching.ts, 21, 3))
-}
-type WebpackPluginFunction = (this: MyCompiler, compiler: MyCompiler) => void;
->WebpackPluginFunction : Symbol(WebpackPluginFunction, Decl(contextualTypeCaching.ts, 29, 1))
->this : Symbol(this, Decl(contextualTypeCaching.ts, 30, 30))
->MyCompiler : Symbol(MyCompiler, Decl(contextualTypeCaching.ts, 21, 3))
->compiler : Symbol(compiler, Decl(contextualTypeCaching.ts, 30, 47))
->MyCompiler : Symbol(MyCompiler, Decl(contextualTypeCaching.ts, 21, 3))
-
-interface Optimization {
->Optimization : Symbol(Optimization, Decl(contextualTypeCaching.ts, 30, 78))
-
-  minimizer?: (WebpackPluginInstance | WebpackPluginFunction)[];
->minimizer : Symbol(Optimization.minimizer, Decl(contextualTypeCaching.ts, 31, 24))
->WebpackPluginInstance : Symbol(WebpackPluginInstance, Decl(contextualTypeCaching.ts, 26, 1))
->WebpackPluginFunction : Symbol(WebpackPluginFunction, Decl(contextualTypeCaching.ts, 29, 1))
-}
-declare const A: <T, P extends keyof T>(
->A : Symbol(A, Decl(contextualTypeCaching.ts, 34, 13))
->T : Symbol(T, Decl(contextualTypeCaching.ts, 34, 18))
->P : Symbol(P, Decl(contextualTypeCaching.ts, 34, 20))
->T : Symbol(T, Decl(contextualTypeCaching.ts, 34, 18))
-
-  obj: T,
->obj : Symbol(obj, Decl(contextualTypeCaching.ts, 34, 40))
->T : Symbol(T, Decl(contextualTypeCaching.ts, 34, 18))
-
-  prop: P,
->prop : Symbol(prop, Decl(contextualTypeCaching.ts, 35, 9))
->P : Symbol(P, Decl(contextualTypeCaching.ts, 34, 20))
-
-  factory: () => T[P]
->factory : Symbol(factory, Decl(contextualTypeCaching.ts, 36, 10))
->T : Symbol(T, Decl(contextualTypeCaching.ts, 34, 18))
->P : Symbol(P, Decl(contextualTypeCaching.ts, 34, 20))
-
-) => void;
-export const applyOptimizationDefaults = (optimization: Optimization) => {
->applyOptimizationDefaults : Symbol(applyOptimizationDefaults, Decl(contextualTypeCaching.ts, 39, 12))
->optimization : Symbol(optimization, Decl(contextualTypeCaching.ts, 39, 42))
->Optimization : Symbol(Optimization, Decl(contextualTypeCaching.ts, 30, 78))
-
-  A(optimization, "minimizer", () => [
->A : Symbol(A, Decl(contextualTypeCaching.ts, 34, 13))
->optimization : Symbol(optimization, Decl(contextualTypeCaching.ts, 39, 42))
-    {
-      apply: (compiler) => {},
->apply : Symbol(apply, Decl(contextualTypeCaching.ts, 41, 5))
->compiler : Symbol(compiler, Decl(contextualTypeCaching.ts, 42, 14))
-
-    },
-  ]);
-};
-

tests/baselines/reference/contextualSignatureInArrayElementPrefersArrayUnionMemberLibEs2015.types

@@ -54,61 +54,3 @@ emit('a', {
     },
 });
 
-// simplified repro from 52589#issuecomment-1416180638
-declare class MyCompiler {
->MyCompiler : MyCompiler
-
-  compile(): void;
->compile : () => void
-}
-interface WebpackPluginInstance {
-  apply: (compiler: MyCompiler) => void;
->apply : (compiler: MyCompiler) => void
->compiler : MyCompiler
-}
-type WebpackPluginFunction = (this: MyCompiler, compiler: MyCompiler) => void;
->WebpackPluginFunction : (this: MyCompiler, compiler: MyCompiler) => void
->this : MyCompiler
->compiler : MyCompiler
-
-interface Optimization {
-  minimizer?: (WebpackPluginInstance | WebpackPluginFunction)[];
->minimizer : (WebpackPluginInstance | WebpackPluginFunction)[] | undefined
-}
-declare const A: <T, P extends keyof T>(
->A : <T, P extends keyof T>(obj: T, prop: P, factory: () => T[P]) => void
-
-  obj: T,
->obj : T
-
-  prop: P,
->prop : P
-
-  factory: () => T[P]
->factory : () => T[P]
-
-) => void;
-export const applyOptimizationDefaults = (optimization: Optimization) => {
->applyOptimizationDefaults : (optimization: Optimization) => void
->(optimization: Optimization) => {  A(optimization, "minimizer", () => [    {      apply: (compiler) => {},    },  ]);} : (optimization: Optimization) => void
->optimization : Optimization
-
-  A(optimization, "minimizer", () => [
->A(optimization, "minimizer", () => [    {      apply: (compiler) => {},    },  ]) : void
->A : <T, P extends keyof T>(obj: T, prop: P, factory: () => T[P]) => void
->optimization : Optimization
->"minimizer" : "minimizer"
->() => [    {      apply: (compiler) => {},    },  ] : () => { apply: (compiler: MyCompiler) => void; }[]
->[    {      apply: (compiler) => {},    },  ] : { apply: (compiler: MyCompiler) => void; }[]
-    {
->{      apply: (compiler) => {},    } : { apply: (compiler: MyCompiler) => void; }
-
-      apply: (compiler) => {},
->apply : (compiler: MyCompiler) => void
->(compiler) => {} : (compiler: MyCompiler) => void
->compiler : MyCompiler
-
-    },
-  ]);
-};
-

tests/baselines/reference/contextualSignatureInArrayElementPrefersArrayUnionMemberLibEs5.symbols

@@ -23,27 +23,3 @@ emit('a', {
         nestedCallback: (r) => {},
     },
 });
-
-// simplified repro from 52589#issuecomment-1416180638
-declare class MyCompiler {
-  compile(): void;
-}
-interface WebpackPluginInstance {
-  apply: (compiler: MyCompiler) => void;
-}
-type WebpackPluginFunction = (this: MyCompiler, compiler: MyCompiler) => void;
-interface Optimization {
-  minimizer?: (WebpackPluginInstance | WebpackPluginFunction)[];
-}
-declare const A: <T, P extends keyof T>(
-  obj: T,
-  prop: P,
-  factory: () => T[P]
-) => void;
-export const applyOptimizationDefaults = (optimization: Optimization) => {
-  A(optimization, "minimizer", () => [
-    {
-      apply: (compiler) => {},
-    },
-  ]);
-};