From e67e2730f256d63135948a2f461e1eab3781a578 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Wed, 15 Mar 2023 19:14:29 -0700
Subject: [PATCH] Revert "Fixed an issue with spreading a spreadable generic
 expression into generic JSX (#51580)"

This reverts commit 63495beb1a6f4836a0c3915500026a51bd3c4742.
---
 src/compiler/checker.ts                       |  2 +-
 ...thSpreadingResultOfGenericFunction.symbols | 47 -------------------
 ...WithSpreadingResultOfGenericFunction.types | 36 --------------
 ...ntWithSpreadingResultOfGenericFunction.tsx | 18 -------
 4 files changed, 1 insertion(+), 102 deletions(-)
 delete mode 100644 tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.symbols
 delete mode 100644 tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types
 delete mode 100644 tests/cases/compiler/jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 5ec0efbd7e62e..29d5e7901aafb 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -30285,7 +30285,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
                     spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                     attributesTable = createSymbolTable();
                 }
-                const exprType = getReducedType(checkExpression(attributeDecl.expression));
+                const exprType = getReducedType(checkExpressionCached(attributeDecl.expression, checkMode));
                 if (isTypeAny(exprType)) {
                     hasSpreadAnyType = true;
                 }
diff --git a/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.symbols b/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.symbols
deleted file mode 100644
index 9a98bcaf939b1..0000000000000
--- a/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.symbols
+++ /dev/null
@@ -1,47 +0,0 @@
-=== tests/cases/compiler/jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx ===
-/// <reference path="react16.d.ts" />
-
-// repro #51577
-
-declare function omit<T, K extends string>(names: readonly K[], obj: T): Omit<T, K>;
->omit : Symbol(omit, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 0, 0), Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 84))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 22))
->K : Symbol(K, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 24))
->names : Symbol(names, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 43))
->K : Symbol(K, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 24))
->obj : Symbol(obj, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 63))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 22))
->Omit : Symbol(Omit, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 22))
->K : Symbol(K, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 24))
-
-declare function omit<K extends string>(names: readonly K[]): <T>(obj: T) => Omit<T, K>;
->omit : Symbol(omit, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 0, 0), Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 84))
->K : Symbol(K, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 22))
->names : Symbol(names, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 40))
->K : Symbol(K, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 22))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 63))
->obj : Symbol(obj, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 66))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 63))
->Omit : Symbol(Omit, Decl(lib.es5.d.ts, --, --))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 63))
->K : Symbol(K, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 5, 22))
-
-declare const otherProps: { bar: string, qwe: boolean }
->otherProps : Symbol(otherProps, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 7, 13))
->bar : Symbol(bar, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 7, 27))
->qwe : Symbol(qwe, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 7, 40))
-
-declare function GenericComponent<T>(props: T): null
->GenericComponent : Symbol(GenericComponent, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 7, 55))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 9, 34))
->props : Symbol(props, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 9, 37))
->T : Symbol(T, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 9, 34))
-
-<GenericComponent {...omit(['bar'], otherProps)} />; // no error
->GenericComponent : Symbol(GenericComponent, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 7, 55))
->omit : Symbol(omit, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 0, 0), Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 4, 84))
->otherProps : Symbol(otherProps, Decl(jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx, 7, 13))
-
-
-
diff --git a/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types b/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types
deleted file mode 100644
index 7d6093bcd9efb..0000000000000
--- a/tests/baselines/reference/jsxGenericComponentWithSpreadingResultOfGenericFunction.types
+++ /dev/null
@@ -1,36 +0,0 @@
-=== tests/cases/compiler/jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx ===
-/// <reference path="react16.d.ts" />
-
-// repro #51577
-
-declare function omit<T, K extends string>(names: readonly K[], obj: T): Omit<T, K>;
->omit : { <T, K extends string>(names: readonly K[], obj: T): Omit<T, K>; <K extends string>(names: readonly K[]): <T>(obj: T) => Omit<T, K>; }
->names : readonly K[]
->obj : T
-
-declare function omit<K extends string>(names: readonly K[]): <T>(obj: T) => Omit<T, K>;
->omit : { <T, K extends string>(names: readonly K[], obj: T): Omit<T, K>; <K extends string>(names: readonly K[]): <T>(obj: T) => Omit<T, K>; }
->names : readonly K[]
->obj : T
-
-declare const otherProps: { bar: string, qwe: boolean }
->otherProps : { bar: string; qwe: boolean; }
->bar : string
->qwe : boolean
-
-declare function GenericComponent<T>(props: T): null
->GenericComponent : <T>(props: T) => null
->props : T
->null : null
-
-<GenericComponent {...omit(['bar'], otherProps)} />; // no error
-><GenericComponent {...omit(['bar'], otherProps)} /> : JSX.Element
->GenericComponent : <T>(props: T) => null
->omit(['bar'], otherProps) : Omit<{ bar: string; qwe: boolean; }, "bar">
->omit : { <T, K extends string>(names: readonly K[], obj: T): Omit<T, K>; <K extends string>(names: readonly K[]): <T>(obj: T) => Omit<T, K>; }
->['bar'] : "bar"[]
->'bar' : "bar"
->otherProps : { bar: string; qwe: boolean; }
-
-
-
diff --git a/tests/cases/compiler/jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx b/tests/cases/compiler/jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx
deleted file mode 100644
index abb94add5e62a..0000000000000
--- a/tests/cases/compiler/jsxGenericComponentWithSpreadingResultOfGenericFunction.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-// @strict: true
-// @noEmit: true
-// @jsx: preserve
-
-/// <reference path="/.lib/react16.d.ts" />
-
-// repro #51577
-
-declare function omit<T, K extends string>(names: readonly K[], obj: T): Omit<T, K>;
-declare function omit<K extends string>(names: readonly K[]): <T>(obj: T) => Omit<T, K>;
-
-declare const otherProps: { bar: string, qwe: boolean }
-
-declare function GenericComponent<T>(props: T): null
-
-<GenericComponent {...omit(['bar'], otherProps)} />; // no error
-
-