From 66e1c0179353f0a4394bf3b2d2687621f1f69cd0 Mon Sep 17 00:00:00 2001 From: Maddy <12754347+MaddyDev@users.noreply.github.com> Date: Fri, 22 Nov 2019 17:20:41 -0800 Subject: [PATCH] regex to encode & correctly (#8441) --- .../contrib/notebook/browser/outputs/notebookMarkdown.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown.ts b/src/sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown.ts index caf4fbf299..30374d3dc0 100644 --- a/src/sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/notebookMarkdown.ts @@ -5,7 +5,6 @@ import * as path from 'vs/base/common/path'; import { URI } from 'vs/base/common/uri'; - import { IMarkdownString, removeMarkdownEscapes } from 'vs/base/common/htmlContent'; import { IMarkdownRenderResult } from 'vs/editor/contrib/markdown/markdownRenderer'; import * as marked from 'vs/base/common/marked/marked'; @@ -128,7 +127,7 @@ export class NotebookMarkdownRenderer { } else { // HTML Encode href - href = href.replace(/&/g, '&') + href = href.replace(/&(?!amp;)/g, '&') .replace(//g, '>') .replace(/"/g, '"')