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

Merge pull request #35938 from mjbvz/fix-35937

Browse Source 
Don't treat regular string SignatureInformation documentation as markdown
This commit is contained in:
Johannes Rieken
2017-10-27 10:06:32 +02:00
committed by GitHub
parent cfff1af931 9ecd417c64
commit fa253ce001
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,6 +180,13 @@ export namespace MarkdownString {
ret.isTrusted = value.isTrusted;
return ret;
}
export function fromStrict(value: string | types.MarkdownString): undefined | string | htmlContent.IMarkdownString {
if (!value) {
return undefined;
}
return typeof value === 'string' ? value : MarkdownString.from(value);
}
}
export function fromRangeOrRangeWithMessage(ranges: vscode.Range[] | vscode.DecorationOptions[]): IDecorationOptions[] {
@@ -409,7 +416,7 @@ export namespace ParameterInformation {
export function from(info: types.ParameterInformation): modes.ParameterInformation {
return {
label: info.label,
documentation: info.documentation && MarkdownString.from(info.documentation)
documentation: MarkdownString.fromStrict(info.documentation)
};
}
export function to(info: modes.ParameterInformation): types.ParameterInformation {
@@ -425,7 +432,7 @@ export namespace SignatureInformation {
export function from(info: types.SignatureInformation): modes.SignatureInformation {
return {
label: info.label,
documentation: info.documentation && MarkdownString.from(info.documentation),
documentation: MarkdownString.fromStrict(info.documentation),
parameters: info.parameters && info.parameters.map(ParameterInformation.from)
};
}