Log when encountering invalid json in vscode-context

Fixes microsoft#156416
mjbvz · Jul 27, 2022 · 3098951 · 3098951
1 parent 8f25356
commit 3098951
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -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
@@ -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;
 						}