From 5da3a00f62671f3c90cc644af6ea51824ddbde0e Mon Sep 17 00:00:00 2001 From: Karthik Nadig Date: Tue, 10 May 2022 15:47:33 -0700 Subject: [PATCH] Use extensionUrl instead of extensionPath --- src/client/browser/extension.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/client/browser/extension.ts b/src/client/browser/extension.ts index c9f7ff9cb9e9..4939e4e75f8b 100644 --- a/src/client/browser/extension.ts +++ b/src/client/browser/extension.ts @@ -47,20 +47,18 @@ async function runPylance( context: vscode.ExtensionContext, pylanceExtension: vscode.Extension, ): Promise { - const { extensionPath, packageJSON } = pylanceExtension; - const distUrl = `${extensionPath}/dist`; + const { extensionUri, packageJSON } = pylanceExtension; + const distUrl = vscode.Uri.joinPath(extensionUri, 'dist'); try { - const worker = new Worker(`${distUrl}/browser.server.bundle.js`); + const worker = new Worker(vscode.Uri.joinPath(distUrl, 'browser.server.bundle.js').toString()); // Pass the configuration as the first message to the worker so it can // have info like the URL of the dist folder early enough. // // This is the same method used by the TS worker: // https://github.com/microsoft/vscode/blob/90aa979bb75a795fd8c33d38aee263ea655270d0/extensions/typescript-language-features/src/tsServer/serverProcess.browser.ts#L55 - const config: BrowserConfig = { - distUrl, - }; + const config: BrowserConfig = { distUrl: distUrl.toString() }; worker.postMessage(config); const middleware = new LanguageClientMiddlewareBase(