Skip to content

Commit 7367053

Browse files
committed
Fix name printing in signature help
1 parent 61d6663 commit 7367053

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/compiler/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ module ts {
923923
resolvedReturnType: Type; // Resolved return type
924924
minArgumentCount: number; // Number of non-optional parameters
925925
hasRestParameter: boolean; // True if last parameter is rest parameter
926-
hasStringLiterals: boolean; // True if instantiated
926+
hasStringLiterals: boolean; // True if specialized
927927
target?: Signature; // Instantiation target
928928
mapper?: TypeMapper; // Instantiation mapper
929929
erasedSignatureCache?: Signature; // Erased version of signature (deferred)

src/services/services.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3561,11 +3561,13 @@ module ts {
35613561
if (isOptional) {
35623562
display += "?";
35633563
}
3564-
display += ": " + typeInfoResolver.typeToString(typeInfoResolver.getTypeOfSymbol(p));
3564+
display += ": " + typeInfoResolver.typeToString(typeInfoResolver.getTypeOfSymbol(p), argumentListOrTypeArgumentList);
35653565
return new SignatureHelpParameter(p.name, "", display, isOptional);
35663566
});
3567-
var prefix = (candidateSignature.declaration.name.text || "") + "(";
3568-
var suffix = "): " + typeInfoResolver.typeToString(candidateSignature.getReturnType());
3567+
var callTarget = (<CallExpression>argumentListOrTypeArgumentList.parent).func;
3568+
var signatureName = typeInfoResolver.symbolToString(typeInfoResolver.getSymbolInfo(callTarget), /*enclosingDeclaration*/ undefined, /*meaning*/ undefined);
3569+
var prefix = signatureName + "(";
3570+
var suffix = "): " + typeInfoResolver.typeToString(candidateSignature.getReturnType(), argumentListOrTypeArgumentList);
35693571
return new SignatureHelpItem(candidateSignature.hasRestParameter, prefix, suffix, ", ", parameterHelpItems, "");
35703572
});
35713573
var selectedItemIndex = candidates.indexOf(bestSignature);

0 commit comments

Comments
 (0)