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

Ensure type parameters are erased in contextual signature from @type tag

Browse source
This commit is contained in:
Anders Hejlsberg 2018-08-04 11:30:20 -07:00
parent 539775779e
commit ee721225ae
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/compiler/checker.ts
View file

@ -7565,10 +7565,15 @@ namespace ts {
return true;
}
function getReturnTypeOfTypeTag(node: SignatureDeclaration | JSDocSignature) {
function getSignatureOfTypeTag(node: SignatureDeclaration | JSDocSignature) {
const typeTag = isInJavaScriptFile(node) ? getJSDocTypeTag(node) : undefined;
const signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
return signature && getReturnTypeOfSignature(getErasedSignature(signature));
return signature && getErasedSignature(signature);
}
function getReturnTypeOfTypeTag(node: SignatureDeclaration | JSDocSignature) {
const signature = getSignatureOfTypeTag(node);
return signature && getReturnTypeOfSignature(signature);
}
function containsArgumentsReference(declaration: SignatureDeclaration): boolean {
@ -16389,16 +16394,11 @@ namespace ts {
// union type of return types from these signatures
function getContextualSignature(node: FunctionExpression | ArrowFunction | MethodDeclaration): Signature | undefined {
Debug.assert(node.kind !== SyntaxKind.MethodDeclaration || isObjectLiteralMethod(node));
let type: Type | undefined;
if (isInJavaScriptFile(node)) {
const jsdoc = getJSDocType(node);
if (jsdoc) {
type = getTypeFromTypeNode(jsdoc);
}
}
if (!type) {
type = getContextualTypeForFunctionLikeDeclaration(node);
const typeTagSignature = getSignatureOfTypeTag(node);
if (typeTagSignature) {
return typeTagSignature;
}
const type = getContextualTypeForFunctionLikeDeclaration(node);
if (!type) {
return undefined;
}