Skip to content

Commit 91af0ce

Browse files
gabrittogabritto
committed
Reapply "Proposed expandable hover API" (#61132)
This reverts commit 34ea32f.
1 parent 1efdcd9 commit 91af0ce

30 files changed

+8169
-57
lines changed

‎src/compiler/checker.ts

Lines changed: 105 additions & 32 deletions
Large diffs are not rendered by default.

‎src/compiler/types.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5048,6 +5048,11 @@ export interface TypeCheckerHost extends ModuleSpecifierResolutionHost, SourceFi
50485048
packageBundlesTypes(packageName: string): boolean;
50495049
}
50505050

5051+
/** @internal */
5052+
export interface WriterContextOut {
5053+
couldUnfoldMore: boolean;
5054+
}
5055+
50515056
export interface TypeChecker {
50525057
getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
50535058
getTypeOfSymbol(symbol: Symbol): Type;
@@ -5134,6 +5139,7 @@ export interface TypeChecker {
51345139
symbolToParameterDeclaration(symbol: Symbol, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): ParameterDeclaration | undefined;
51355140
/** Note that the resulting nodes cannot be checked. */
51365141
typeParameterToDeclaration(parameter: TypeParameter, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): TypeParameterDeclaration | undefined;
5142+
/** @internal */ typeParameterToDeclaration(parameter: TypeParameter, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker, verbosityLevel?: number): TypeParameterDeclaration | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
51375143

51385144
getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
51395145
getSymbolAtLocation(node: Node): Symbol | undefined;
@@ -5166,7 +5172,7 @@ export interface TypeChecker {
51665172
typePredicateToString(predicate: TypePredicate, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
51675173

51685174
/** @internal */ writeSignature(signature: Signature, enclosingDeclaration?: Node, flags?: TypeFormatFlags, kind?: SignatureKind, writer?: EmitTextWriter): string;
5169-
/** @internal */ writeType(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags, writer?: EmitTextWriter): string;
5175+
/** @internal */ writeType(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags, writer?: EmitTextWriter, verbosityLevel?: number, out?: WriterContextOut): string;
51705176
/** @internal */ writeSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags, writer?: EmitTextWriter): string;
51715177
/** @internal */ writeTypePredicate(predicate: TypePredicate, enclosingDeclaration?: Node, flags?: TypeFormatFlags, writer?: EmitTextWriter): string;
51725178

‎src/harness/client.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@ export class SessionClient implements LanguageService {
254254
return { line, character: offset };
255255
}
256256

257-
getQuickInfoAtPosition(fileName: string, position: number): QuickInfo {
258-
const args = this.createFileLocationRequestArgs(fileName, position);
257+
getQuickInfoAtPosition(fileName: string, position: number, verbosityLevel?: number | undefined): QuickInfo {
258+
const args = { ...this.createFileLocationRequestArgs(fileName, position), verbosityLevel };
259259

260260
const request = this.processRequest<protocol.QuickInfoRequest>(protocol.CommandTypes.Quickinfo, args);
261261
const response = this.processResponse<protocol.QuickInfoResponse>(request);
@@ -268,6 +268,7 @@ export class SessionClient implements LanguageService {
268268
displayParts: [{ kind: "text", text: body.displayString }],
269269
documentation: typeof body.documentation === "string" ? [{ kind: "text", text: body.documentation }] : body.documentation,
270270
tags: this.decodeLinkDisplayParts(body.tags),
271+
canIncreaseVerbosityLevel: body.canIncreaseVerbosityLevel,
271272
};
272273
}
273274

‎src/harness/fourslashImpl.ts

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ export interface TextSpan {
8686
end: number;
8787
}
8888

89+
export interface VerbosityLevels {
90+
[markerName: string]: number | number[] | undefined;
91+
}
92+
8993
// Name of testcase metadata including ts.CompilerOptions properties that will be used by globalOptions
9094
// To add additional option, add property into the testOptMetadataNames, refer the property in either globalMetadataNames or fileMetadataNames
9195
// Add cases into convertGlobalOptionsToCompilationsSettings function for the compiler to acknowledge such option from meta data
@@ -2451,19 +2455,28 @@ export class TestState {
24512455
return result;
24522456
}
24532457

2454-
public baselineQuickInfo(): void {
2455-
const result = ts.arrayFrom(this.testData.markerPositions.entries(), ([name, marker]) => ({
2456-
marker: { ...marker, name },
2457-
item: this.languageService.getQuickInfoAtPosition(marker.fileName, marker.position),
2458-
}));
2458+
public baselineQuickInfo(verbosityLevels?: VerbosityLevels): void {
2459+
const result = ts.arrayFrom(this.testData.markerPositions.entries(), ([name, marker]) => {
2460+
const verbosityLevel = toArray(verbosityLevels?.[name]);
2461+
const items = verbosityLevel.map(verbosityLevel => {
2462+
const item: ts.QuickInfo & { verbosityLevel?: number; } | undefined = this.languageService.getQuickInfoAtPosition(marker.fileName, marker.position, verbosityLevel);
2463+
if (item) item.verbosityLevel = verbosityLevel;
2464+
return {
2465+
marker: { ...marker, name },
2466+
item,
2467+
};
2468+
});
2469+
return items;
2470+
}).flat();
24592471
const annotations = this.annotateContentWithTooltips(
24602472
result,
24612473
"quickinfo",
24622474
item => item.textSpan,
2463-
({ displayParts, documentation, tags }) => [
2475+
({ displayParts, documentation, tags, verbosityLevel }) => [
24642476
...(displayParts ? displayParts.map(p => p.text).join("").split("\n") : []),
24652477
...(documentation?.length ? documentation.map(p => p.text).join("").split("\n") : []),
24662478
...(tags?.length ? tags.map(p => `@${p.name} ${p.text?.map(dp => dp.text).join("") ?? ""}`).join("\n").split("\n") : []),
2479+
...(verbosityLevel !== undefined ? [`(verbosity level: ${verbosityLevel})`] : []),
24672480
],
24682481
);
24692482
this.baseline("QuickInfo", annotations + "\n\n" + stringify(result));

‎src/harness/fourslashInterfaceImpl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ export class Verify extends VerifyNegatable {
449449
this.state.baselineGetEmitOutput();
450450
}
451451

452-
public baselineQuickInfo(): void {
453-
this.state.baselineQuickInfo();
452+
public baselineQuickInfo(verbosityLevels?: FourSlash.VerbosityLevels): void {
453+
this.state.baselineQuickInfo(verbosityLevels);
454454
}
455455

456456
public baselineSignatureHelp(): void {

‎src/server/protocol.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2005,6 +2005,11 @@ export interface QuickInfoRequest extends FileLocationRequest {
20052005
arguments: FileLocationRequestArgs;
20062006
}
20072007

2008+
export interface QuickInfoRequestArgs extends FileLocationRequestArgs {
2009+
/** TODO */
2010+
verbosityLevel?: number;
2011+
}
2012+
20082013
/**
20092014
* Body of QuickInfoResponse.
20102015
*/
@@ -2044,6 +2049,11 @@ export interface QuickInfoResponseBody {
20442049
* JSDoc tags associated with symbol.
20452050
*/
20462051
tags: JSDocTagInfo[];
2052+
2053+
/**
2054+
* TODO
2055+
*/
2056+
canIncreaseVerbosityLevel?: boolean;
20472057
}
20482058

20492059
/**

‎src/server/session.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,10 +2392,10 @@ export class Session<TMessage = string> implements EventSender {
23922392
return languageService.isValidBraceCompletionAtPosition(file, position, args.openingBrace.charCodeAt(0));
23932393
}
23942394

2395-
private getQuickInfoWorker(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.QuickInfoResponseBody | QuickInfo | undefined {
2395+
private getQuickInfoWorker(args: protocol.QuickInfoRequestArgs, simplifiedResult: boolean): protocol.QuickInfoResponseBody | QuickInfo | undefined {
23962396
const { file, project } = this.getFileAndProject(args);
23972397
const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!;
2398-
const quickInfo = project.getLanguageService().getQuickInfoAtPosition(file, this.getPosition(args, scriptInfo));
2398+
const quickInfo = project.getLanguageService().getQuickInfoAtPosition(file, this.getPosition(args, scriptInfo), args.verbosityLevel);
23992399
if (!quickInfo) {
24002400
return undefined;
24012401
}
@@ -2411,6 +2411,7 @@ export class Session<TMessage = string> implements EventSender {
24112411
displayString,
24122412
documentation: useDisplayParts ? this.mapDisplayParts(quickInfo.documentation, project) : displayPartsToString(quickInfo.documentation),
24132413
tags: this.mapJSDocTagInfo(quickInfo.tags, project, useDisplayParts),
2414+
canIncreaseVerbosityLevel: quickInfo.canIncreaseVerbosityLevel,
24142415
};
24152416
}
24162417
else {

‎src/services/services.ts

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,7 +2274,7 @@ export function createLanguageService(
22742274
return Completions.getCompletionEntrySymbol(program, log, getValidSourceFile(fileName), position, { name, source }, host, preferences);
22752275
}
22762276

2277-
function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined {
2277+
function getQuickInfoAtPosition(fileName: string, position: number, verbosityLevel?: number): QuickInfo | undefined {
22782278
synchronizeHostData();
22792279

22802280
const sourceFile = getValidSourceFile(fileName);
@@ -2293,20 +2293,34 @@ export function createLanguageService(
22932293
kind: ScriptElementKind.unknown,
22942294
kindModifiers: ScriptElementKindModifier.none,
22952295
textSpan: createTextSpanFromNode(nodeForQuickInfo, sourceFile),
2296-
displayParts: typeChecker.runWithCancellationToken(cancellationToken, typeChecker => typeToDisplayParts(typeChecker, type, getContainerNode(nodeForQuickInfo))),
2296+
displayParts: typeChecker.runWithCancellationToken(cancellationToken, typeChecker => typeToDisplayParts(typeChecker, type, getContainerNode(nodeForQuickInfo), /*flags*/ undefined, verbosityLevel)),
22972297
documentation: type.symbol ? type.symbol.getDocumentationComment(typeChecker) : undefined,
22982298
tags: type.symbol ? type.symbol.getJsDocTags(typeChecker) : undefined,
22992299
};
23002300
}
23012301

2302-
const { symbolKind, displayParts, documentation, tags } = typeChecker.runWithCancellationToken(cancellationToken, typeChecker => SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, getContainerNode(nodeForQuickInfo), nodeForQuickInfo));
2302+
const { symbolKind, displayParts, documentation, tags, canIncreaseVerbosityLevel } = typeChecker.runWithCancellationToken(
2303+
cancellationToken,
2304+
typeChecker =>
2305+
SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(
2306+
typeChecker,
2307+
symbol,
2308+
sourceFile,
2309+
getContainerNode(nodeForQuickInfo),
2310+
nodeForQuickInfo,
2311+
/*semanticMeaning*/ undefined,
2312+
/*alias*/ undefined,
2313+
verbosityLevel,
2314+
),
2315+
);
23032316
return {
23042317
kind: symbolKind,
23052318
kindModifiers: SymbolDisplay.getSymbolModifiers(typeChecker, symbol),
23062319
textSpan: createTextSpanFromNode(nodeForQuickInfo, sourceFile),
23072320
displayParts,
23082321
documentation,
23092322
tags,
2323+
canIncreaseVerbosityLevel,
23102324
};
23112325
}
23122326

‎src/services/symbolDisplay.ts

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ import {
108108
TypeParameter,
109109
typeToDisplayParts,
110110
VariableDeclaration,
111+
WriterContextOut,
111112
} from "./_namespaces/ts.js";
112113

113114
const symbolDisplayNodeBuilderFlags = NodeBuilderFlags.OmitParameterModifiers | NodeBuilderFlags.IgnoreErrors | NodeBuilderFlags.UseAliasDefinedOutsideCurrentScope;
@@ -254,9 +255,20 @@ export interface SymbolDisplayPartsDocumentationAndSymbolKind {
254255
documentation: SymbolDisplayPart[];
255256
symbolKind: ScriptElementKind;
256257
tags: JSDocTagInfo[] | undefined;
258+
canIncreaseVerbosityLevel?: boolean;
257259
}
258260

259-
function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker: TypeChecker, symbol: Symbol, sourceFile: SourceFile, enclosingDeclaration: Node | undefined, location: Node, type: Type | undefined, semanticMeaning: SemanticMeaning, alias?: Symbol): SymbolDisplayPartsDocumentationAndSymbolKind {
261+
function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(
262+
typeChecker: TypeChecker,
263+
symbol: Symbol,
264+
sourceFile: SourceFile,
265+
enclosingDeclaration: Node | undefined,
266+
location: Node,
267+
type: Type | undefined,
268+
semanticMeaning: SemanticMeaning,
269+
alias?: Symbol,
270+
verbosityLevel?: number,
271+
): SymbolDisplayPartsDocumentationAndSymbolKind {
260272
const displayParts: SymbolDisplayPart[] = [];
261273
let documentation: SymbolDisplayPart[] = [];
262274
let tags: JSDocTagInfo[] = [];
@@ -267,6 +279,7 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker: Type
267279
let documentationFromAlias: SymbolDisplayPart[] | undefined;
268280
let tagsFromAlias: JSDocTagInfo[] | undefined;
269281
let hasMultipleSignatures = false;
282+
const typeWriterOut: WriterContextOut | undefined = verbosityLevel !== undefined ? { couldUnfoldMore: false } : undefined;
270283

271284
if (location.kind === SyntaxKind.ThisKeyword && !isThisExpression) {
272285
return { displayParts: [keywordPart(SyntaxKind.ThisKeyword)], documentation: [], symbolKind: ScriptElementKind.primitiveType, tags: undefined };
@@ -462,7 +475,17 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker: Type
462475
displayParts.push(spacePart());
463476
displayParts.push(operatorPart(SyntaxKind.EqualsToken));
464477
displayParts.push(spacePart());
465-
addRange(displayParts, typeToDisplayParts(typeChecker, location.parent && isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration, TypeFormatFlags.InTypeAlias));
478+
addRange(
479+
displayParts,
480+
typeToDisplayParts(
481+
typeChecker,
482+
location.parent && isConstTypeReference(location.parent) ? typeChecker.getTypeAtLocation(location.parent) : typeChecker.getDeclaredTypeOfSymbol(symbol),
483+
enclosingDeclaration,
484+
TypeFormatFlags.InTypeAlias,
485+
verbosityLevel,
486+
typeWriterOut,
487+
),
488+
);
466489
}
467490
if (symbolFlags & SymbolFlags.Enum) {
468491
prefixNextMeaning();
@@ -650,13 +673,30 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker: Type
650673
// If the type is type parameter, format it specially
651674
if (type.symbol && type.symbol.flags & SymbolFlags.TypeParameter && symbolKind !== ScriptElementKind.indexSignatureElement) {
652675
const typeParameterParts = mapToDisplayParts(writer => {
653-
const param = typeChecker.typeParameterToDeclaration(type as TypeParameter, enclosingDeclaration, symbolDisplayNodeBuilderFlags)!;
676+
const param = typeChecker.typeParameterToDeclaration(
677+
type as TypeParameter,
678+
enclosingDeclaration,
679+
symbolDisplayNodeBuilderFlags,
680+
/*internalFlags*/ undefined,
681+
/*tracker*/ undefined,
682+
verbosityLevel,
683+
)!;
654684
getPrinter().writeNode(EmitHint.Unspecified, param, getSourceFileOfNode(getParseTreeNode(enclosingDeclaration)), writer);
655685
});
656686
addRange(displayParts, typeParameterParts);
657687
}
658688
else {
659-
addRange(displayParts, typeToDisplayParts(typeChecker, type, enclosingDeclaration));
689+
addRange(
690+
displayParts,
691+
typeToDisplayParts(
692+
typeChecker,
693+
type,
694+
enclosingDeclaration,
695+
/*flags*/ undefined,
696+
verbosityLevel,
697+
typeWriterOut,
698+
),
699+
);
660700
}
661701
if (isTransientSymbol(symbol) && symbol.links.target && isTransientSymbol(symbol.links.target) && symbol.links.target.links.tupleLabelDeclaration) {
662702
const labelDecl = symbol.links.target.links.tupleLabelDeclaration;
@@ -742,7 +782,13 @@ function getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker: Type
742782
tags = tagsFromAlias;
743783
}
744784

745-
return { displayParts, documentation, symbolKind, tags: tags.length === 0 ? undefined : tags };
785+
return {
786+
displayParts,
787+
documentation,
788+
symbolKind,
789+
tags: tags.length === 0 ? undefined : tags,
790+
canIncreaseVerbosityLevel: typeWriterOut?.couldUnfoldMore,
791+
};
746792

747793
function getPrinter() {
748794
return createPrinterWithRemoveComments();
@@ -874,8 +920,9 @@ export function getSymbolDisplayPartsDocumentationAndSymbolKind(
874920
location: Node,
875921
semanticMeaning: SemanticMeaning = getMeaningFromLocation(location),
876922
alias?: Symbol,
923+
verbosityLevel?: number,
877924
): SymbolDisplayPartsDocumentationAndSymbolKind {
878-
return getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker, symbol, sourceFile, enclosingDeclaration, location, /*type*/ undefined, semanticMeaning, alias);
925+
return getSymbolDisplayPartsDocumentationAndSymbolKindWorker(typeChecker, symbol, sourceFile, enclosingDeclaration, location, /*type*/ undefined, semanticMeaning, alias, verbosityLevel);
879926
}
880927

881928
function isLocalVariableOrFunction(symbol: Symbol) {

‎src/services/types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,8 @@ export interface LanguageService {
583583
* @param position A zero-based index of the character where you want the quick info
584584
*/
585585
getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined;
586+
/** @internal */
587+
getQuickInfoAtPosition(fileName: string, position: number, verbosityLevel: number | undefined): QuickInfo | undefined; // eslint-disable-line @typescript-eslint/unified-signatures
586588

587589
getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan | undefined;
588590

@@ -1324,6 +1326,7 @@ export interface QuickInfo {
13241326
displayParts?: SymbolDisplayPart[];
13251327
documentation?: SymbolDisplayPart[];
13261328
tags?: JSDocTagInfo[];
1329+
canIncreaseVerbosityLevel?: boolean;
13271330
}
13281331

13291332
export type RenameInfo = RenameInfoSuccess | RenameInfoFailure;

‎src/services/utilities.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ import {
390390
visitEachChild,
391391
VoidExpression,
392392
walkUpParenthesizedExpressions,
393+
WriterContextOut,
393394
YieldExpression,
394395
} from "./_namespaces/ts.js";
395396

@@ -3055,9 +3056,9 @@ export function mapToDisplayParts(writeDisplayParts: (writer: DisplayPartsSymbol
30553056
}
30563057

30573058
/** @internal */
3058-
export function typeToDisplayParts(typechecker: TypeChecker, type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.None): SymbolDisplayPart[] {
3059+
export function typeToDisplayParts(typechecker: TypeChecker, type: Type, enclosingDeclaration?: Node, flags: TypeFormatFlags = TypeFormatFlags.None, verbosityLevel?: number, out?: WriterContextOut): SymbolDisplayPart[] {
30593060
return mapToDisplayParts(writer => {
3060-
typechecker.writeType(type, enclosingDeclaration, flags | TypeFormatFlags.MultilineObjectLiterals | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer);
3061+
typechecker.writeType(type, enclosingDeclaration, flags | TypeFormatFlags.MultilineObjectLiterals | TypeFormatFlags.UseAliasDefinedOutsideCurrentScope, writer, verbosityLevel, out);
30613062
});
30623063
}
30633064

0 commit comments

Comments
 (0)