From 93340ffab96937ef7b0f49822ccec067cef0c16e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 27 Jul 2022 11:14:27 -0700 Subject: Log when encountering invalid json in vscode-context (#156485) Fixes #156416 --- src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html | 6 ++++-- src/vs/workbench/contrib/webview/browser/pre/index.html | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/vs') diff --git a/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html b/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html index 8bba582ed17..d0ce103adc8 100644 --- a/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html +++ b/src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html @@ -1070,8 +1070,10 @@ } try { - context = { ...JSON.parse(el.getAttribute('data-vscode-context')), ...context }; - } catch {} + context = { ...JSON.parse(el.dataset.vscodeContext), ...context }; + } catch (e) { + console.error(`Error parsing 'data-vscode-context' as json`, el, e) + } el = el.parentElement; } diff --git a/src/vs/workbench/contrib/webview/browser/pre/index.html b/src/vs/workbench/contrib/webview/browser/pre/index.html index 52276ac415c..6c00e8b5da2 100644 --- a/src/vs/workbench/contrib/webview/browser/pre/index.html +++ b/src/vs/workbench/contrib/webview/browser/pre/index.html @@ -5,7 +5,7 @@ + content="default-src 'none'; script-src 'sha256-JpX/ganPoxpavjxWCz9DUZgwVZ59o2lwSYTQrziPsdU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">