From a99e510afc73c5f25ce4a715c75daffd1176204c Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 22 Oct 2019 14:57:18 -0700 Subject: [PATCH] Fixing preprocessHtml to handle old style vscode-resource uris better --- .../contrib/webview/browser/webviewElement.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/contrib/webview/browser/webviewElement.ts b/src/vs/workbench/contrib/webview/browser/webviewElement.ts index 39357c106f5..3745c6c67df 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewElement.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewElement.ts @@ -92,9 +92,13 @@ export class IFrameWebview extends BaseWebview implements Web } private preprocessHtml(value: string): string { - return value.replace(/(["'])vscode-resource:(\/\/([^\s'"]+?)(?=\/))?([^\s'"]+?)(["'])/gi, (_, startQuote, _1, scheme, path, endQuote) => { - return `${startQuote}${this.externalEndpoint}/vscode-resource/${scheme || ''}${path}${endQuote}`; - }); + return value + .replace(/(["'])vscode-resource:(\/\/([^\s\/'"]+?)(?=\/))?([^\s'"]+?)(["'])/gi, (match, startQuote, _1, scheme, path, endQuote) => { + if (scheme) { + return `${startQuote}${this.externalEndpoint}/vscode-resource/${scheme}${path}${endQuote}`; + } + return `${startQuote}${this.externalEndpoint}/vscode-resource/file${path}${endQuote}`; + }); } protected get extraContentOptions() { -- GitLab