Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 18:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[typescript-language-features] Expandable hover (#228255)"

Browse Source 
This reverts commit 0f9abf3c35.
This commit is contained in:
Gabriela Araujo Britto
2025-02-07 12:58:24 -08:00
parent e887b8e3d2
commit 746caa340a
5 changed files with 18 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
extensions/typescript-language-features/src/languageFeatures/hover.ts
View File

@@ -11,11 +11,10 @@ import { DocumentSelector } from '../configuration/documentSelector';
import { documentationToMarkdown } from './util/textRendering';
import * as typeConverters from '../typeConverters';
import FileConfigurationManager from './fileConfigurationManager';
import { API } from '../tsServer/api';
class TypeScriptHoverProvider implements vscode.HoverProvider {
private lastHoverAndLevel: [vscode.Hover, number] | undefined;
public constructor(
private readonly client: ITypeScriptServiceClient,
@@ -25,24 +24,17 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
public async provideHover(
document: vscode.TextDocument,
position: vscode.Position,
token: vscode.CancellationToken,
context?: vscode.HoverContext,
): Promise<vscode.VerboseHover | undefined> {
token: vscode.CancellationToken
): Promise<vscode.Hover | undefined> {
const filepath = this.client.toOpenTsFilePath(document);
if (!filepath) {
return undefined;
}
const enableExpandableHover = vscode.workspace.getConfiguration('typescript').get('experimental.expandableHover');
let verbosityLevel: number | undefined;
if (enableExpandableHover && this.client.apiVersion.gte(API.v570)) {
verbosityLevel = Math.max(0, this.getPreviousLevel(context?.previousHover) + (context?.verbosityDelta ?? 0));
}
const args = { ...typeConverters.Position.toFileLocationRequestArgs(filepath, position), verbosityLevel };
const response = await this.client.interruptGetErr(async () => {
await this.fileConfigurationManager.ensureConfigurationForDocument(document, token);
const args = typeConverters.Position.toFileLocationRequestArgs(filepath, position);
return this.client.execute('quickinfo', args, token);
});
@@ -50,24 +42,9 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
return undefined;
}
const contents = this.getContents(document.uri, response.body, response._serverType);
const range = typeConverters.Range.fromTextSpan(response.body);
const hover = verbosityLevel !== undefined ?
new vscode.VerboseHover(
contents,
range,
// @ts-expect-error
/*canIncreaseVerbosity*/ response.body.canIncreaseVerbosityLevel,
/*canDecreaseVerbosity*/ verbosityLevel !== 0
) : new vscode.Hover(
contents,
range
);
if (verbosityLevel !== undefined) {
this.lastHoverAndLevel = [hover, verbosityLevel];
}
return hover;
return new vscode.Hover(
this.getContents(document.uri, response.body, response._serverType),
typeConverters.Range.fromTextSpan(response.body));
}
private getContents(
@@ -95,13 +72,6 @@ class TypeScriptHoverProvider implements vscode.HoverProvider {
parts.push(md);
return parts;
}
private getPreviousLevel(previousHover: vscode.Hover | undefined): number {
if (previousHover && this.lastHoverAndLevel && this.lastHoverAndLevel[0] === previousHover) {
return this.lastHoverAndLevel[1];
}
return 0;
}
}
export function register(

1
extensions/typescript-language-features/src/tsServer/api.ts
View File

@@ -29,7 +29,6 @@ export class API {
public static readonly v544 = API.fromSimpleString('5.4.4');
public static readonly v540 = API.fromSimpleString('5.4.0');
public static readonly v560 = API.fromSimpleString('5.6.0');
public static readonly v570 = API.fromSimpleString('5.7.0');
public static fromVersionString(versionString: string): API {
let version = semver.valid(versionString);