Skip to content

Expandable hover #61492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Apr 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
91af0ce
Reapply "Proposed expandable hover API" (#61132)
gabritto Mar 7, 2025
92c49e6
WIP: support more cases
gabritto Mar 13, 2025
e371469
Fixes
gabritto Mar 14, 2025
5686f68
use declared symbol for class
gabritto Mar 14, 2025
bc99b1f
don't expand when truncating; fix tuple
gabritto Mar 14, 2025
44770e7
lint; test
gabritto Mar 17, 2025
06c5711
fix type parameter printing, fix lib type at top level
gabritto Mar 17, 2025
e97074b
fix top-level enum expansion
gabritto Mar 17, 2025
8aa7313
expand enum as type
gabritto Mar 17, 2025
d4958f6
print top-level classes as declarations
gabritto Mar 19, 2025
a7a334f
add class and enum declaration printing
gabritto Mar 19, 2025
45a92a4
add one more case to import
gabritto Mar 21, 2025
4256003
finish impl of top-level declaration expansion
gabritto Mar 24, 2025
25673e9
more fixes + tests
gabritto Mar 24, 2025
f9d2309
add top-level truncation
gabritto Mar 27, 2025
794e70b
add basic JS tests
gabritto Mar 27, 2025
d3b2a84
format
gabritto Mar 27, 2025
801b84c
Merge branch 'main' into gabritto/hover
gabritto Mar 27, 2025
fb7762c
tiny change unmade
gabritto Mar 27, 2025
8bd4821
default to printing 'namespace' instead of 'module'
gabritto Mar 27, 2025
2511624
update protocol comments
gabritto Mar 27, 2025
14d8405
Revert "default to printing 'namespace' instead of 'module'"
gabritto Mar 27, 2025
0def080
fix expansion of namespaces with non-id names
gabritto Mar 27, 2025
0c3edf9
format
gabritto Mar 27, 2025
7562951
update displayparts baselines
gabritto Mar 27, 2025
a187291
use enum member initializer if present
gabritto Apr 11, 2025
6af0483
truncation with comment when necessary
gabritto Apr 11, 2025
435418a
comments
gabritto Apr 11, 2025
7fe7ec2
refactor: move things around
gabritto Apr 11, 2025
defed5d
renaming, more comments
gabritto Apr 11, 2025
9e2feca
address some CR comments
gabritto Apr 14, 2025
98772e1
deep clone enum initializer when reused for quickinfo expansion
gabritto Apr 15, 2025
6e9f1d7
Merge branch 'main' into gabritto/hover
gabritto Apr 15, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
669 changes: 557 additions & 112 deletions src/compiler/checker.ts

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/compiler/emitter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1168,6 +1168,7 @@ export const notImplementedResolver: EmitResolver = {
isImportRequiredByAugmentation: notImplemented,
isDefinitelyReferenceToGlobalSymbolObject: notImplemented,
createLateBoundIndexSignatures: notImplemented,
symbolToDeclarations: notImplemented,
};

const enum PipelinePhase {
Expand Down
16 changes: 14 additions & 2 deletions src/compiler/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5046,6 +5046,15 @@ export interface TypeCheckerHost extends ModuleSpecifierResolutionHost, SourceFi

typesPackageExists(packageName: string): boolean;
packageBundlesTypes(packageName: string): boolean;

isSourceFileDefaultLibrary(file: SourceFile): boolean;
}

/** @internal */
export interface WriterContextOut {
/** Whether increasing the expansion depth will cause us to expand more types. */
canIncreaseExpansionDepth: boolean;
truncated: boolean;
}

export interface TypeChecker {
Expand Down Expand Up @@ -5134,6 +5143,7 @@ export interface TypeChecker {
symbolToParameterDeclaration(symbol: Symbol, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): ParameterDeclaration | undefined;
/** Note that the resulting nodes cannot be checked. */
typeParameterToDeclaration(parameter: TypeParameter, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined): TypeParameterDeclaration | undefined;
/** @internal */ typeParameterToDeclaration(parameter: TypeParameter, enclosingDeclaration: Node | undefined, flags: NodeBuilderFlags | undefined, internalFlags?: InternalNodeBuilderFlags, tracker?: SymbolTracker, verbosityLevel?: number, out?: WriterContextOut): TypeParameterDeclaration | undefined; // eslint-disable-line @typescript-eslint/unified-signatures

getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
getSymbolAtLocation(node: Node): Symbol | undefined;
Expand Down Expand Up @@ -5165,8 +5175,8 @@ export interface TypeChecker {
symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags): string;
typePredicateToString(predicate: TypePredicate, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;

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

Expand Down Expand Up @@ -5435,6 +5445,7 @@ export interface TypeChecker {
/** @internal */ fillMissingTypeArguments(typeArguments: readonly Type[], typeParameters: readonly TypeParameter[] | undefined, minTypeArgumentCount: number, isJavaScriptImplicitAny: boolean): Type[];

getTypeArgumentsForResolvedSignature(signature: Signature): readonly Type[] | undefined;
/** @internal */ isLibType(type: Type): boolean;
}

/** @internal */
Expand Down Expand Up @@ -5881,6 +5892,7 @@ export interface EmitResolver {
isImportRequiredByAugmentation(decl: ImportDeclaration): boolean;
isDefinitelyReferenceToGlobalSymbolObject(node: Node): boolean;
createLateBoundIndexSignatures(cls: ClassLikeDeclaration, enclosingDeclaration: Node, flags: NodeBuilderFlags, internalFlags: InternalNodeBuilderFlags, tracker: SymbolTracker): (IndexSignatureDeclaration | PropertyDeclaration)[] | undefined;
symbolToDeclarations(symbol: Symbol, meaning: SymbolFlags, flags: NodeBuilderFlags, verbosityLevel?: number, out?: WriterContextOut): Declaration[];
}

// dprint-ignore
Expand Down
122 changes: 122 additions & 0 deletions src/compiler/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
__String,
AccessExpression,
AccessorDeclaration,
addEmitFlags,
addRange,
affectsDeclarationPathOptionDeclarations,
affectsEmitOptionDeclarations,
Expand Down Expand Up @@ -511,6 +512,8 @@ import {
ScriptTarget,
semanticDiagnosticsOptionDeclarations,
SetAccessorDeclaration,
setOriginalNode,
setTextRange,
ShorthandPropertyAssignment,
shouldAllowImportingTsExtension,
Signature,
Expand Down Expand Up @@ -592,6 +595,7 @@ import {
VariableDeclarationList,
VariableLikeDeclaration,
VariableStatement,
visitEachChild,
WhileStatement,
WithStatement,
WrappedExpression,
Expand Down Expand Up @@ -12208,3 +12212,121 @@ export function getOptionsSyntaxByValue(optionsObject: ObjectLiteralExpression |
export function forEachOptionsSyntaxByName<T>(optionsObject: ObjectLiteralExpression | undefined, name: string, callback: (prop: PropertyAssignment) => T | undefined): T | undefined {
return forEachPropertyAssignment(optionsObject, name, callback);
}

/**
* Creates a deep, memberwise clone of a node with no source map location.
*
* WARNING: This is an expensive operation and is only intended to be used in refactorings
* and code fixes (because those are triggered by explicit user actions).
*
* @internal
*/
// Moved here to compiler utilities for usage in node builder for quickinfo.
export function getSynthesizedDeepClone<T extends Node | undefined>(node: T, includeTrivia = true): T {
const clone = node && getSynthesizedDeepCloneWorker(node);
if (clone && !includeTrivia) suppressLeadingAndTrailingTrivia(clone);
return setParentRecursive(clone, /*incremental*/ false);
}

/** @internal */
export function getSynthesizedDeepCloneWithReplacements<T extends Node>(
node: T,
includeTrivia: boolean,
replaceNode: (node: Node) => Node | undefined,
): T {
let clone = replaceNode(node);
if (clone) {
setOriginalNode(clone, node);
}
else {
clone = getSynthesizedDeepCloneWorker(node as NonNullable<T>, replaceNode);
}

if (clone && !includeTrivia) suppressLeadingAndTrailingTrivia(clone);
return clone as T;
}

function getSynthesizedDeepCloneWorker<T extends Node>(node: T, replaceNode?: (node: Node) => Node | undefined): T {
const nodeClone: <T extends Node>(n: T) => T = replaceNode
? n => getSynthesizedDeepCloneWithReplacements(n, /*includeTrivia*/ true, replaceNode)
: getSynthesizedDeepClone;
const nodesClone: <T extends Node>(ns: NodeArray<T> | undefined) => NodeArray<T> | undefined = replaceNode
? ns => ns && getSynthesizedDeepClonesWithReplacements(ns, /*includeTrivia*/ true, replaceNode)
: ns => ns && getSynthesizedDeepClones(ns);
const visited = visitEachChild(node, nodeClone, /*context*/ undefined, nodesClone, nodeClone);

if (visited === node) {
// This only happens for leaf nodes - internal nodes always see their children change.
const clone = isStringLiteral(node) ? setOriginalNode(factory.createStringLiteralFromNode(node), node) as Node as T :
isNumericLiteral(node) ? setOriginalNode(factory.createNumericLiteral(node.text, node.numericLiteralFlags), node) as Node as T :
factory.cloneNode(node);
return setTextRange(clone, node);
}

// PERF: As an optimization, rather than calling factory.cloneNode, we'll update
// the new node created by visitEachChild with the extra changes factory.cloneNode
// would have made.
(visited as Mutable<T>).parent = undefined!;
return visited;
}

/** @internal */
export function getSynthesizedDeepClones<T extends Node>(nodes: NodeArray<T>, includeTrivia?: boolean): NodeArray<T>;
/** @internal */
export function getSynthesizedDeepClones<T extends Node>(nodes: NodeArray<T> | undefined, includeTrivia?: boolean): NodeArray<T> | undefined;
/** @internal */
export function getSynthesizedDeepClones<T extends Node>(nodes: NodeArray<T> | undefined, includeTrivia = true): NodeArray<T> | undefined {
if (nodes) {
const cloned = factory.createNodeArray(nodes.map(n => getSynthesizedDeepClone(n, includeTrivia)), nodes.hasTrailingComma);
setTextRange(cloned, nodes);
return cloned;
}
return nodes;
}

/** @internal */
export function getSynthesizedDeepClonesWithReplacements<T extends Node>(
nodes: NodeArray<T>,
includeTrivia: boolean,
replaceNode: (node: Node) => Node | undefined,
): NodeArray<T> {
return factory.createNodeArray(nodes.map(n => getSynthesizedDeepCloneWithReplacements(n, includeTrivia, replaceNode)), nodes.hasTrailingComma);
}

/**
* Sets EmitFlags to suppress leading and trailing trivia on the node.
*
* @internal
*/
export function suppressLeadingAndTrailingTrivia(node: Node): void {
suppressLeadingTrivia(node);
suppressTrailingTrivia(node);
}

/**
* Sets EmitFlags to suppress leading trivia on the node.
*
* @internal
*/
export function suppressLeadingTrivia(node: Node): void {
addEmitFlagsRecursively(node, EmitFlags.NoLeadingComments, getFirstChild);
}

/**
* Sets EmitFlags to suppress trailing trivia on the node.
*
* @internal @knipignore
*/
export function suppressTrailingTrivia(node: Node): void {
addEmitFlagsRecursively(node, EmitFlags.NoTrailingComments, getLastChild);
}

function addEmitFlagsRecursively(node: Node, flag: EmitFlags, getChild: (n: Node) => Node | undefined) {
addEmitFlags(node, flag);
const child = getChild(node);
if (child) addEmitFlagsRecursively(child, flag, getChild);
}

function getFirstChild(node: Node): Node | undefined {
return forEachChild(node, child => child);
}
5 changes: 3 additions & 2 deletions src/harness/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ export class SessionClient implements LanguageService {
return { line, character: offset };
}

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

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

Expand Down
25 changes: 19 additions & 6 deletions src/harness/fourslashImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ export interface TextSpan {
end: number;
}

export interface VerbosityLevels {
[markerName: string]: number | number[] | undefined;
}

// Name of testcase metadata including ts.CompilerOptions properties that will be used by globalOptions
// To add additional option, add property into the testOptMetadataNames, refer the property in either globalMetadataNames or fileMetadataNames
// Add cases into convertGlobalOptionsToCompilationsSettings function for the compiler to acknowledge such option from meta data
Expand Down Expand Up @@ -2451,19 +2455,28 @@ export class TestState {
return result;
}

public baselineQuickInfo(): void {
const result = ts.arrayFrom(this.testData.markerPositions.entries(), ([name, marker]) => ({
marker: { ...marker, name },
item: this.languageService.getQuickInfoAtPosition(marker.fileName, marker.position),
}));
public baselineQuickInfo(verbosityLevels?: VerbosityLevels): void {
const result = ts.arrayFrom(this.testData.markerPositions.entries(), ([name, marker]) => {
const verbosityLevel = toArray(verbosityLevels?.[name]);
const items = verbosityLevel.map(verbosityLevel => {
const item: ts.QuickInfo & { verbosityLevel?: number; } | undefined = this.languageService.getQuickInfoAtPosition(marker.fileName, marker.position, verbosityLevel);
if (item) item.verbosityLevel = verbosityLevel;
return {
marker: { ...marker, name },
item,
};
});
return items;
}).flat();
const annotations = this.annotateContentWithTooltips(
result,
"quickinfo",
item => item.textSpan,
({ displayParts, documentation, tags }) => [
({ displayParts, documentation, tags, verbosityLevel }) => [
...(displayParts ? displayParts.map(p => p.text).join("").split("\n") : []),
...(documentation?.length ? documentation.map(p => p.text).join("").split("\n") : []),
...(tags?.length ? tags.map(p => `@${p.name} ${p.text?.map(dp => dp.text).join("") ?? ""}`).join("\n").split("\n") : []),
...(verbosityLevel !== undefined ? [`(verbosity level: ${verbosityLevel})`] : []),
],
);
this.baseline("QuickInfo", annotations + "\n\n" + stringify(result));
Expand Down
4 changes: 2 additions & 2 deletions src/harness/fourslashInterfaceImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ export class Verify extends VerifyNegatable {
this.state.baselineGetEmitOutput();
}

public baselineQuickInfo(): void {
this.state.baselineQuickInfo();
public baselineQuickInfo(verbosityLevels?: FourSlash.VerbosityLevels): void {
this.state.baselineQuickInfo(verbosityLevels);
}

public baselineSignatureHelp(): void {
Expand Down
13 changes: 13 additions & 0 deletions src/server/protocol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2005,6 +2005,14 @@ export interface QuickInfoRequest extends FileLocationRequest {
arguments: FileLocationRequestArgs;
}

export interface QuickInfoRequestArgs extends FileLocationRequestArgs {
/**
* This controls how many levels of definitions will be expanded in the quick info response.
* The default value is 0.
*/
verbosityLevel?: number;
}

/**
* Body of QuickInfoResponse.
*/
Expand Down Expand Up @@ -2044,6 +2052,11 @@ export interface QuickInfoResponseBody {
* JSDoc tags associated with symbol.
*/
tags: JSDocTagInfo[];

/**
* Whether the verbosity level can be increased for this quick info response.
*/
canIncreaseVerbosityLevel?: boolean;
}

/**
Expand Down
5 changes: 3 additions & 2 deletions src/server/session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2392,10 +2392,10 @@ export class Session<TMessage = string> implements EventSender {
return languageService.isValidBraceCompletionAtPosition(file, position, args.openingBrace.charCodeAt(0));
}

private getQuickInfoWorker(args: protocol.FileLocationRequestArgs, simplifiedResult: boolean): protocol.QuickInfoResponseBody | QuickInfo | undefined {
private getQuickInfoWorker(args: protocol.QuickInfoRequestArgs, simplifiedResult: boolean): protocol.QuickInfoResponseBody | QuickInfo | undefined {
const { file, project } = this.getFileAndProject(args);
const scriptInfo = this.projectService.getScriptInfoForNormalizedPath(file)!;
const quickInfo = project.getLanguageService().getQuickInfoAtPosition(file, this.getPosition(args, scriptInfo));
const quickInfo = project.getLanguageService().getQuickInfoAtPosition(file, this.getPosition(args, scriptInfo), args.verbosityLevel);
if (!quickInfo) {
return undefined;
}
Expand All @@ -2411,6 +2411,7 @@ export class Session<TMessage = string> implements EventSender {
displayString,
documentation: useDisplayParts ? this.mapDisplayParts(quickInfo.documentation, project) : displayPartsToString(quickInfo.documentation),
tags: this.mapJSDocTagInfo(quickInfo.tags, project, useDisplayParts),
canIncreaseVerbosityLevel: quickInfo.canIncreaseVerbosityLevel,
};
}
else {
Expand Down
20 changes: 17 additions & 3 deletions src/services/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2274,7 +2274,7 @@ export function createLanguageService(
return Completions.getCompletionEntrySymbol(program, log, getValidSourceFile(fileName), position, { name, source }, host, preferences);
}

function getQuickInfoAtPosition(fileName: string, position: number): QuickInfo | undefined {
function getQuickInfoAtPosition(fileName: string, position: number, verbosityLevel?: number): QuickInfo | undefined {
synchronizeHostData();

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

const { symbolKind, displayParts, documentation, tags } = typeChecker.runWithCancellationToken(cancellationToken, typeChecker => SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, getContainerNode(nodeForQuickInfo), nodeForQuickInfo));
const { symbolKind, displayParts, documentation, tags, canIncreaseVerbosityLevel } = typeChecker.runWithCancellationToken(
cancellationToken,
typeChecker =>
SymbolDisplay.getSymbolDisplayPartsDocumentationAndSymbolKind(
typeChecker,
symbol,
sourceFile,
getContainerNode(nodeForQuickInfo),
nodeForQuickInfo,
/*semanticMeaning*/ undefined,
/*alias*/ undefined,
verbosityLevel,
),
);
return {
kind: symbolKind,
kindModifiers: SymbolDisplay.getSymbolModifiers(typeChecker, symbol),
textSpan: createTextSpanFromNode(nodeForQuickInfo, sourceFile),
displayParts,
documentation,
tags,
canIncreaseVerbosityLevel,
};
}

Expand Down
Loading