From 57da808a984cfc91174aab7bb07389c78fa4998e Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Thu, 24 Aug 2017 16:49:21 +0200 Subject: [PATCH] Fix what an empty string is, don't render empty MarkdownString, #29076 --- src/vs/base/common/htmlContent.ts | 6 +++--- src/vs/editor/contrib/hover/browser/modesContentHover.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vs/base/common/htmlContent.ts b/src/vs/base/common/htmlContent.ts index 8d7c5dbdbb7..a0ae84d4b57 100644 --- a/src/vs/base/common/htmlContent.ts +++ b/src/vs/base/common/htmlContent.ts @@ -17,7 +17,7 @@ export class MarkdownString implements IMarkdownString { static isEmpty(oneOrMany: IMarkdownString | IMarkdownString[]): boolean { if (MarkdownString.isMarkdownString(oneOrMany)) { - return Boolean(oneOrMany.value); + return !oneOrMany.value; } else if (Array.isArray(oneOrMany)) { return oneOrMany.every(MarkdownString.isEmpty); } else { @@ -49,11 +49,11 @@ export class MarkdownString implements IMarkdownString { } appendCodeblock(langId: string, code: string): this { - this.value += '```'; + this.value += '\n```'; this.value += langId; this.value += '\n'; this.value += code; - this.value += '```\n'; + this.value += '\n```\n'; return this; } } diff --git a/src/vs/editor/contrib/hover/browser/modesContentHover.ts b/src/vs/editor/contrib/hover/browser/modesContentHover.ts index 1df24a3d800..4c588db7b87 100644 --- a/src/vs/editor/contrib/hover/browser/modesContentHover.ts +++ b/src/vs/editor/contrib/hover/browser/modesContentHover.ts @@ -310,7 +310,7 @@ export class ModesContentHoverWidget extends ContentHoverWidget { if (!(msg instanceof ColorHover)) { msg.contents - .filter(contents => !!contents) + .filter(contents => !MarkdownString.isEmpty(contents)) .forEach(contents => { const renderedContents = renderMarkdown(contents, { actionCallback: (content) => {