Port TS#62283: Clear SkipGenericFunctions in yield expression checking

internal/checker/checker.go

@@ -19852,7 +19852,7 @@ func (c *Checker) checkAndAggregateYieldOperandTypes(fn *ast.Node, checkMode Che
 	forEachYieldExpression(fn.Body(), func(yieldExpr *ast.Node) {
 		yieldExprType := c.undefinedWideningType
 		if yieldExpr.Expression() != nil {
-			yieldExprType = c.checkExpressionEx(yieldExpr.Expression(), checkMode)
+			yieldExprType = c.checkExpressionEx(yieldExpr.Expression(), checkMode & ^CheckModeSkipGenericFunctions)
 		}
 		if yieldExpr.Expression() != nil && c.isConstContext(yieldExpr.Expression()) {
 			yieldExprType = c.getRegularTypeOfLiteralType(yieldExprType)

testdata/baselines/reference/submodule/compiler/genericCallAtYieldExpressionInGenericCall1.errors.txt

@@ -1,15 +1,11 @@
-genericCallAtYieldExpressionInGenericCall1.ts(13,25): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
 genericCallAtYieldExpressionInGenericCall1.ts(26,25): error TS2488: Type '() => T' must have a '[Symbol.iterator]()' method that returns an iterator.
-genericCallAtYieldExpressionInGenericCall1.ts(26,25): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-genericCallAtYieldExpressionInGenericCall1.ts(42,10): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-genericCallAtYieldExpressionInGenericCall1.ts(56,8): error TS2345: Argument of type '<T>(value: T) => Generator<any, void, unknown>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
-  Type 'Generator<any, void, unknown>' is not assignable to type 'Generator<never, unknown, unknown>'.
+genericCallAtYieldExpressionInGenericCall1.ts(56,8): error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
+  Type 'Generator<number, void, any>' is not assignable to type 'Generator<never, unknown, unknown>'.
     The types returned by 'next(...)' are incompatible between these types.
-      Type 'IteratorResult<any, void>' is not assignable to type 'IteratorResult<never, unknown>'.
-        Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorResult<never, unknown>'.
-          Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorYieldResult<never>'.
-            Type 'any' is not assignable to type 'never'.
-genericCallAtYieldExpressionInGenericCall1.ts(57,10): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
+      Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
+        Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
+          Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
+            Type 'number' is not assignable to type 'never'.
 genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
   Type 'Generator<number, void, any>' is not assignable to type 'Generator<never, unknown, unknown>'.
     The types returned by 'next(...)' are incompatible between these types.
@@ -19,7 +15,7 @@ genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of t
             Type 'number' is not assignable to type 'never'.
 
 
-==== genericCallAtYieldExpressionInGenericCall1.ts (7 errors) ====
+==== genericCallAtYieldExpressionInGenericCall1.ts (3 errors) ====
     declare const inner: {
       <A>(value: A): {
         (): A;
@@ -33,8 +29,6 @@ genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of t
 
     outer(function* <T>(value: T) {
       const result = yield* inner(value); // ok
-                            ~~~~~~~~~~~~
-!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
     });
 
     outer(function* <T>(value: T) {
@@ -50,8 +44,6 @@ genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of t
       const result = yield* inner2(value); // error
                             ~~~~~~~~~~~~~
 !!! error TS2488: Type '() => T' must have a '[Symbol.iterator]()' method that returns an iterator.
-                            ~~~~~~~~~~~~~
-!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
     });
 
     declare const inner3: {
@@ -68,8 +60,6 @@ genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of t
     // number
     const result1 = outer2(function* <T>(value: T) {
       yield* inner3(value);
-             ~~~~~~~~~~~~~
-!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
     });
 
     // number
@@ -85,16 +75,14 @@ genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of t
     // error
     outer3(function* <T>(value: T) {
            ~~~~~~~~
-!!! error TS2345: Argument of type '<T>(value: T) => Generator<any, void, unknown>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
-!!! error TS2345:   Type 'Generator<any, void, unknown>' is not assignable to type 'Generator<never, unknown, unknown>'.
+!!! error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
+!!! error TS2345:   Type 'Generator<number, void, any>' is not assignable to type 'Generator<never, unknown, unknown>'.
 !!! error TS2345:     The types returned by 'next(...)' are incompatible between these types.
-!!! error TS2345:       Type 'IteratorResult<any, void>' is not assignable to type 'IteratorResult<never, unknown>'.
-!!! error TS2345:         Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorResult<never, unknown>'.
-!!! error TS2345:           Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorYieldResult<never>'.
-!!! error TS2345:             Type 'any' is not assignable to type 'never'.
+!!! error TS2345:       Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
+!!! error TS2345:         Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
+!!! error TS2345:           Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
+!!! error TS2345:             Type 'number' is not assignable to type 'never'.
       yield* inner3(value);
-             ~~~~~~~~~~~~~
-!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
     });
 
     // error

testdata/baselines/reference/submodule/compiler/genericCallAtYieldExpressionInGenericCall1.errors.txt.diff

@@ -1,89 +1,31 @@
 --- old.genericCallAtYieldExpressionInGenericCall1.errors.txt
 +++ new.genericCallAtYieldExpressionInGenericCall1.errors.txt
 @@= skipped -0, +0 lines =@@
-+genericCallAtYieldExpressionInGenericCall1.ts(13,25): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
  genericCallAtYieldExpressionInGenericCall1.ts(26,25): error TS2488: Type '() => T' must have a '[Symbol.iterator]()' method that returns an iterator.
--genericCallAtYieldExpressionInGenericCall1.ts(56,8): error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
+ genericCallAtYieldExpressionInGenericCall1.ts(56,8): error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
 -  Call signature return types 'Generator<number, void, any>' and 'Generator<never, unknown, unknown>' are incompatible.
-+genericCallAtYieldExpressionInGenericCall1.ts(26,25): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-+genericCallAtYieldExpressionInGenericCall1.ts(42,10): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-+genericCallAtYieldExpressionInGenericCall1.ts(56,8): error TS2345: Argument of type '<T>(value: T) => Generator<any, void, unknown>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
-+  Type 'Generator<any, void, unknown>' is not assignable to type 'Generator<never, unknown, unknown>'.
++  Type 'Generator<number, void, any>' is not assignable to type 'Generator<never, unknown, unknown>'.
      The types returned by 'next(...)' are incompatible between these types.
--      Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
--        Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
--          Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
--            Type 'number' is not assignable to type 'never'.
-+      Type 'IteratorResult<any, void>' is not assignable to type 'IteratorResult<never, unknown>'.
-+        Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorResult<never, unknown>'.
-+          Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorYieldResult<never>'.
-+            Type 'any' is not assignable to type 'never'.
-+genericCallAtYieldExpressionInGenericCall1.ts(57,10): error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
+       Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
+         Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
+           Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
+             Type 'number' is not assignable to type 'never'.
  genericCallAtYieldExpressionInGenericCall1.ts(61,8): error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
 -  Call signature return types 'Generator<number, void, any>' and 'Generator<never, unknown, unknown>' are incompatible.
 +  Type 'Generator<number, void, any>' is not assignable to type 'Generator<never, unknown, unknown>'.
      The types returned by 'next(...)' are incompatible between these types.
        Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
          Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
-@@= skipped -14, +18 lines =@@
-             Type 'number' is not assignable to type 'never'.
-
-
--==== genericCallAtYieldExpressionInGenericCall1.ts (3 errors) ====
-+==== genericCallAtYieldExpressionInGenericCall1.ts (7 errors) ====
-     declare const inner: {
-       <A>(value: A): {
-         (): A;
-@@= skipped -14, +14 lines =@@
-
-     outer(function* <T>(value: T) {
-       const result = yield* inner(value); // ok
-+                            ~~~~~~~~~~~~
-+!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-     });
-
-     outer(function* <T>(value: T) {
-@@= skipped -15, +17 lines =@@
-       const result = yield* inner2(value); // error
-                             ~~~~~~~~~~~~~
- !!! error TS2488: Type '() => T' must have a '[Symbol.iterator]()' method that returns an iterator.
-+                            ~~~~~~~~~~~~~
-+!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-     });
-
-     declare const inner3: {
-@@= skipped -16, +18 lines =@@
-     // number
-     const result1 = outer2(function* <T>(value: T) {
-       yield* inner3(value);
-+             ~~~~~~~~~~~~~
-+!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-     });
-
-     // number
-@@= skipped -15, +17 lines =@@
-     // error
+@@= skipped -75, +75 lines =@@
      outer3(function* <T>(value: T) {
             ~~~~~~~~
--!!! error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
+ !!! error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
 -!!! error TS2345:   Call signature return types 'Generator<number, void, any>' and 'Generator<never, unknown, unknown>' are incompatible.
-+!!! error TS2345: Argument of type '<T>(value: T) => Generator<any, void, unknown>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.
-+!!! error TS2345:   Type 'Generator<any, void, unknown>' is not assignable to type 'Generator<never, unknown, unknown>'.
++!!! error TS2345:   Type 'Generator<number, void, any>' is not assignable to type 'Generator<never, unknown, unknown>'.
  !!! error TS2345:     The types returned by 'next(...)' are incompatible between these types.
--!!! error TS2345:       Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
--!!! error TS2345:         Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
--!!! error TS2345:           Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorYieldResult<never>'.
--!!! error TS2345:             Type 'number' is not assignable to type 'never'.
-+!!! error TS2345:       Type 'IteratorResult<any, void>' is not assignable to type 'IteratorResult<never, unknown>'.
-+!!! error TS2345:         Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorResult<never, unknown>'.
-+!!! error TS2345:           Type 'IteratorYieldResult<any>' is not assignable to type 'IteratorYieldResult<never>'.
-+!!! error TS2345:             Type 'any' is not assignable to type 'never'.
-       yield* inner3(value);
-+             ~~~~~~~~~~~~~
-+!!! error TS2488: Type 'never' must have a '[Symbol.iterator]()' method that returns an iterator.
-     });
-
-     // error
+ !!! error TS2345:       Type 'IteratorResult<number, void>' is not assignable to type 'IteratorResult<never, unknown>'.
+ !!! error TS2345:         Type 'IteratorYieldResult<number>' is not assignable to type 'IteratorResult<never, unknown>'.
+@@= skipped -13, +13 lines =@@
      outer3(function* <T>(value: T) {
             ~~~~~~~~
  !!! error TS2345: Argument of type '<T>(value: T) => Generator<number, void, any>' is not assignable to parameter of type '(value: unknown) => Generator<never, unknown, unknown>'.

testdata/baselines/reference/submodule/compiler/genericCallAtYieldExpressionInGenericCall1.types

@@ -112,10 +112,10 @@ declare function outer2<A, Y>(body: (value: A) => Generator<Y, any, any>): Y;
 
 // number
 const result1 = outer2(function* <T>(value: T) {
->result1 : any
->outer2(function* <T>(value: T) {  yield* inner3(value);}) : any
+>result1 : number
+>outer2(function* <T>(value: T) {  yield* inner3(value);}) : number
 >outer2 : <A, Y>(body: (value: A) => Generator<Y, any, any>) => Y
->function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<any, void, any>
+>function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<number, void, any>
 >value : T
 
   yield* inner3(value);
@@ -159,7 +159,7 @@ declare function outer3<A>(
 outer3(function* <T>(value: T) {
 >outer3(function* <T>(value: T) {  yield* inner3(value);}) : void
 >outer3 : <A>(body: (value: A) => Generator<never, unknown, unknown>) => void
->function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<any, void, unknown>
+>function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<number, void, any>
 >value : T
 
   yield* inner3(value);

testdata/baselines/reference/submodule/compiler/genericCallAtYieldExpressionInGenericCall1.types.diff

@@ -79,18 +79,7 @@
  >args : readonly any[]
 
      };
-@@= skipped -27, +27 lines =@@
-
- // number
- const result1 = outer2(function* <T>(value: T) {
-->result1 : number
-->outer2(function* <T>(value: T) {  yield* inner3(value);}) : number
-+>result1 : any
-+>outer2(function* <T>(value: T) {  yield* inner3(value);}) : any
- >outer2 : <A, Y>(body: (value: A) => Generator<Y, any, any>) => Y
-->function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<number, void, any>
-+>function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<any, void, any>
- >value : T
+@@= skipped -35, +35 lines =@@
 
    yield* inner3(value);
  >yield* inner3(value) : T
@@ -101,7 +90,7 @@
  >value : T
 
  });
-@@= skipped -23, +23 lines =@@
+@@= skipped -15, +15 lines =@@
  >value : T
 
    const x = inner3(value);
@@ -120,13 +109,7 @@
 
  });
 
-@@= skipped -24, +24 lines =@@
- outer3(function* <T>(value: T) {
- >outer3(function* <T>(value: T) {  yield* inner3(value);}) : void
- >outer3 : <A>(body: (value: A) => Generator<never, unknown, unknown>) => void
-->function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<number, void, any>
-+>function* <T>(value: T) {  yield* inner3(value);} : <T>(value: T) => Generator<any, void, unknown>
- >value : T
+@@= skipped -29, +29 lines =@@
 
    yield* inner3(value);
  >yield* inner3(value) : T
@@ -137,7 +120,7 @@
  >value : T
 
  });
-@@= skipped -19, +19 lines =@@
+@@= skipped -14, +14 lines =@@
  >value : T
 
    const x = inner3(value);