Merge pull request #6699 from RyanCavanaugh/fix6663

Use union types in the return type of functions in the error case
This commit is contained in:
Ryan Cavanaugh
2016-01-28 13:30:03 -08:00
2 changed files with 27 additions and 1 deletions

View File

@@ -10421,7 +10421,8 @@ namespace ts {
}
else {
error(func, Diagnostics.No_best_common_type_exists_among_return_expressions);
return unknownType;
// Defer to unioning the return types so we get a) downstream errors earlier and b) better Salsa experience
return getUnionType(types);
}
}