Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 12:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #114806

Browse Source
This commit is contained in:
Jackson Kearl
2022-02-15 19:02:49 -08:00
parent 31b199da9c
commit f21d6414b5
4 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/api/common/extHostTimeline.ts
View File

@@ -11,9 +11,12 @@ import { Timeline, TimelineItem, TimelineOptions, TimelineProvider, InternalTime
import { IDisposable, toDisposable, DisposableStore } from 'vs/base/common/lifecycle';
import { CancellationToken } from 'vs/base/common/cancellation';
import { CommandsConverter, ExtHostCommands } from 'vs/workbench/api/common/extHostCommands';
import { ThemeIcon } from 'vs/workbench/api/common/extHostTypes';
import { ThemeIcon, MarkdownString as MarkdownStringType } from 'vs/workbench/api/common/extHostTypes';
import { MarkdownString } from 'vs/workbench/api/common/extHostTypeConverters';
import { ExtensionIdentifier } from 'vs/platform/extensions/common/extensions';
import { MarshalledId } from 'vs/base/common/marshalling';
import { IMarkdownString } from 'vs/base/common/htmlContent';
import { isString } from 'vs/base/common/types';
export interface IExtHostTimeline extends ExtHostTimelineShape {
readonly _serviceBrand: undefined;
@@ -143,6 +146,14 @@ export class ExtHostTimeline implements IExtHostTimeline {
}
}
let detail: IMarkdownString | string | undefined;
if (MarkdownStringType.isMarkdownString(props.detail)) {
detail = MarkdownString.from(props.detail);
}
else if (isString(detail)) {
detail = props.detail;
}
return {
...props,
id: props.id ?? undefined,
@@ -152,6 +163,7 @@ export class ExtHostTimeline implements IExtHostTimeline {
icon: icon,
iconDark: iconDark,
themeIcon: themeIcon,
detail,
accessibilityInformation: item.accessibilityInformation
};
};