diff --git a/extensions/typescript/src/features/completionItemProvider.ts b/extensions/typescript/src/features/completionItemProvider.ts
index db06b46cbc2..1fbcb707863 100644
--- a/extensions/typescript/src/features/completionItemProvider.ts
+++ b/extensions/typescript/src/features/completionItemProvider.ts
@@ -251,7 +251,7 @@ export default class TypeScriptCompletionItemProvider implements CompletionItemP
 			const detail = details[0];
 			item.detail = Previewer.plain(detail.displayParts);
 
-			item.documentation = Previewer.plainDocumentation(detail.documentation, detail.tags);
+			item.documentation = Previewer.markdownDocumentation(detail.documentation, detail.tags);
 
 			if (detail && this.config.useCodeSnippetsOnMethodSuggest && (item.kind === CompletionItemKind.Function || item.kind === CompletionItemKind.Method)) {
 				return this.isValidFunctionCompletionContext(filepath, item.position).then(shouldCompleteFunction => {
diff --git a/extensions/typescript/src/features/previewer.ts b/extensions/typescript/src/features/previewer.ts
index 5865b560d2b..66fa507d5e2 100644
--- a/extensions/typescript/src/features/previewer.ts
+++ b/extensions/typescript/src/features/previewer.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as Proto from '../protocol';
+import { MarkdownString } from 'vscode';
 
 export function plain(parts: Proto.SymbolDisplayPart[]): string {
 	if (!parts) {
@@ -24,20 +25,15 @@ export function tagsMarkdownPreview(tags: Proto.JSDocTagInfo[]): string {
 		.join('  \n\n');
 }
 
-function tagsPlainPreview(tags: Proto.JSDocTagInfo[]): string {
-	return (tags || [])
-		.map(tag => {
-			const label = `@${tag.name}`;
-			if (!tag.text) {
-				return label;
-			}
-			return label + (tag.text.match(/\r\n|\n/g) ? '\n' + tag.text : ` — ${tag.text}`);
-		})
-		.join('\n\ngit');
-}
-
-export function plainDocumentation(documentation: Proto.SymbolDisplayPart[], tags: Proto.JSDocTagInfo[]): string {
-	const processedDocumentation = plain(documentation).replace(/\n([ \t]*\n)?/gm, (x) => x.length >= 2 ? '\n\n' : ' ');
-	const parts = [processedDocumentation, tagsPlainPreview(tags)];
-	return parts.filter(x => x).join('\n\n');
+export function markdownDocumentation(
+	documentation: Proto.SymbolDisplayPart[],
+	tags: Proto.JSDocTagInfo[]
+): MarkdownString {
+	const out = new MarkdownString();
+	out.appendMarkdown(plain(documentation));
+	const tagsPreview = tagsMarkdownPreview(tags);
+	if (tagsPreview) {
+		out.appendMarkdown('\n\n' + tagsPreview);
+	}
+	return out;
 }
\ No newline at end of file
diff --git a/extensions/typescript/src/features/signatureHelpProvider.ts b/extensions/typescript/src/features/signatureHelpProvider.ts
index c3f6c86e001..d4fb33e2bfb 100644
--- a/extensions/typescript/src/features/signatureHelpProvider.ts
+++ b/extensions/typescript/src/features/signatureHelpProvider.ts
@@ -59,7 +59,7 @@ export default class TypeScriptSignatureHelpProvider implements SignatureHelpPro
 					}
 				});
 				signature.label += Previewer.plain(item.suffixDisplayParts);
-				signature.documentation = Previewer.plainDocumentation(item.documentation, item.tags);
+				signature.documentation = Previewer.markdownDocumentation(item.documentation, item.tags);
 				result.signatures.push(signature);
 			});