microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 03:23:08 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix up two comments

Browse Source
This commit is contained in:
Jason Freeman 2015-05-08 15:35:42 -07:00
parent a14ec69316
commit 1a14725c32
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compiler/checker.ts
View File

@ -7323,7 +7323,6 @@ module ts {
type = checkExpressionCached(<Expression>func.body, contextualMapper);
}
else {
// Aggregate the types of expressions within all the return statements.
let types: Type[];
if (func.asteriskToken) {
types = checkAndAggregateYieldOperandTypes(<Block>func.body, contextualMapper);
@ -7342,8 +7341,9 @@ module ts {
return voidType;
}
}
// When return statements are contextually typed we allow the return type to be a union type. Otherwise we require the
// return expressions to have a best common supertype.
// When yield/return statements are contextually typed we allow the return type to be a union type.
// Otherwise we require the yield/return expressions to have a best common supertype.
type = contextualSignature ? getUnionType(types) : getCommonSupertype(types);
if (!type) {
if (func.asteriskToken) {