Skip to content

Commit def4753

Browse files
committed
Use appendText for markdown when tree tooltip is string
Fixes microsoft#105646
1 parent 4b54344 commit def4753

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import { isFalsyOrWhitespace } from 'vs/base/common/strings';
4040
import { SIDE_BAR_BACKGROUND, PANEL_BACKGROUND } from 'vs/workbench/common/theme';
4141
import { IHoverService, IHoverOptions, IHoverTarget } from 'vs/workbench/services/hover/browser/hover';
4242
import { ActionViewItem } from 'vs/base/browser/ui/actionbar/actionViewItems';
43+
import { IMarkdownString, MarkdownString } from 'vs/base/common/htmlContent';
4344

4445
class Root implements ITreeItem {
4546
label = { label: 'root' };
@@ -824,7 +825,13 @@ class TreeRenderer extends Disposable implements ITreeRenderer<ITreeItem, FuzzyS
824825
if (node instanceof ResolvableTreeItem) {
825826
await node.resolve();
826827
}
827-
const tooltip = node.tooltip ?? label;
828+
let tooltip: IMarkdownString | undefined;
829+
if (node.tooltip && !isString(node.tooltip)) {
830+
tooltip = node.tooltip;
831+
} else {
832+
const text = node.tooltip ?? label;
833+
tooltip = text ? new MarkdownString().appendText(text) : undefined;
834+
}
828835
if (isHovering && tooltip) {
829836
if (!hoverOptions) {
830837
const target: IHoverTarget = {

0 commit comments

Comments
 (0)