From f017fa04c477997fc64e364a2a45e013514fbdf1 Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@barzilay.org>
Date: Thu, 14 Nov 2019 14:10:17 -0500
Subject: [PATCH] Scan types of `yield` expressions in classes too

Also, drop the other cases where they were ignored, since they're
forbidden in enums, and the others are fine wrt the comment that was
there.

Fixes #34892
---
 src/compiler/utilities.ts                            | 5 +----
 tests/baselines/reference/generatorTypeCheck39.types | 2 +-
 tests/baselines/reference/generatorTypeCheck40.types | 2 +-
 tests/baselines/reference/generatorTypeCheck55.types | 2 +-
 tests/baselines/reference/generatorTypeCheck56.types | 2 +-
 tests/baselines/reference/generatorTypeCheck57.types | 2 +-
 tests/baselines/reference/generatorTypeCheck58.types | 2 +-
 tests/baselines/reference/generatorTypeCheck60.types | 2 +-
 tests/baselines/reference/generatorTypeCheck61.types | 2 +-
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index e7c5a7ae208..a7e3c8c34a0 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1221,11 +1221,8 @@ namespace ts {
                 case SyntaxKind.InterfaceDeclaration:
                 case SyntaxKind.ModuleDeclaration:
                 case SyntaxKind.TypeAliasDeclaration:
-                case SyntaxKind.ClassDeclaration:
-                case SyntaxKind.ClassExpression:
                     // These are not allowed inside a generator now, but eventually they may be allowed
-                    // as local types. Regardless, any yield statements contained within them should be
-                    // skipped in this traversal.
+                    // as local types. Regardless, skip them to avoid the work.
                     return;
                 default:
                     if (isFunctionLike(node)) {
diff --git a/tests/baselines/reference/generatorTypeCheck39.types b/tests/baselines/reference/generatorTypeCheck39.types
index 5ca4062b558..bca24c5336d 100644
--- a/tests/baselines/reference/generatorTypeCheck39.types
+++ b/tests/baselines/reference/generatorTypeCheck39.types
@@ -8,7 +8,7 @@ function decorator(x: any) {
 >y : any
 }
 function* g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<number, void, any>
 
     @decorator(yield 0)
 >decorator(yield 0) : (y: any) => void
diff --git a/tests/baselines/reference/generatorTypeCheck40.types b/tests/baselines/reference/generatorTypeCheck40.types
index 4e774158175..12b1abf598f 100644
--- a/tests/baselines/reference/generatorTypeCheck40.types
+++ b/tests/baselines/reference/generatorTypeCheck40.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck40.ts ===
 function* g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<number, void, unknown>
 
     class C extends (yield 0) { }
 >C : C
diff --git a/tests/baselines/reference/generatorTypeCheck55.types b/tests/baselines/reference/generatorTypeCheck55.types
index 15c3303b438..63b59328dcb 100644
--- a/tests/baselines/reference/generatorTypeCheck55.types
+++ b/tests/baselines/reference/generatorTypeCheck55.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck55.ts ===
 function* g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<any, void, unknown>
 
     var x = class C extends (yield) {};
 >x : typeof C
diff --git a/tests/baselines/reference/generatorTypeCheck56.types b/tests/baselines/reference/generatorTypeCheck56.types
index 6f05396a1f1..f76c3676c07 100644
--- a/tests/baselines/reference/generatorTypeCheck56.types
+++ b/tests/baselines/reference/generatorTypeCheck56.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck56.ts ===
 function* g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<number, void, unknown>
 
     var x = class C {
 >x : typeof C
diff --git a/tests/baselines/reference/generatorTypeCheck57.types b/tests/baselines/reference/generatorTypeCheck57.types
index 9e660521dfb..43c949ebe7e 100644
--- a/tests/baselines/reference/generatorTypeCheck57.types
+++ b/tests/baselines/reference/generatorTypeCheck57.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck57.ts ===
 function* g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<number, void, unknown>
 
     class C {
 >C : C
diff --git a/tests/baselines/reference/generatorTypeCheck58.types b/tests/baselines/reference/generatorTypeCheck58.types
index 69d1723be96..bff6b12e822 100644
--- a/tests/baselines/reference/generatorTypeCheck58.types
+++ b/tests/baselines/reference/generatorTypeCheck58.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck58.ts ===
 function* g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<number, void, unknown>
 
     class C {
 >C : C
diff --git a/tests/baselines/reference/generatorTypeCheck60.types b/tests/baselines/reference/generatorTypeCheck60.types
index b10101b6f41..453432d3070 100644
--- a/tests/baselines/reference/generatorTypeCheck60.types
+++ b/tests/baselines/reference/generatorTypeCheck60.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck60.ts ===
 function* g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<any, void, unknown>
 
     class C extends (yield) {};
 >C : C
diff --git a/tests/baselines/reference/generatorTypeCheck61.types b/tests/baselines/reference/generatorTypeCheck61.types
index 91874ffa58d..d78d7439d47 100644
--- a/tests/baselines/reference/generatorTypeCheck61.types
+++ b/tests/baselines/reference/generatorTypeCheck61.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck61.ts ===
 function * g() {
->g : () => Generator<never, void, unknown>
+>g : () => Generator<number, void, unknown>
 
     @(yield 0)
 >(yield 0) : any