Skip to content

Commit 4186167

Browse files
committed
Removing 'resolvingType' special type
1 parent 7efd93a commit 4186167

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/compiler/checker.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ module ts {
8888
let undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
8989
let nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
9090
let unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
91-
let resolvingType = createIntrinsicType(TypeFlags.Any, "__resolving__");
9291

9392
let emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
9493
let anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
@@ -7373,10 +7372,9 @@ module ts {
73737372
if (isContextSensitive(node)) {
73747373
assignContextualParameterTypes(signature, contextualSignature, contextualMapper || identityMapper);
73757374
}
7376-
if (!node.type) {
7377-
signature.resolvedReturnType = resolvingType;
7375+
if (!node.type && !signature.resolvedReturnType) {
73787376
let returnType = getReturnTypeFromBody(node, contextualMapper);
7379-
if (signature.resolvedReturnType === resolvingType) {
7377+
if (!signature.resolvedReturnType) {
73807378
signature.resolvedReturnType = returnType;
73817379
}
73827380
}

0 commit comments

Comments
 (0)