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

Fix type reference to merged prototype property assignment (#34764)

Browse source 
The constructor function code path in the return type checking of
signatures needs to pass the *merged* symbol of the declaration to
getDeclaredTypeOfClassOrInterface. Other callers of
getDeclaredTypeOfClassOrInterface do this, or used an already-merged
symbol.

Fixes #33993
This commit is contained in:
Nathan Shively-Sanders 2019-10-28 10:14:04 -07:00 committed by GitHub
parent eb0208c589
commit 080e41dc90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/checker.ts
View file

@ -13962,13 +13962,13 @@ namespace ts {
// If a signature resolution is already in-flight, skip issuing a circularity error
// here and just use the `any` type directly
const targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType
: target.declaration && isJSConstructor(target.declaration) ? getDeclaredTypeOfClassOrInterface(target.declaration.symbol)
: target.declaration && isJSConstructor(target.declaration) ? getDeclaredTypeOfClassOrInterface(getMergedSymbol(target.declaration.symbol))
: getReturnTypeOfSignature(target);
if (targetReturnType === voidType) {
return result;
}
const sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType
: source.declaration && isJSConstructor(source.declaration) ? getDeclaredTypeOfClassOrInterface(source.declaration.symbol)
: source.declaration && isJSConstructor(source.declaration) ? getDeclaredTypeOfClassOrInterface(getMergedSymbol(source.declaration.symbol))
: getReturnTypeOfSignature(source);
// The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions

20
tests/baselines/reference/prototypePropertyAssignmentMergedTypeReference.symbols Normal file
View file

@ -0,0 +1,20 @@
=== tests/cases/conformance/salsa/prototypePropertyAssignmentMergedTypeReference.js ===
// https://github.com/microsoft/TypeScript/issues/33993
var f = function() {
>f : Symbol(f, Decl(prototypePropertyAssignmentMergedTypeReference.js, 1, 3))
return 12;
};
f.prototype.a = "a";
>f.prototype : Symbol(f.a, Decl(prototypePropertyAssignmentMergedTypeReference.js, 3, 2))
>f : Symbol(f, Decl(prototypePropertyAssignmentMergedTypeReference.js, 1, 3))
>prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --))
>a : Symbol(f.a, Decl(prototypePropertyAssignmentMergedTypeReference.js, 3, 2))
/** @type {new () => f} */
var x = f;
>x : Symbol(x, Decl(prototypePropertyAssignmentMergedTypeReference.js, 8, 3))
>f : Symbol(f, Decl(prototypePropertyAssignmentMergedTypeReference.js, 1, 3))

26
tests/baselines/reference/prototypePropertyAssignmentMergedTypeReference.types Normal file
View file

@ -0,0 +1,26 @@
=== tests/cases/conformance/salsa/prototypePropertyAssignmentMergedTypeReference.js ===
// https://github.com/microsoft/TypeScript/issues/33993
var f = function() {
>f : typeof f
>function() { return 12;} : typeof f
return 12;
>12 : 12
};
f.prototype.a = "a";
>f.prototype.a = "a" : "a"
>f.prototype.a : any
>f.prototype : any
>f : typeof f
>prototype : any
>a : any
>"a" : "a"
/** @type {new () => f} */
var x = f;
>x : new () => f
>f : typeof f

14
tests/cases/conformance/salsa/prototypePropertyAssignmentMergedTypeReference.ts Normal file
View file

@ -0,0 +1,14 @@
// https://github.com/microsoft/TypeScript/issues/33993
// @noEmit: true
// @allowJs: true
// @checkJS: true
// @filename: prototypePropertyAssignmentMergedTypeReference.js
var f = function() {
return 12;
};
f.prototype.a = "a";
/** @type {new () => f} */
var x = f;