Merge pull request microsoft#11427 from Microsoft/implictAnySelfRef

sheetalkamat · web-flow · commit 3212e25a3ab0 · 2016-10-06T13:18:41.000-07:00
Do not get return type from contextual signature if we are already in process of getting return type of it
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -12771,7 +12771,10 @@ namespace ts {
             if (!contextualSignature) {
                 reportErrorsFromWidening(func, type);
             }
-            if (isUnitType(type) && !(contextualSignature && isLiteralContextualType(getReturnTypeOfSignature(contextualSignature)))) {
+            if (isUnitType(type) &&
+                !(contextualSignature &&
+                    isLiteralContextualType(
+                        contextualSignature === getSignatureFromDeclaration(func) ? type : getReturnTypeOfSignature(contextualSignature)))) {
                 type = getWidenedLiteralType(type);
             }
 
diff --git a/tests/baselines/reference/selfReference.js b/tests/baselines/reference/selfReference.js
@@ -0,0 +1,6 @@
+//// [selfReference.ts]
+declare function asFunction<T>(value: T): () => T;
+asFunction(() => { return 1; });
+
+//// [selfReference.js]
+asFunction(function () { return 1; });
diff --git a/tests/baselines/reference/selfReference.symbols b/tests/baselines/reference/selfReference.symbols
@@ -0,0 +1,11 @@
+=== tests/cases/compiler/selfReference.ts ===
+declare function asFunction<T>(value: T): () => T;
+>asFunction : Symbol(asFunction, Decl(selfReference.ts, 0, 0))
+>T : Symbol(T, Decl(selfReference.ts, 0, 28))
+>value : Symbol(value, Decl(selfReference.ts, 0, 31))
+>T : Symbol(T, Decl(selfReference.ts, 0, 28))
+>T : Symbol(T, Decl(selfReference.ts, 0, 28))
+
+asFunction(() => { return 1; });
+>asFunction : Symbol(asFunction, Decl(selfReference.ts, 0, 0))
+
diff --git a/tests/baselines/reference/selfReference.types b/tests/baselines/reference/selfReference.types
@@ -0,0 +1,14 @@
+=== tests/cases/compiler/selfReference.ts ===
+declare function asFunction<T>(value: T): () => T;
+>asFunction : <T>(value: T) => () => T
+>T : T
+>value : T
+>T : T
+>T : T
+
+asFunction(() => { return 1; });
+>asFunction(() => { return 1; }) : () => () => 1
+>asFunction : <T>(value: T) => () => T
+>() => { return 1; } : () => 1
+>1 : 1
+
diff --git a/tests/cases/compiler/selfReference.ts b/tests/cases/compiler/selfReference.ts
@@ -0,0 +1,3 @@
+// @noImplicitAny: true
+declare function asFunction<T>(value: T): () => T;
+asFunction(() => { return 1; });

Original file line number	Diff line number	Diff line change
`@@ -12771,7 +12771,10 @@ namespace ts {`
`12771`	`12771`	`if (!contextualSignature) {`
`12772`	`12772`	`reportErrorsFromWidening(func, type);`
`12773`	`12773`	`}`
`12774`		`- if (isUnitType(type) && !(contextualSignature && isLiteralContextualType(getReturnTypeOfSignature(contextualSignature)))) {`
	`12774`	`+ if (isUnitType(type) &&`
	`12775`	`+ !(contextualSignature &&`
	`12776`	`+ isLiteralContextualType(`
	`12777`	`+ contextualSignature === getSignatureFromDeclaration(func) ? type : getReturnTypeOfSignature(contextualSignature)))) {`
`12775`	`12778`	`type = getWidenedLiteralType(type);`
`12776`	`12779`	`}`
`12777`	`12780`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// @noImplicitAny: true`
	`2`	`+declare function asFunction<T>(value: T): () => T;`
	`3`	`+asFunction(() => { return 1; });`