From 5f204d17b8e2accb3bced2e6842b371de2151719 Mon Sep 17 00:00:00 2001 From: Sascha Dais <41467575+roggenbrot@users.noreply.github.com> Date: Wed, 22 Jul 2020 09:35:33 +0200 Subject: [PATCH] Fixed webview script uri resolution --- src/worker/getUserInput.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/worker/getUserInput.ts b/src/worker/getUserInput.ts index 8261c98..2e544c5 100644 --- a/src/worker/getUserInput.ts +++ b/src/worker/getUserInput.ts @@ -54,11 +54,6 @@ export default function getUserInput( const destDirRelativePath = relative(workspacePath, destDir); const templateName = template.name; - function resolveUri(diskPath: string): Uri { - const diskUri = Uri.file(resolvePath(extensionContext.extensionPath, diskPath)); - return diskUri.with({ scheme: 'vscode-resource' }); - } - return new Promise((resolve): void => { const panel = window.createWebviewPanel( 'codeTemplateVariablesSetter', @@ -80,6 +75,10 @@ export default function getUserInput( cancelOnEscape: config.userInputCancelOnEscape, }, }; + const resolveUri = (diskPath: string): Uri => { + const diskUri = Uri.file(resolvePath(extensionContext.extensionPath, diskPath)); + return panel.webview.asWebviewUri(diskUri); + } panel.webview.html = getWebviewContent(templateName, userInputRequest, resolveUri); panel.webview.onDidReceiveMessage(response => { panel.dispose();