Removing 'resolvingType' special type

ahejlsberg · ahejlsberg · commit 41861670151e · 2015-05-03T15:05:10.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -88,7 +88,6 @@ module ts {
         let undefinedType = createIntrinsicType(TypeFlags.Undefined | TypeFlags.ContainsUndefinedOrNull, "undefined");
         let nullType = createIntrinsicType(TypeFlags.Null | TypeFlags.ContainsUndefinedOrNull, "null");
         let unknownType = createIntrinsicType(TypeFlags.Any, "unknown");
-        let resolvingType = createIntrinsicType(TypeFlags.Any, "__resolving__");
 
         let emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
         let anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
@@ -7373,10 +7372,9 @@ module ts {
                         if (isContextSensitive(node)) {
                             assignContextualParameterTypes(signature, contextualSignature, contextualMapper || identityMapper);
                         }
-                        if (!node.type) {
-                            signature.resolvedReturnType = resolvingType;
+                        if (!node.type && !signature.resolvedReturnType) {
                             let returnType = getReturnTypeFromBody(node, contextualMapper);
-                            if (signature.resolvedReturnType === resolvingType) {
+                            if (!signature.resolvedReturnType) {
                                 signature.resolvedReturnType = returnType;
                             }
                         }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ module ts {`
`88`	`88`	`let undefinedType = createIntrinsicType(TypeFlags.Undefined \| TypeFlags.ContainsUndefinedOrNull, "undefined");`
`89`	`89`	`let nullType = createIntrinsicType(TypeFlags.Null \| TypeFlags.ContainsUndefinedOrNull, "null");`
`90`	`90`	`let unknownType = createIntrinsicType(TypeFlags.Any, "unknown");`
`91`		`- let resolvingType = createIntrinsicType(TypeFlags.Any, "__resolving__");`
`92`	`91`
`93`	`92`	`let emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);`
`94`	`93`	`let anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);`
`@@ -7373,10 +7372,9 @@ module ts {`
`7373`	`7372`	`if (isContextSensitive(node)) {`
`7374`	`7373`	`assignContextualParameterTypes(signature, contextualSignature, contextualMapper \|\| identityMapper);`
`7375`	`7374`	`}`
`7376`		`- if (!node.type) {`
`7377`		`- signature.resolvedReturnType = resolvingType;`
	`7375`	`+ if (!node.type && !signature.resolvedReturnType) {`
`7378`	`7376`	`let returnType = getReturnTypeFromBody(node, contextualMapper);`
`7379`		`- if (signature.resolvedReturnType === resolvingType) {`
	`7377`	`+ if (!signature.resolvedReturnType) {`
`7380`	`7378`	`signature.resolvedReturnType = returnType;`
`7381`	`7379`	`}`
`7382`	`7380`	`}`