Merge pull request #14235 from Microsoft/master-fix14043

yuit · web-flow · commit 46587c8dcabe · 2017-03-21T11:06:11.000-07:00
[Master] fix 14043 collect return type from return statement in generator function
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -15146,8 +15146,8 @@ namespace ts {
             else {
                 let types: Type[];
                 if (functionFlags & FunctionFlags.Generator) { // Generator or AsyncGenerator function
-                    types = checkAndAggregateYieldOperandTypes(func, checkMode);
-                    if (types.length === 0) {
+                    types = concatenate(checkAndAggregateYieldOperandTypes(func, checkMode), checkAndAggregateReturnExpressionTypes(func, checkMode));
+                    if (!types || types.length === 0) {
                         const iterableIteratorAny = functionFlags & FunctionFlags.Async
                             ? createAsyncIterableIteratorType(anyType) // AsyncGenerator function
                             : createIterableIteratorType(anyType); // Generator function
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es2015.types b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es2015.types
@@ -80,7 +80,7 @@ class C7 {
 >C7 : C7
 
     async * f() {
->f : () => AsyncIterableIterator<any>
+>f : () => AsyncIterableIterator<1>
 
         return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.types b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.types
@@ -80,7 +80,7 @@ class C7 {
 >C7 : C7
 
     async * f() {
->f : () => AsyncIterableIterator<any>
+>f : () => AsyncIterableIterator<1>
 
         return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.esnext.types b/tests/baselines/reference/emitter.asyncGenerators.classMethods.esnext.types
@@ -80,7 +80,7 @@ class C7 {
 >C7 : C7
 
     async * f() {
->f : () => AsyncIterableIterator<any>
+>f : () => AsyncIterableIterator<1>
 
         return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es2015.types b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es2015.types
@@ -53,7 +53,7 @@ async function * f6() {
 }
 === tests/cases/conformance/emitter/es2015/asyncGenerators/F7.ts ===
 async function * f7() {
->f7 : () => AsyncIterableIterator<any>
+>f7 : () => AsyncIterableIterator<1>
 
     return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.types b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.es5.types
@@ -53,7 +53,7 @@ async function * f6() {
 }
 === tests/cases/conformance/emitter/es5/asyncGenerators/F7.ts ===
 async function * f7() {
->f7 : () => AsyncIterableIterator<any>
+>f7 : () => AsyncIterableIterator<1>
 
     return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.esnext.types b/tests/baselines/reference/emitter.asyncGenerators.functionDeclarations.esnext.types
@@ -53,7 +53,7 @@ async function * f6() {
 }
 === tests/cases/conformance/emitter/esnext/asyncGenerators/F7.ts ===
 async function * f7() {
->f7 : () => AsyncIterableIterator<any>
+>f7 : () => AsyncIterableIterator<1>
 
     return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es2015.types b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es2015.types
@@ -59,8 +59,8 @@ const f6 = async function * () {
 }
 === tests/cases/conformance/emitter/es2015/asyncGenerators/F7.ts ===
 const f7 = async function * () {
->f7 : () => AsyncIterableIterator<any>
->async function * () {    return 1;} : () => AsyncIterableIterator<any>
+>f7 : () => AsyncIterableIterator<1>
+>async function * () {    return 1;} : () => AsyncIterableIterator<1>
 
     return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.types b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.es5.types
@@ -59,8 +59,8 @@ const f6 = async function * () {
 }
 === tests/cases/conformance/emitter/es5/asyncGenerators/F7.ts ===
 const f7 = async function * () {
->f7 : () => AsyncIterableIterator<any>
->async function * () {    return 1;} : () => AsyncIterableIterator<any>
+>f7 : () => AsyncIterableIterator<1>
+>async function * () {    return 1;} : () => AsyncIterableIterator<1>
 
     return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.esnext.types b/tests/baselines/reference/emitter.asyncGenerators.functionExpressions.esnext.types
@@ -59,8 +59,8 @@ const f6 = async function * () {
 }
 === tests/cases/conformance/emitter/esnext/asyncGenerators/F7.ts ===
 const f7 = async function * () {
->f7 : () => AsyncIterableIterator<any>
->async function * () {    return 1;} : () => AsyncIterableIterator<any>
+>f7 : () => AsyncIterableIterator<1>
+>async function * () {    return 1;} : () => AsyncIterableIterator<1>
 
     return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es2015.types b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es2015.types
@@ -83,11 +83,11 @@ const o6 = {
 }
 === tests/cases/conformance/emitter/es2015/asyncGenerators/O7.ts ===
 const o7 = {
->o7 : { f(): AsyncIterableIterator<any>; }
->{    async * f() {        return 1;    }} : { f(): AsyncIterableIterator<any>; }
+>o7 : { f(): AsyncIterableIterator<1>; }
+>{    async * f() {        return 1;    }} : { f(): AsyncIterableIterator<1>; }
 
     async * f() {
->f : () => AsyncIterableIterator<any>
+>f : () => AsyncIterableIterator<1>
 
         return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.types b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.es5.types
@@ -83,11 +83,11 @@ const o6 = {
 }
 === tests/cases/conformance/emitter/es5/asyncGenerators/O7.ts ===
 const o7 = {
->o7 : { f(): AsyncIterableIterator<any>; }
->{    async * f() {        return 1;    }} : { f(): AsyncIterableIterator<any>; }
+>o7 : { f(): AsyncIterableIterator<1>; }
+>{    async * f() {        return 1;    }} : { f(): AsyncIterableIterator<1>; }
 
     async * f() {
->f : () => AsyncIterableIterator<any>
+>f : () => AsyncIterableIterator<1>
 
         return 1;
 >1 : 1
diff --git a/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.esnext.types b/tests/baselines/reference/emitter.asyncGenerators.objectLiteralMethods.esnext.types
@@ -83,11 +83,11 @@ const o6 = {
 }
 === tests/cases/conformance/emitter/esnext/asyncGenerators/O7.ts ===
 const o7 = {
->o7 : { f(): AsyncIterableIterator<any>; }
->{    async * f() {        return 1;    }} : { f(): AsyncIterableIterator<any>; }
+>o7 : { f(): AsyncIterableIterator<1>; }
+>{    async * f() {        return 1;    }} : { f(): AsyncIterableIterator<1>; }
 
     async * f() {
->f : () => AsyncIterableIterator<any>
+>f : () => AsyncIterableIterator<1>
 
         return 1;
 >1 : 1
diff --git a/tests/baselines/reference/generatorTypeCheck14.types b/tests/baselines/reference/generatorTypeCheck14.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck14.ts ===
 function* g() {
->g : () => IterableIterator<0>
+>g : () => IterableIterator<0 | "">
 
     yield 0;
 >yield 0 : any
diff --git a/tests/baselines/reference/generatorTypeCheck15.types b/tests/baselines/reference/generatorTypeCheck15.types
@@ -1,6 +1,6 @@
 === tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck15.ts ===
 function* g() {
->g : () => IterableIterator<any>
+>g : () => IterableIterator<"">
 
     return "";
 >"" : ""
diff --git a/tests/baselines/reference/generatorTypeCheck34.types b/tests/baselines/reference/generatorTypeCheck34.types
@@ -7,7 +7,7 @@ function* g() {
 >0 : 0
 
     function* g2() {
->g2 : () => IterableIterator<any>
+>g2 : () => IterableIterator<"">
 
         return "";
 >"" : ""
diff --git a/tests/baselines/reference/generatorTypeCheck62.js b/tests/baselines/reference/generatorTypeCheck62.js
@@ -0,0 +1,63 @@
+//// [generatorTypeCheck62.ts]
+
+export interface StrategicState {
+    lastStrategyApplied?: string;
+}
+
+export function strategy<T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>): (a: T) => IterableIterator<T | undefined> {
+    return function*(state) {
+        for (const next of gen(state)) {
+            if (next) {
+                next.lastStrategyApplied = stratName;
+            }
+            yield next;
+        }
+    }
+}
+
+export interface Strategy<T> {
+    (a: T): IterableIterator<T | undefined>;
+}
+
+export interface State extends StrategicState {
+    foo: number;
+}
+
+export const Nothing1: Strategy<State> = strategy("Nothing", function*(state: State) {
+    return state;
+});
+
+export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: State) {
+    yield state;
+});
+
+export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: State) {
+    yield ;
+    return state;
+});
+ 
+
+//// [generatorTypeCheck62.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function strategy(stratName, gen) {
+    return function* (state) {
+        for (const next of gen(state)) {
+            if (next) {
+                next.lastStrategyApplied = stratName;
+            }
+            yield next;
+        }
+    };
+}
+exports.strategy = strategy;
+exports.Nothing1 = strategy("Nothing", function* (state) {
+    return state;
+});
+exports.Nothing2 = strategy("Nothing", function* (state) {
+    yield state;
+});
+exports.Nothing3 = strategy("Nothing", function* (state) {
+    yield;
+    return state;
+});
diff --git a/tests/baselines/reference/generatorTypeCheck62.symbols b/tests/baselines/reference/generatorTypeCheck62.symbols
@@ -0,0 +1,106 @@
+=== tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck62.ts ===
+
+export interface StrategicState {
+>StrategicState : Symbol(StrategicState, Decl(generatorTypeCheck62.ts, 0, 0))
+
+    lastStrategyApplied?: string;
+>lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 1, 33))
+}
+
+export function strategy<T extends StrategicState>(stratName: string, gen: (a: T) => IterableIterator<T | undefined>): (a: T) => IterableIterator<T | undefined> {
+>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25))
+>StrategicState : Symbol(StrategicState, Decl(generatorTypeCheck62.ts, 0, 0))
+>stratName : Symbol(stratName, Decl(generatorTypeCheck62.ts, 5, 51))
+>gen : Symbol(gen, Decl(generatorTypeCheck62.ts, 5, 69))
+>a : Symbol(a, Decl(generatorTypeCheck62.ts, 5, 76))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.iterable.d.ts, --, --))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25))
+>a : Symbol(a, Decl(generatorTypeCheck62.ts, 5, 120))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.iterable.d.ts, --, --))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 5, 25))
+
+    return function*(state) {
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 6, 21))
+
+        for (const next of gen(state)) {
+>next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18))
+>gen : Symbol(gen, Decl(generatorTypeCheck62.ts, 5, 69))
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 6, 21))
+
+            if (next) {
+>next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18))
+
+                next.lastStrategyApplied = stratName;
+>next.lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 1, 33))
+>next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18))
+>lastStrategyApplied : Symbol(StrategicState.lastStrategyApplied, Decl(generatorTypeCheck62.ts, 1, 33))
+>stratName : Symbol(stratName, Decl(generatorTypeCheck62.ts, 5, 51))
+            }
+            yield next;
+>next : Symbol(next, Decl(generatorTypeCheck62.ts, 7, 18))
+        }
+    }
+}
+
+export interface Strategy<T> {
+>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 16, 26))
+
+    (a: T): IterableIterator<T | undefined>;
+>a : Symbol(a, Decl(generatorTypeCheck62.ts, 17, 5))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 16, 26))
+>IterableIterator : Symbol(IterableIterator, Decl(lib.es2015.iterable.d.ts, --, --))
+>T : Symbol(T, Decl(generatorTypeCheck62.ts, 16, 26))
+}
+
+export interface State extends StrategicState {
+>State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1))
+>StrategicState : Symbol(StrategicState, Decl(generatorTypeCheck62.ts, 0, 0))
+
+    foo: number;
+>foo : Symbol(State.foo, Decl(generatorTypeCheck62.ts, 20, 47))
+}
+
+export const Nothing1: Strategy<State> = strategy("Nothing", function*(state: State) {
+>Nothing1 : Symbol(Nothing1, Decl(generatorTypeCheck62.ts, 24, 12))
+>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1))
+>State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1))
+>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1))
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 24, 71))
+>State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1))
+
+    return state;
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 24, 71))
+
+});
+
+export const Nothing2: Strategy<State> = strategy("Nothing", function*(state: State) {
+>Nothing2 : Symbol(Nothing2, Decl(generatorTypeCheck62.ts, 28, 12))
+>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1))
+>State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1))
+>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1))
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 28, 71))
+>State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1))
+
+    yield state;
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 28, 71))
+
+});
+
+export const Nothing3: Strategy<State> = strategy("Nothing", function* (state: State) {
+>Nothing3 : Symbol(Nothing3, Decl(generatorTypeCheck62.ts, 32, 12))
+>Strategy : Symbol(Strategy, Decl(generatorTypeCheck62.ts, 14, 1))
+>State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1))
+>strategy : Symbol(strategy, Decl(generatorTypeCheck62.ts, 3, 1))
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 32, 72))
+>State : Symbol(State, Decl(generatorTypeCheck62.ts, 18, 1))
+
+    yield ;
+    return state;
+>state : Symbol(state, Decl(generatorTypeCheck62.ts, 32, 72))
+
+});
+ 
diff --git a/tests/baselines/reference/generatorTypeCheck62.types b/tests/baselines/reference/generatorTypeCheck62.types
diff --git a/tests/baselines/reference/generatorTypeCheck63.errors.txt b/tests/baselines/reference/generatorTypeCheck63.errors.txt
diff --git a/tests/baselines/reference/generatorTypeCheck63.js b/tests/baselines/reference/generatorTypeCheck63.js
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck62.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck62.ts
diff --git a/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts b/tests/cases/conformance/es6/yieldExpressions/generatorTypeCheck63.ts

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ async function * f6() {`
`53`	`53`	`}`
`54`	`54`	`=== tests/cases/conformance/emitter/es2015/asyncGenerators/F7.ts ===`
`55`	`55`	`async function * f7() {`
`56`		`->f7 : () => AsyncIterableIterator<any>`
	`56`	`+>f7 : () => AsyncIterableIterator<1>`
`57`	`57`
`58`	`58`	`return 1;`
`59`	`59`	`>1 : 1`