Fix extension URIs/paths

Signed-off-by: paulober <[email protected]>

Author: paulober

src/activator.mts

@@ -21,10 +21,9 @@ import Stubs, {
 } from "./stubs.mjs";
 import Settings, { SettingsKey } from "./settings.mjs";
 import Logger from "./logger.mjs";
-import { basename, dirname, extname, join } from "path";
+import { basename, extname, join } from "path";
 import { PicoRemoteFileSystem } from "./filesystem.mjs";
 import { Terminal } from "./terminal.mjs";
-import { fileURLToPath } from "url";
 import { ContextKeys } from "./models/contextKeys.mjs";
 import DeviceWifiProvider from "./activitybar/deviceWifiTree.mjs";
 import PackagesWebviewProvider from "./activitybar/packagesWebview.mjs";
@@ -100,7 +99,7 @@ export default class Activator {
       true
     );
 
-    this.stubs = new Stubs();
+    this.stubs = new Stubs(context.extensionUri);
     await this.stubs.update(this.settings);
 
     const workspaceFolder = vscode.workspace.workspaceFolders;
@@ -275,13 +274,10 @@ export default class Activator {
 
     this.terminalOptions = {
       name: TERMINAL_NAME,
-      iconPath: vscode.Uri.file(
-        join(
-          dirname(fileURLToPath(import.meta.url)),
-          "..",
-          "images",
-          "logo-256.png"
-        )
+      iconPath: vscode.Uri.joinPath(
+        context.extensionUri,
+        "images",
+        "logo-256.png"
       ),
       isTransient: true,
       pty: this.terminal,
@@ -1246,7 +1242,7 @@ export default class Activator {
             enableScripts: false,
             // Only allow the webview to access resources in our extension's media directory
             localResourceRoots: [
-              vscode.Uri.file(join(context.extensionPath, "images")),
+              vscode.Uri.joinPath(context.extensionUri, "images"),
             ],
           }
         );

src/stubs.mts

@@ -1,4 +1,4 @@
-import { commands, window } from "vscode";
+import { commands, Uri, window } from "vscode";
 import { join } from "path";
 import {
   getProjectPath,
@@ -28,7 +28,7 @@ import { strict as assert } from "assert";
 export default class Stubs {
   private logger: Logger;
 
-  constructor() {
+  constructor(private readonly extensionUri: Uri) {
     this.logger = new Logger("Stubs");
   }
 
@@ -39,6 +39,7 @@ export default class Stubs {
    */
   public async update(settings: Settings): Promise<void> {
     const installedStubsFolder = getStubsPathForVersion("included");
+    const currentFolder = Uri.joinPath(this.extensionUri, "mpy_stubs").fsPath;
 
     if (!(await pathExists(join(installedStubsFolder, "version.json")))) {
       // ensure config folder exists
@@ -57,8 +58,6 @@ export default class Stubs {
         }
       }
 
-      const currentFolder = join(__dirname, "..", "mpy_stubs");
-
       if (await pathExists(currentFolder)) {
         const currentMatchingFolders = (await readdir(currentFolder)).filter(
           name => /micropython_rp2.*\.dist-info/.exec(name)
@@ -86,7 +85,7 @@ export default class Stubs {
     try {
       // update stubs folder
       await emptyDir(installedStubsFolder);
-      await copy(join(__dirname, "..", "mpy_stubs"), installedStubsFolder);
+      await copy(currentFolder, installedStubsFolder);
 
       this.logger.info("Updated stubs successfully!");