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

fix #33486

Browse Source
This commit is contained in:
Johannes Rieken
2017-08-30 09:41:13 +02:00
parent 34cc9f2209
commit 39ea914be6
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/vs/workbench/api/node/extHostTypeConverters.ts
View File

@@ -150,14 +150,27 @@ export namespace MarkdownString {
return markup.map(MarkdownString.from);
}
interface Codeblock {
language: string;
value: string;
}
function isCodeblock(thing: any): thing is Codeblock {
return typeof thing === 'object'
&& typeof (<Codeblock>thing).language === 'string'
&& typeof (<Codeblock>thing).value === 'string';
}
export function from(markup: vscode.MarkdownString | vscode.MarkedString): htmlContent.IMarkdownString {
if (htmlContent.isMarkdownString(markup)) {
return markup;
} else if (typeof markup === 'string' || !markup) {
return { value: <string>markup || '', isTrusted: true };
} else {
if (isCodeblock(markup)) {
const { language, value } = markup;
return { value: '```' + language + '\n' + value + '\n```' };
return { value: '```' + language + '\n' + value + '\n```\n' };
} else if (htmlContent.isMarkdownString(markup)) {
return markup;
} else if (typeof markup === 'string') {
return { value: <string>markup, isTrusted: true };
} else {
return { value: '' };
}
}
export function to(value: htmlContent.IMarkdownString): vscode.MarkdownString {