Switch to using asWebviewUri instead of vscode-resource (#6041)

Colengms · web-flow · commit e621e98595f8 · 2020-08-27T17:42:00.000-07:00
diff --git a/Extension/src/LanguageServer/settingsPanel.ts b/Extension/src/LanguageServer/settingsPanel.ts
@@ -356,11 +356,16 @@ export class SettingsPanel {
 
         content = fs.readFileSync(util.getLocalizedHtmlPath("ui/settings.html")).toString();
 
-        content = content.replace(
-            /{{root}}/g,
-            vscode.Uri.file(util.extensionPath)
-                .with({ scheme: 'vscode-resource' })
-                .toString());
+        if (this.panel && this.panel.webview) {
+            const cppImageUri: vscode.Uri = this.panel.webview.asWebviewUri(vscode.Uri.file(path.join(util.extensionPath, 'LanguageCCPP_color_128x.png')));
+            content = content.replace(
+                /{{cpp_image_uri}}/g,
+                cppImageUri.toString());
+            const settingsJsUri: vscode.Uri = this.panel.webview.asWebviewUri(vscode.Uri.file(path.join(util.extensionPath, 'out/ui/settings.js')));
+            content = content.replace(
+                /{{settings_js_uri}}/g,
+                settingsJsUri.toString());
+        }
 
         content = content.replace(
             /{{nonce}}/g,
diff --git a/Extension/ui/settings.html b/Extension/ui/settings.html
@@ -3,7 +3,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <meta http-equiv="Content-Security-Policy" content="style-src 'unsafe-inline'; img-src vscode-resource:; script-src 'nonce-{{nonce}}';">
+    <meta http-equiv="Content-Security-Policy" content="style-src 'unsafe-inline'; script-src 'nonce-{{nonce}}';">
 
     <style type="text/css">
         @media (max-width: 1140px) {
@@ -404,7 +404,7 @@
     <div style="height: 90px; display: block">
         <table>
             <td>
-              <img src="{{root}}/LanguageCCPP_color_128x.png" height="76" width="76" alt="Microsoft C/C++ Extension" title="Microsoft C/C++ Extension" style="padding-right: 10px" data-loc-id-title="microsoft.c.cpp.extension">
+              <img src="{{cpp_image_uri}}" height="76" width="76" alt="Microsoft C/C++ Extension" title="Microsoft C/C++ Extension" style="padding-right: 10px" data-loc-id-title="microsoft.c.cpp.extension">
             </td>
             <td>
                 <div style="font-size: 20px; font-weight: 400; line-height: 24px">Microsoft<br><span data-loc-id="c.cpp.extension">C/C++ Extension</span></div>
@@ -676,7 +676,7 @@
 
   </div> <!-- main end -->
 
-  <script nonce="{{nonce}}" src="{{root}}/out/ui/settings.js"></script>
+  <script nonce="{{nonce}}" src="{{settings_js_uri}}"></script>
 
 </body>
 </html>
