Fix wsl rdb bugs (#478)

* Fix wsl rdb bugs * Fix package.json local refs * Fix wording * restore package-lock * Fix package-lock (again) * Fix unit tests
rokucommunity · Apr 27, 2023 · 5a557b0 · 5a557b0
1 parent 32706e6
commit 5a557b0
Show file tree

Hide file tree

Showing 8 changed files with 2,629 additions and 1,377 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/mockVscode.spec.ts b/src/mockVscode.spec.ts
@@ -164,7 +164,11 @@ export let vscode = {
         },
         onDidChangeTextEditorSelection: () => { },
         registerUriHandler: () => { },
-        registerWebviewViewProvider: () => { },
+        registerWebviewViewProvider: () => {
+            return {
+                asWebViewUri: () => { }
+            };
+        },
         showSaveDialog: () => {
             return Promise.resolve('');
         },

diff --git a/src/viewProviders/BaseWebviewViewProvider.ts b/src/viewProviders/BaseWebviewViewProvider.ts
@@ -135,6 +135,17 @@ export abstract class BaseWebviewViewProvider implements vscode.WebviewViewProvi
         return this.getIndexHtml();
     }
 
+    /**
+    * Get a webview-supported URI for the given path
+    */
+    private asWebviewUri(...parts: string[]) {
+        return this.view?.webview?.asWebviewUri?.(
+            vscode.Uri.file(
+                path.join(...parts)
+            )
+        );
+    }
+
     private getIndexHtml() {
         let html: string;
         try {
@@ -146,7 +157,7 @@ export abstract class BaseWebviewViewProvider implements vscode.WebviewViewProvi
         //the data that will be replaced in the index.html
         const data = {
             viewName: this.id,
-            baseHref: vscode.Uri.file(this.webviewBasePath).with({ scheme: 'vscode-resource' }) + '/',
+            baseHref: `${this.asWebviewUri(this.webviewBasePath)}/`,
             additionalScriptContents: this.additionalScriptContents().join('\n                        ')
         };
         /**