diff options
| author | Matt Bierner <matb@microsoft.com> | 2022-07-27 21:14:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 21:14:27 +0300 |
| commit | 93340ffab96937ef7b0f49822ccec067cef0c16e (patch) | |
| tree | 08cb6182744c98b6981afb87dd9f31f6bf8ec740 /src/vs | |
| parent | c8cf34a36f6ee3dcc5f75fdcc175e0346bf12b54 (diff) | |
Log when encountering invalid json in vscode-context (#156485)
Fixes #156416
Diffstat (limited to 'src/vs')
| -rw-r--r-- | src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html | 6 | ||||
| -rw-r--r-- | src/vs/workbench/contrib/webview/browser/pre/index.html | 8 |
2 files changed, 9 insertions, 5 deletions
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 @@ <meta charset="UTF-8"> <meta http-equiv="Content-Security-Policy" - content="default-src 'none'; script-src 'sha256-31a+qtoOhPC136ibtip6gpqSiW72yo48kmtxyi0Qptc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> + content="default-src 'none'; script-src 'sha256-JpX/ganPoxpavjxWCz9DUZgwVZ59o2lwSYTQrziPsdU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';"> <!-- Disable pinch zooming --> <meta name="viewport" @@ -1071,8 +1071,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; } |