diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index f6022c9f52f..2faab9d2968 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -5657,7 +5657,7 @@ declare module 'vscode' { /** * The tooltip text when you hover over this entry. */ - tooltip: string | undefined; + tooltip: string | MarkdownString | undefined; /** * The foreground color for this entry. diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts index 8505735cb9e..f010a36b8c5 100644 --- a/src/vs/vscode.proposed.d.ts +++ b/src/vs/vscode.proposed.d.ts @@ -2720,19 +2720,6 @@ declare module 'vscode' { //#endregion - //#region https://github.com/microsoft/vscode/issues/126258 @aeschli - - export interface StatusBarItem { - - /** - * Will be merged into StatusBarItem#tooltip - */ - tooltip2: string | MarkdownString | undefined; - - } - - //#endregion - //#region https://github.com/microsoft/vscode/issues/126280 @mjbvz export interface NotebookCellData { diff --git a/src/vs/workbench/api/common/extHostStatusBar.ts b/src/vs/workbench/api/common/extHostStatusBar.ts index 50df9fab6e7..2ca131f9808 100644 --- a/src/vs/workbench/api/common/extHostStatusBar.ts +++ b/src/vs/workbench/api/common/extHostStatusBar.ts @@ -36,8 +36,7 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem { private _visible: boolean = false; private _text: string = ''; - private _tooltip?: string; - private _tooltip2?: vscode.MarkdownString | string; + private _tooltip?: string | vscode.MarkdownString; private _name?: string; private _color?: string | ThemeColor; private _backgroundColor?: ThemeColor; @@ -85,14 +84,6 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem { return this._name; } - public get tooltip(): string | undefined { - return this._tooltip; - } - - public get tooltip2(): string | vscode.MarkdownString | undefined { - return this._tooltip2; - } - public get color(): string | ThemeColor | undefined { return this._color; } @@ -124,11 +115,6 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem { this.update(); } - public set tooltip2(tooltip: vscode.MarkdownString | string | undefined) { - this._tooltip2 = tooltip; - this.update(); - } - public set color(color: string | ThemeColor | undefined) { this._color = color; this.update(); @@ -220,7 +206,7 @@ export class ExtHostStatusBarEntry implements vscode.StatusBarItem { color = ExtHostStatusBarEntry.ALLOWED_BACKGROUND_COLORS.get(this._backgroundColor.id); } - const tooltip = this._tooltip2 !== undefined ? MarkdownString.fromStrict(this._tooltip2) : this.tooltip; + const tooltip = this._tooltip ? MarkdownString.fromStrict(this._tooltip) : undefined; // Set to status bar this.#proxy.$setEntry(this._entryId, id, name, this._text, tooltip, this._command?.internal, color,