Allow unsupported types for tree tooltip (microsoft#102366)

alexr00 · web-flow · commit a34c756ae862 · 2020-07-13T14:13:27.000+02:00
Fixes microsoft#102170
diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts
@@ -13,7 +13,7 @@ import { ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.proto
 import { ITreeItem, TreeViewItemHandleArg, ITreeItemLabel, IRevealOptions } from 'vs/workbench/common/views';
 import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
 import { asPromise } from 'vs/base/common/async';
-import { TreeItemCollapsibleState, ThemeIcon } from 'vs/workbench/api/common/extHostTypes';
+import { TreeItemCollapsibleState, ThemeIcon, MarkdownString as MarkdownStringType } from 'vs/workbench/api/common/extHostTypes';
 import { isUndefinedOrNull, isString } from 'vs/base/common/types';
 import { equals, coalesce } from 'vs/base/common/arrays';
 import { ILogService } from 'vs/platform/log/common/log';
@@ -527,14 +527,11 @@ class ExtHostTreeView<T> extends Disposable {
 	}
 
 	private getTooltip(tooltip?: string | vscode.MarkdownString): string | IMarkdownString | undefined {
-		if (typeof tooltip === 'string') {
-			return tooltip;
-		} else if (tooltip === undefined) {
-			return undefined;
-		} else {
+		if (MarkdownStringType.isMarkdownString(tooltip)) {
 			checkProposedApiEnabled(this.extension);
 			return MarkdownString.from(tooltip);
 		}
+		return tooltip;
 	}
 
 	private createTreeNode(element: T, extensionTreeItem: vscode.TreeItem2, parent: TreeNode | Root): TreeNode {
diff --git a/src/vs/workbench/api/common/extHostTypes.ts b/src/vs/workbench/api/common/extHostTypes.ts
@@ -1271,6 +1271,13 @@ export class MarkdownString {
 		this.value += '\n```\n';
 		return this;
 	}
+
+	static isMarkdownString(thing: any): thing is vscode.MarkdownString {
+		if (thing instanceof MarkdownString) {
+			return true;
+		}
+		return thing && thing.appendCodeblock && thing.appendMarkdown && thing.appendText && (thing.value !== undefined);
+	}
 }
 
 @es5ClassCompat

Original file line number	Diff line number	Diff line change
`@@ -1271,6 +1271,13 @@ export class MarkdownString {`
`1271`	`1271`	this.value += '\n```\n';
`1272`	`1272`	`return this;`
`1273`	`1273`	`}`
	`1274`	`+`
	`1275`	`+ static isMarkdownString(thing: any): thing is vscode.MarkdownString {`
	`1276`	`+ if (thing instanceof MarkdownString) {`
	`1277`	`+ return true;`
	`1278`	`+ }`
	`1279`	`+ return thing && thing.appendCodeblock && thing.appendMarkdown && thing.appendText && (thing.value !== undefined);`
	`1280`	`+ }`
`1274`	`1281`	`}`
`1275`	`1282`
`1276`	`1283`	`@es5ClassCompat`