Skip to content

Commit d9e2c45

Browse files
committed
Use uri label as fallback for resources without a tooltip
Part of #106007
1 parent 231e2b2 commit d9e2c45

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/vs/workbench/contrib/views/browser/treeView.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -759,10 +759,11 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
759759

760760
// reset
761761
templateData.actionBar.clear();
762-
762+
let fallbackHover = label;
763763
if (resource || this.isFileKindThemeIcon(node.themeIcon)) {
764764
const fileDecorations = this.configurationService.getValue<{ colors: boolean, badges: boolean }>('explorer.decorations');
765-
templateData.resourceLabel.setResource({ name: label, description, resource: resource ? resource : URI.parse('missing:_icon_resource') }, {
765+
const labelResource = resource ? resource : URI.parse('missing:_icon_resource');
766+
templateData.resourceLabel.setResource({ name: label, description, resource: labelResource }, {
766767
fileKind: this.getFileKind(node),
767768
title: '',
768769
hideIcon: !!iconUrl,
@@ -771,6 +772,7 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
771772
matches: matches ? matches : createMatches(element.filterData),
772773
strikethrough: treeItemLabel?.strikethrough
773774
});
775+
fallbackHover = this.labelService.getUriLabel(labelResource);
774776
} else {
775777
templateData.resourceLabel.setResource({ name: label, description }, {
776778
title: '',
@@ -803,8 +805,8 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
803805
const disposableStore = new DisposableStore();
804806
templateData.elementDisposable = disposableStore;
805807
disposableStore.add(this.themeService.onDidFileIconThemeChange(() => this.setAlignment(templateData.container, node)));
806-
this.setupHovers(node, <HTMLElement>templateData.resourceLabel.element.firstElementChild!, disposableStore, label);
807-
this.setupHovers(node, templateData.icon, disposableStore, label);
808+
this.setupHovers(node, <HTMLElement>templateData.resourceLabel.element.firstElementChild!, disposableStore, fallbackHover);
809+
this.setupHovers(node, templateData.icon, disposableStore, fallbackHover);
808810
}
809811

810812
private setupHovers(node: ITreeItem, htmlElement: HTMLElement, disposableStore: DisposableStore, label: string | undefined): void {

0 commit comments

Comments
 (0)