maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes fallback checks that cause an exception during call resolution for an async function

Browse source
This commit is contained in:
Ron Buckton 2015-08-28 15:13:32 -07:00
parent 90aff0c654
commit 1ea378859c
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

@ -4036,7 +4036,7 @@ namespace ts {
*/ */
function createTypedPropertyDescriptorType(propertyType: Type): Type { function createTypedPropertyDescriptorType(propertyType: Type): Type {
let globalTypedPropertyDescriptorType = getGlobalTypedPropertyDescriptorType(); let globalTypedPropertyDescriptorType = getGlobalTypedPropertyDescriptorType();
return globalTypedPropertyDescriptorType !== emptyObjectType return globalTypedPropertyDescriptorType !== emptyGenericType
? createTypeReference(<GenericType>globalTypedPropertyDescriptorType, [propertyType]) ? createTypeReference(<GenericType>globalTypedPropertyDescriptorType, [propertyType])
: emptyObjectType; : emptyObjectType;
} }
@ -9176,7 +9176,7 @@ namespace ts {
function createPromiseType(promisedType: Type): Type { function createPromiseType(promisedType: Type): Type {
// creates a `Promise<T>` type where `T` is the promisedType argument // creates a `Promise<T>` type where `T` is the promisedType argument
let globalPromiseType = getGlobalPromiseType(); let globalPromiseType = getGlobalPromiseType();
if (globalPromiseType !== emptyObjectType) { if (globalPromiseType !== emptyGenericType) {
// if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
promisedType = getAwaitedType(promisedType); promisedType = getAwaitedType(promisedType);
return createTypeReference(<GenericType>globalPromiseType, [promisedType]); return createTypeReference(<GenericType>globalPromiseType, [promisedType]);
@ -14633,7 +14633,7 @@ namespace ts {
function createInstantiatedPromiseLikeType(): ObjectType { function createInstantiatedPromiseLikeType(): ObjectType {
let promiseLikeType = getGlobalPromiseLikeType(); let promiseLikeType = getGlobalPromiseLikeType();
if (promiseLikeType !== emptyObjectType) { if (promiseLikeType !== emptyGenericType) {
return createTypeReference(<GenericType>promiseLikeType, [anyType]); return createTypeReference(<GenericType>promiseLikeType, [anyType]);
} }