From c87615aba91f700a5faf9dfafd3125d564157533 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Wed, 24 Sep 2014 23:44:13 -0700 Subject: [PATCH 1/3] Switch signature help over to using display parts. This allows for classified sig help on the editor side. --- src/harness/fourslash.ts | 11 ++- src/services/services.ts | 26 ++++--- src/services/signatureHelp.ts | 67 ++++++++++++++----- .../signatureHelpSuperConstructorOverload.ts | 1 + 4 files changed, 77 insertions(+), 28 deletions(-) diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts index 0dfcb4ac513..649dc3d6d1a 100644 --- a/src/harness/fourslash.ts +++ b/src/harness/fourslash.ts @@ -820,7 +820,14 @@ module FourSlash { this.taoInvalidReason = 'verifyCurrentSignatureHelpIs NYI'; var help = this.getActiveSignatureHelpItem(); - assert.equal(help.prefix + help.parameters.map(p => p.display).join(help.separator) + help.suffix, expected); + assert.equal( + this.partsToString(help.prefixDisplayParts) + + help.parameters.map(p => this.partsToString(p.displayParts)).join(this.partsToString(help.separatorDisplayParts)) + + this.partsToString(help.suffixDisplayParts), expected); + } + + private partsToString(parts: ts.SymbolDisplayPart[]): string { + return parts.map(p => p.text).join(""); } public verifyCurrentParameterIsVariable(isVariable: boolean) { @@ -844,7 +851,7 @@ module FourSlash { var activeSignature = this.getActiveSignatureHelpItem(); var activeParameter = this.getActiveParameter(); - assert.equal(activeParameter.display, parameter); + assert.equal(this.partsToString(activeParameter.displayParts), parameter); } public verifyCurrentParameterHelpDocComment(docComment: string) { diff --git a/src/services/services.ts b/src/services/services.ts index a2595473252..524fefc961e 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -856,8 +856,8 @@ module ts { export class SignatureHelpParameter { constructor(public name: string, - public documentation: string, - public display: string, + public documentation: SymbolDisplayPart[], + public displayParts: SymbolDisplayPart[], public isOptional: boolean) { } } @@ -871,11 +871,11 @@ module ts { */ export class SignatureHelpItem { constructor(public isVariadic: boolean, - public prefix: string, - public suffix: string, - public separator: string, + public prefixDisplayParts: SymbolDisplayPart[], + public suffixDisplayParts: SymbolDisplayPart[], + public separatorDisplayParts: SymbolDisplayPart[], public parameters: SignatureHelpParameter[], - public documentation: string) { + public documentation: SymbolDisplayPart[]) { } } @@ -1630,6 +1630,11 @@ module ts { }); } + export function getSymbolDocumentationDisplayParts(symbol: Symbol): SymbolDisplayPart[] { + var documentation = symbol.getDocumentationComment(); + return documentation === "" ? [] : [new SymbolDisplayPart(documentation, SymbolDisplayPartKind.text, /*symbol:*/ null)]; + } + export function createLanguageService(host: LanguageServiceHost, documentRegistry: DocumentRegistry): LanguageService { var syntaxTreeCache: SyntaxTreeCache = new SyntaxTreeCache(host); var formattingRulesProvider: TypeScript.Services.Formatting.RulesProvider; @@ -2376,8 +2381,7 @@ module ts { return undefined; } - var documentation = symbol.getDocumentationComment(); - var documentationParts = documentation === "" ? [] : [new SymbolDisplayPart(documentation, SymbolDisplayPartKind.text, /*symbol:*/ null)]; + var documentationParts = getSymbolDocumentationDisplayParts(symbol); // Having all this logic here is pretty unclean. Consider moving to the roslyn model // where all symbol display logic is encapsulated into visitors and options. @@ -3731,9 +3735,9 @@ module ts { // Reset writer back to undefined to make sure that we produce an error message if CompilerHost.writeFile method is called when we are not in getEmitOutput writer = undefined; - return emitOutput; - } - + return emitOutput; + } + // Signature help /** * This is a semantic operation. diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index f129cabc00a..d8f8341a9f6 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -252,29 +252,66 @@ module ts.SignatureHelp { var items = map(candidates, candidateSignature => { var parameters = candidateSignature.parameters; var parameterHelpItems = parameters.length === 0 ? emptyArray : map(parameters, p => { - var display = p.name; + var displayParts: SymbolDisplayPart[] = []; + if (candidateSignature.hasRestParameter && parameters[parameters.length - 1] === p) { - display = "..." + display; + displayParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.DotDotDotToken), SymbolDisplayPartKind.punctuation, undefined)); } + + displayParts.push(new SymbolDisplayPart(p.name, SymbolDisplayPartKind.parameterName, p)); + var isOptional = !!(p.valueDeclaration.flags & NodeFlags.QuestionMark); if (isOptional) { - display += "?"; + displayParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.QuestionToken), SymbolDisplayPartKind.punctuation, undefined)); } - display += ": " + typeInfoResolver.typeToString(typeInfoResolver.getTypeOfSymbol(p), argumentListOrTypeArgumentList); - return new SignatureHelpParameter(p.name, "", display, isOptional); + + displayParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.ColonToken), SymbolDisplayPartKind.punctuation, undefined)); + displayParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + + var typeParts = typeInfoResolver.typeToDisplayParts(typeInfoResolver.getTypeOfSymbol(p), argumentListOrTypeArgumentList); + displayParts.push.apply(displayParts, typeParts); + + return new SignatureHelpParameter(p.name, getSymbolDocumentationDisplayParts(p), displayParts, isOptional); }); + var callTargetNode = (argumentListOrTypeArgumentList.parent).func; var callTargetSymbol = typeInfoResolver.getSymbolInfo(callTargetNode); - var signatureName = callTargetSymbol ? typeInfoResolver.symbolToString(callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined) : ""; - var prefix = signatureName; + + var prefixParts = callTargetSymbol ? typeInfoResolver.symbolToDisplayParts(callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined) : []; + + var separatorParts = [ + new SymbolDisplayPart(tokenToString(SyntaxKind.CommaToken), SymbolDisplayPartKind.punctuation, undefined), + new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined) + ]; + // TODO(jfreeman): Constraints? if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) { - prefix += "<" + map(candidateSignature.typeParameters, tp => tp.symbol.name).join(", ") + ">"; + prefixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.LessThanToken), SymbolDisplayPartKind.punctuation, undefined)); + + for (var i = 0, n = candidateSignature.typeParameters.length; i < n; i++) { + if (i) { + prefixParts.push.apply(prefixParts, separatorParts); + } + + var tp = candidateSignature.typeParameters[i].symbol; + prefixParts.push(new SymbolDisplayPart(tp.name, SymbolDisplayPartKind.typeParameterName, tp)); + } + + prefixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.GreaterThanToken), SymbolDisplayPartKind.punctuation, undefined)); } - prefix += "("; - var suffix = "): " + typeInfoResolver.typeToString(candidateSignature.getReturnType(), argumentListOrTypeArgumentList); - return new SignatureHelpItem(candidateSignature.hasRestParameter, prefix, suffix, ", ", parameterHelpItems, ""); + + prefixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.OpenParenToken), SymbolDisplayPartKind.punctuation, undefined)); + + var suffixParts = [new SymbolDisplayPart(tokenToString(SyntaxKind.CloseParenToken), SymbolDisplayPartKind.punctuation, undefined)]; + suffixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.ColonToken), SymbolDisplayPartKind.punctuation, undefined)); + suffixParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + + var typeParts = typeInfoResolver.typeToDisplayParts(candidateSignature.getReturnType(), argumentListOrTypeArgumentList); + suffixParts.push.apply(suffixParts, typeParts); + + return new SignatureHelpItem(candidateSignature.hasRestParameter, prefixParts, suffixParts, separatorParts, parameterHelpItems, null); }); + var selectedItemIndex = candidates.indexOf(bestSignature); if (selectedItemIndex < 0) { selectedItemIndex = 0; @@ -339,11 +376,11 @@ module ts.SignatureHelp { // by 2 to exclude commas. Use bit shifting in order to take the floor of the division. var argumentIndex = indexOfNodeContainingPosition < 0 ? argumentCount - 1 : indexOfNodeContainingPosition >> 1; return new SignatureHelpState(argumentIndex, argumentCount); - } - - function getChildListThatStartsWithOpenerToken(parent: Node, openerToken: Node, sourceFile: SourceFile): Node { + } + + function getChildListThatStartsWithOpenerToken(parent: Node, openerToken: Node, sourceFile: SourceFile): Node { var children = parent.getChildren(sourceFile); var indexOfOpenerToken = children.indexOf(openerToken); - return children[indexOfOpenerToken + 1]; + return children[indexOfOpenerToken + 1]; } } \ No newline at end of file diff --git a/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts b/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts index 1be8c3202a1..28c47c051f9 100644 --- a/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts +++ b/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts @@ -17,6 +17,7 @@ //// } ////} +debugger; goTo.marker('superOverload1'); verify.signatureHelpCountIs(2); verify.currentSignatureHelpIs("SuperOverloadlBase(): SuperOverloadlBase"); From cc3ee730690366df96a7972262ec452023c9fe73 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Thu, 25 Sep 2014 14:11:41 -0700 Subject: [PATCH 2/3] Remove debugger statement. --- tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts b/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts index 28c47c051f9..1be8c3202a1 100644 --- a/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts +++ b/tests/cases/fourslash/signatureHelpSuperConstructorOverload.ts @@ -17,7 +17,6 @@ //// } ////} -debugger; goTo.marker('superOverload1'); verify.signatureHelpCountIs(2); verify.currentSignatureHelpIs("SuperOverloadlBase(): SuperOverloadlBase"); From b91dfc2cfcc0f69811402d98531d0d951a535bf3 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Thu, 25 Sep 2014 14:57:29 -0700 Subject: [PATCH 3/3] Provide helpers for creating symbol display parts. --- src/compiler/checker.ts | 70 +++++++++++++++++++++++------------ src/services/services.ts | 38 +++++++++---------- src/services/signatureHelp.ts | 29 +++++++-------- 3 files changed, 79 insertions(+), 58 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 1ec86615949..cf35c1c02f5 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -925,38 +925,17 @@ module ts { var displayPartWriters: DisplayPartsSymbolWriter[] = []; var stringWriters: StringSymbolWriter[] = []; - function displayPartKind(symbol: Symbol): SymbolDisplayPartKind { - var flags = symbol.flags; - - if (flags & SymbolFlags.Variable) { - return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === SyntaxKind.Parameter - ? SymbolDisplayPartKind.parameterName - : SymbolDisplayPartKind.localName; - } - else if (flags & SymbolFlags.Property) { return SymbolDisplayPartKind.propertyName; } - else if (flags & SymbolFlags.EnumMember) { return SymbolDisplayPartKind.enumMemberName; } - else if (flags & SymbolFlags.Function) { return SymbolDisplayPartKind.functionName; } - else if (flags & SymbolFlags.Class) { return SymbolDisplayPartKind.className; } - else if (flags & SymbolFlags.Interface) { return SymbolDisplayPartKind.interfaceName; } - else if (flags & SymbolFlags.Enum) { return SymbolDisplayPartKind.enumName; } - else if (flags & SymbolFlags.Module) { return SymbolDisplayPartKind.moduleName; } - else if (flags & SymbolFlags.Method) { return SymbolDisplayPartKind.methodName; } - else if (flags & SymbolFlags.TypeParameter) { return SymbolDisplayPartKind.typeParameterName; } - - return SymbolDisplayPartKind.text; - } - function getDisplayPartWriter(): DisplayPartsSymbolWriter { if (displayPartWriters.length == 0) { var displayParts: SymbolDisplayPart[] = []; return { displayParts: () => displayParts, writeKind: (text, kind) => displayParts.push(new SymbolDisplayPart(text, kind, undefined)), - writeSymbol: (text, symbol) => displayParts.push(new SymbolDisplayPart(text, displayPartKind(symbol), symbol)), + writeSymbol: (text, symbol) => displayParts.push(symbolPart(text, symbol)), // Completely ignore indentation for display part writers. And map newlines to // a single space. - writeLine: () => displayParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)), + writeLine: () => displayParts.push(spacePart()), increaseIndent: () => { }, decreaseIndent: () => { }, clear: () => displayParts = [], @@ -7693,4 +7672,49 @@ module ts { return checker; } + + export function spacePart() { + return new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined); + } + + export function keywordPart(kind: SyntaxKind) { + return new SymbolDisplayPart(tokenToString(kind), SymbolDisplayPartKind.keyword, undefined); + } + + export function punctuationPart(kind: SyntaxKind) { + return new SymbolDisplayPart(tokenToString(kind), SymbolDisplayPartKind.punctuation, undefined); + } + + export function operatorPart(kind: SyntaxKind) { + return new SymbolDisplayPart(tokenToString(kind), SymbolDisplayPartKind.operator, undefined); + } + + export function textPart(text: string) { + return new SymbolDisplayPart(text, SymbolDisplayPartKind.text, undefined); + } + + export function symbolPart(text: string, symbol: Symbol) { + return new SymbolDisplayPart(text, displayPartKind(symbol), symbol) + } + + function displayPartKind(symbol: Symbol): SymbolDisplayPartKind { + var flags = symbol.flags; + + if (flags & SymbolFlags.Variable) { + return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === SyntaxKind.Parameter + ? SymbolDisplayPartKind.parameterName + : SymbolDisplayPartKind.localName; + } + else if (flags & SymbolFlags.Property) { return SymbolDisplayPartKind.propertyName; } + else if (flags & SymbolFlags.EnumMember) { return SymbolDisplayPartKind.enumMemberName; } + else if (flags & SymbolFlags.Function) { return SymbolDisplayPartKind.functionName; } + else if (flags & SymbolFlags.Class) { return SymbolDisplayPartKind.className; } + else if (flags & SymbolFlags.Interface) { return SymbolDisplayPartKind.interfaceName; } + else if (flags & SymbolFlags.Enum) { return SymbolDisplayPartKind.enumName; } + else if (flags & SymbolFlags.Module) { return SymbolDisplayPartKind.moduleName; } + else if (flags & SymbolFlags.Method) { return SymbolDisplayPartKind.methodName; } + else if (flags & SymbolFlags.TypeParameter) { return SymbolDisplayPartKind.typeParameterName; } + + return SymbolDisplayPartKind.text; + } } diff --git a/src/services/services.ts b/src/services/services.ts index ee7e7f56e18..7d11d9ab32d 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -2384,34 +2384,34 @@ module ts { var totalParts: SymbolDisplayPart[] = []; if (symbol.flags & SymbolFlags.Class) { - totalParts.push(new SymbolDisplayPart("class", SymbolDisplayPartKind.keyword, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(keywordPart(SyntaxKind.ClassKeyword)); + totalParts.push(spacePart()); totalParts.push.apply(totalParts, typeInfoResolver.symbolToDisplayParts(symbol, sourceFile)); } else if (symbol.flags & SymbolFlags.Interface) { - totalParts.push(new SymbolDisplayPart("interface", SymbolDisplayPartKind.keyword, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(keywordPart(SyntaxKind.InterfaceKeyword)); + totalParts.push(spacePart()); totalParts.push.apply(totalParts, typeInfoResolver.symbolToDisplayParts(symbol, sourceFile)); } else if (symbol.flags & SymbolFlags.Enum) { - totalParts.push(new SymbolDisplayPart("enum", SymbolDisplayPartKind.keyword, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(keywordPart(SyntaxKind.EnumKeyword)); + totalParts.push(spacePart()); totalParts.push.apply(totalParts, typeInfoResolver.symbolToDisplayParts(symbol, sourceFile)); } else if (symbol.flags & SymbolFlags.Module) { - totalParts.push(new SymbolDisplayPart("module", SymbolDisplayPartKind.keyword, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(keywordPart(SyntaxKind.ModuleKeyword)); + totalParts.push(spacePart()); totalParts.push.apply(totalParts, typeInfoResolver.symbolToDisplayParts(symbol, sourceFile)); } else if (symbol.flags & SymbolFlags.TypeParameter) { - totalParts.push(new SymbolDisplayPart("(", SymbolDisplayPartKind.punctuation, undefined)); + totalParts.push(punctuationPart(SyntaxKind.OpenParenToken)); totalParts.push(new SymbolDisplayPart("type parameter", SymbolDisplayPartKind.text, undefined)); - totalParts.push(new SymbolDisplayPart(")", SymbolDisplayPartKind.punctuation, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(punctuationPart(SyntaxKind.CloseParenToken)); + totalParts.push(spacePart()); totalParts.push.apply(totalParts, typeInfoResolver.symbolToDisplayParts(symbol)); } else { - totalParts.push(new SymbolDisplayPart("(", SymbolDisplayPartKind.punctuation, undefined)); + totalParts.push(punctuationPart(SyntaxKind.OpenParenToken)); var text: string; if (symbol.flags & SymbolFlags.Property) { text = "property" } @@ -2425,8 +2425,8 @@ module ts { } totalParts.push(new SymbolDisplayPart(text, SymbolDisplayPartKind.text, undefined)); - totalParts.push(new SymbolDisplayPart(")", SymbolDisplayPartKind.punctuation, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(punctuationPart(SyntaxKind.CloseParenToken)); + totalParts.push(spacePart()); totalParts.push.apply(totalParts, typeInfoResolver.symbolToDisplayParts(symbol, getContainerNode(node))); @@ -2436,8 +2436,8 @@ module ts { symbol.flags & SymbolFlags.Variable) { if (type) { - totalParts.push(new SymbolDisplayPart(":", SymbolDisplayPartKind.punctuation, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(punctuationPart(SyntaxKind.ColonToken)); + totalParts.push(spacePart()); totalParts.push.apply(totalParts, typeInfoResolver.typeToDisplayParts(type, getContainerNode(node))); } } @@ -2452,9 +2452,9 @@ module ts { if (declaration.kind === SyntaxKind.EnumMember) { var constantValue = typeInfoResolver.getEnumMemberValue(declaration); if (constantValue !== undefined) { - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); - totalParts.push(new SymbolDisplayPart("=", SymbolDisplayPartKind.operator, undefined)); - totalParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + totalParts.push(spacePart()); + totalParts.push(operatorPart(SyntaxKind.EqualsToken)); + totalParts.push(spacePart()); totalParts.push(new SymbolDisplayPart(constantValue.toString(), SymbolDisplayPartKind.numericLiteral, undefined)); } } diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts index 75abca77243..4a02c99204d 100644 --- a/src/services/signatureHelp.ts +++ b/src/services/signatureHelp.ts @@ -255,18 +255,18 @@ module ts.SignatureHelp { var displayParts: SymbolDisplayPart[] = []; if (candidateSignature.hasRestParameter && parameters[parameters.length - 1] === p) { - displayParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.DotDotDotToken), SymbolDisplayPartKind.punctuation, undefined)); + displayParts.push(punctuationPart(SyntaxKind.DotDotDotToken)); } - displayParts.push(new SymbolDisplayPart(p.name, SymbolDisplayPartKind.parameterName, p)); + displayParts.push(symbolPart(p.name, p)); var isOptional = !!(p.valueDeclaration.flags & NodeFlags.QuestionMark); if (isOptional) { - displayParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.QuestionToken), SymbolDisplayPartKind.punctuation, undefined)); + displayParts.push(punctuationPart(SyntaxKind.QuestionToken)); } - displayParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.ColonToken), SymbolDisplayPartKind.punctuation, undefined)); - displayParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + displayParts.push(punctuationPart(SyntaxKind.ColonToken)); + displayParts.push(spacePart()); var typeParts = typeInfoResolver.typeToDisplayParts(typeInfoResolver.getTypeOfSymbol(p), argumentListOrTypeArgumentList); displayParts.push.apply(displayParts, typeParts); @@ -284,14 +284,11 @@ module ts.SignatureHelp { var prefixParts = callTargetSymbol ? typeInfoResolver.symbolToDisplayParts(callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined) : []; - var separatorParts = [ - new SymbolDisplayPart(tokenToString(SyntaxKind.CommaToken), SymbolDisplayPartKind.punctuation, undefined), - new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined) - ]; + var separatorParts = [punctuationPart(SyntaxKind.CommaToken), spacePart()]; // TODO(jfreeman): Constraints? if (candidateSignature.typeParameters && candidateSignature.typeParameters.length) { - prefixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.LessThanToken), SymbolDisplayPartKind.punctuation, undefined)); + prefixParts.push(punctuationPart(SyntaxKind.LessThanToken)); for (var i = 0, n = candidateSignature.typeParameters.length; i < n; i++) { if (i) { @@ -299,17 +296,17 @@ module ts.SignatureHelp { } var tp = candidateSignature.typeParameters[i].symbol; - prefixParts.push(new SymbolDisplayPart(tp.name, SymbolDisplayPartKind.typeParameterName, tp)); + prefixParts.push(symbolPart(tp.name, tp)); } - prefixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.GreaterThanToken), SymbolDisplayPartKind.punctuation, undefined)); + prefixParts.push(punctuationPart(SyntaxKind.GreaterThanToken)); } - prefixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.OpenParenToken), SymbolDisplayPartKind.punctuation, undefined)); + prefixParts.push(punctuationPart(SyntaxKind.OpenParenToken)); - var suffixParts = [new SymbolDisplayPart(tokenToString(SyntaxKind.CloseParenToken), SymbolDisplayPartKind.punctuation, undefined)]; - suffixParts.push(new SymbolDisplayPart(tokenToString(SyntaxKind.ColonToken), SymbolDisplayPartKind.punctuation, undefined)); - suffixParts.push(new SymbolDisplayPart(" ", SymbolDisplayPartKind.space, undefined)); + var suffixParts = [punctuationPart(SyntaxKind.CloseParenToken)]; + suffixParts.push(punctuationPart(SyntaxKind.ColonToken)); + suffixParts.push(spacePart()); var typeParts = typeInfoResolver.typeToDisplayParts(candidateSignature.getReturnType(), argumentListOrTypeArgumentList); suffixParts.push.apply(suffixParts, typeParts);