development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix LanguageStatusItem.Command.tooltip regression (#208888)

Browse source 
fixes #208265
This commit is contained in:
Benjamin Christopher Simmonds 2024-03-27 11:37:31 +01:00 committed by GitHub
parent 44c9f407c3
commit 7ae09768ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/platform/opener/browser/link.ts
View file

@ -14,6 +14,7 @@ import { IOpenerService } from 'vs/platform/opener/common/opener';
import 'vs/css!./link';
import { ICustomHover, setupCustomHover } from 'vs/base/browser/ui/hover/updatableHoverWidget';
import { getDefaultHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegateFactory';
import { IHoverDelegate } from 'vs/base/browser/ui/hover/hoverDelegate';
export interface ILinkDescriptor {
readonly label: string | HTMLElement;
@ -24,6 +25,7 @@ export interface ILinkDescriptor {
export interface ILinkOptions {
readonly opener?: (href: string) => void;
readonly hoverDelegate?: IHoverDelegate;
readonly textLinkForeground?: string;
}
@ -31,6 +33,7 @@ export class Link extends Disposable {
private el: HTMLAnchorElement;
private hover?: ICustomHover;
private hoverDelegate: IHoverDelegate;
private _enabled: boolean = true;
@ -90,6 +93,7 @@ export class Link extends Disposable {
href: _link.href,
}, _link.label));
this.hoverDelegate = options.hoverDelegate ?? getDefaultHoverDelegate('mouse');
this.setTooltip(_link.title);
this.el.setAttribute('role', 'button');
@ -122,8 +126,10 @@ export class Link extends Disposable {
}
private setTooltip(title: string | undefined): void {
if (!this.hover && title) {
this.hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.el, title));
if (this.hoverDelegate.showNativeHover) {
this.el.title = title ?? '';
} else if (!this.hover && title) {
this.hover = this._register(setupCustomHover(this.hoverDelegate, this.el, title));
} else if (this.hover) {
this.hover.update(title);
}

2
src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.ts
View file

@ -324,7 +324,7 @@ class LanguageStatus {
href: URI.from({
scheme: 'command', path: command.id, query: command.arguments && JSON.stringify(command.arguments)
}).toString()
}, undefined, this._openerService));
}, { hoverDelegate: nativeHoverDelegate }, this._openerService));
}
// -- pin