提交 97bf8e14 编写于 作者: A Alex Ross

Move isMarkdownString to extHostTypes MarkdownString

上级 fc8e4779
...@@ -13,7 +13,7 @@ import { ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.proto ...@@ -13,7 +13,7 @@ import { ExtHostTreeViewsShape, MainThreadTreeViewsShape } from './extHost.proto
import { ITreeItem, TreeViewItemHandleArg, ITreeItemLabel, IRevealOptions } from 'vs/workbench/common/views'; import { ITreeItem, TreeViewItemHandleArg, ITreeItemLabel, IRevealOptions } from 'vs/workbench/common/views';
import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/common/extHostCommands'; import { ExtHostCommands, CommandsConverter } from 'vs/workbench/api/common/extHostCommands';
import { asPromise } from 'vs/base/common/async'; 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 { isUndefinedOrNull, isString } from 'vs/base/common/types';
import { equals, coalesce } from 'vs/base/common/arrays'; import { equals, coalesce } from 'vs/base/common/arrays';
import { ILogService } from 'vs/platform/log/common/log'; import { ILogService } from 'vs/platform/log/common/log';
...@@ -24,10 +24,6 @@ import { IMarkdownString } from 'vs/base/common/htmlContent'; ...@@ -24,10 +24,6 @@ import { IMarkdownString } from 'vs/base/common/htmlContent';
type TreeItemHandle = string; type TreeItemHandle = string;
function isMarkdownString(value: any): value is vscode.MarkdownString {
return (value !== undefined) && value.appendCodeblock && value.appendMarkdown && value.appendText && (value.value !== undefined);
}
function toTreeItemLabel(label: any, extension: IExtensionDescription): ITreeItemLabel | undefined { function toTreeItemLabel(label: any, extension: IExtensionDescription): ITreeItemLabel | undefined {
if (isString(label)) { if (isString(label)) {
return { label }; return { label };
...@@ -531,7 +527,7 @@ class ExtHostTreeView<T> extends Disposable { ...@@ -531,7 +527,7 @@ class ExtHostTreeView<T> extends Disposable {
} }
private getTooltip(tooltip?: string | vscode.MarkdownString): string | IMarkdownString | undefined { private getTooltip(tooltip?: string | vscode.MarkdownString): string | IMarkdownString | undefined {
if (isMarkdownString(tooltip)) { if (MarkdownStringType.isMarkdownString(tooltip)) {
checkProposedApiEnabled(this.extension); checkProposedApiEnabled(this.extension);
return MarkdownString.from(tooltip); return MarkdownString.from(tooltip);
} }
......
...@@ -1271,6 +1271,13 @@ export class MarkdownString { ...@@ -1271,6 +1271,13 @@ export class MarkdownString {
this.value += '\n```\n'; this.value += '\n```\n';
return this; return this;
} }
static isMarkdownString(thing: any): thing is vscode.MarkdownString {
if (thing instanceof MarkdownString) {
return true;
}
return (thing !== undefined) && thing.appendCodeblock && thing.appendMarkdown && thing.appendText && (thing.value !== undefined);
}
} }
@es5ClassCompat @es5ClassCompat
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册