Move convert function into MarkDownstring namespace

This commit is contained in:
Matt Bierner
2017-10-23 13:45:52 -07:00
parent 85af29ffcf
commit 9ecd417c64

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[] {
@@ -405,19 +412,11 @@ export namespace Suggest {
}
};
function convertSignatureDocumentation(documentation: string | types.MarkdownString): undefined | string | htmlContent.IMarkdownString {
if (!documentation) {
return undefined;
}
return typeof documentation === 'string' ? documentation : MarkdownString.from(documentation);
}
export namespace ParameterInformation {
export function from(info: types.ParameterInformation): modes.ParameterInformation {
return {
label: info.label,
documentation: convertSignatureDocumentation(info.documentation)
documentation: MarkdownString.fromStrict(info.documentation)
};
}
export function to(info: modes.ParameterInformation): types.ParameterInformation {
@@ -433,7 +432,7 @@ export namespace SignatureInformation {
export function from(info: types.SignatureInformation): modes.SignatureInformation {
return {
label: info.label,
documentation: convertSignatureDocumentation(info.documentation),
documentation: MarkdownString.fromStrict(info.documentation),
parameters: info.parameters && info.parameters.map(ParameterInformation.from)
};
}