Merge pull request #96 from raspberrypi/rustup-support

Rustup support

Author: paulober

README.md

@@ -65,6 +65,7 @@
   },
   "activationEvents": [
     "workspaceContains:./pico_sdk_import.cmake",
+    "workspaceContains:./.pico-rs",
     "onWebviewPanel:newPicoProject",
     "onWebviewPanel:newPicoMicroPythonProject"
   ],
@@ -79,20 +80,26 @@
         "command": "raspberry-pi-pico.switchSDK",
         "title": "Switch Pico SDK",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
       },
       {
         "command": "raspberry-pi-pico.switchBoard",
         "title": "Switch Board",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
       },
       {
         "command": "raspberry-pi-pico.launchTargetPath",
         "title": "Get path of the project executable",
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.launchTargetPathRelease",
+        "title": "Get path of the project release executable (rust only)",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.getPythonPath",
         "title": "Get python path",
@@ -147,6 +154,18 @@
         "category": "Raspberry Pi Pico",
         "enablement": "false"
       },
+      {
+        "command": "raspberry-pi-pico.getOpenOCDRoot",
+        "title": "Get OpenOCD root",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
+      {
+        "command": "raspberry-pi-pico.getSVDPath",
+        "title": "Get SVD Path (rust only)",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
       {
         "command": "raspberry-pi-pico.compileProject",
         "title": "Compile Pico Project",
@@ -185,13 +204,13 @@
         "command": "raspberry-pi-pico.configureCmake",
         "title": "Configure CMake",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
       },
       {
         "command": "raspberry-pi-pico.switchBuildType",
         "title": "Switch Build Type",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
       },
       {
         "command": "raspberry-pi-pico.importProject",
@@ -217,13 +236,31 @@
         "command": "raspberry-pi-pico.flashProject",
         "title": "Flash Pico Project (SWD)",
         "category": "Raspberry Pi Pico",
-        "enablement": "raspberry-pi-pico.isPicoProject"
+        "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
       },
       {
         "command": "raspberry-pi-pico.cleanCmake",
         "title": "Clean CMake",
         "category": "Raspberry Pi Pico",
         "enablement": "raspberry-pi-pico.isPicoProject && !raspberry-pi-pico.isRustProject"
+      },
+      {
+        "command": "raspberry-pi-pico.getRTTDecoderPath",
+        "title": "Get RTT Decoder module path",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
+      {
+        "command": "raspberry-pi-pico.sbomTargetPathDebug",
+        "title": "Get path of the project debug SBOM (rust only)",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
+      },
+      {
+        "command": "raspberry-pi-pico.sbomTargetPathRelease",
+        "title": "Get path of the project release SBOM (rust only)",
+        "category": "Raspberry Pi Pico",
+        "enablement": "false"
       }
     ],
     "configuration": {
@@ -331,6 +368,7 @@
     "got": "^14.4.7",
     "ini": "^5.0.0",
     "rimraf": "^6.0.1",
+    "toml": "^3.0.0",
     "undici": "^6.21.0",
     "uuid": "^11.1.0",
     "which": "^5.0.0"

package-lock.json

@@ -3,7 +3,9 @@ import { EventEmitter } from "events";
 import { CommandWithResult } from "./command.mjs";
 import Logger from "../logger.mjs";
 import Settings, { SettingsKey } from "../settings.mjs";
+import State from "../state.mjs";
 import { cmakeToolsForcePicoKit } from "../utils/cmakeToolsUtil.mjs";
+
 export default class CompileProjectCommand extends CommandWithResult<boolean> {
   private _logger: Logger = new Logger("CompileProjectCommand");
 
@@ -14,13 +16,18 @@ export default class CompileProjectCommand extends CommandWithResult<boolean> {
   }
 
   async execute(): Promise<boolean> {
+    const isRustProject = State.getInstance().isRustProject;
+
     // Get the task with the specified name
     const task = (await tasks.fetchTasks()).find(
-      task => task.name === "Compile Project"
+      task =>
+        task.name ===
+        (isRustProject ? "Build + Generate SBOM (release)" : "Compile Project")
     );
 
     const settings = Settings.getInstance();
     if (
+      !isRustProject &&
       settings !== undefined &&
       settings.getBoolean(SettingsKey.useCmakeTools)
     ) {

package.json

@@ -1,6 +1,8 @@
-import { Command } from "./command.mjs";
+import { Command, extensionName } from "./command.mjs";
 import Logger from "../logger.mjs";
-import { commands } from "vscode";
+import { commands, window, workspace, debug } from "vscode";
+import State from "../state.mjs";
+import DebugLayoutCommand from "./debugLayout.mjs";
 
 /**
  * Relay command for the default buildin debug select and start command.
@@ -16,6 +18,23 @@ export default class ConditionalDebuggingCommand extends Command {
   }
 
   async execute(): Promise<void> {
+    const isRustProject = State.getInstance().isRustProject;
+
+    if (isRustProject) {
+      const wsFolder = workspace.workspaceFolders?.[0];
+      if (!wsFolder) {
+        this._logger.error("No workspace folder found.");
+        void window.showErrorMessage("No workspace folder found.");
+
+        return;
+      }
+
+      void commands.executeCommand(`${extensionName}.${DebugLayoutCommand.id}`);
+      void debug.startDebugging(wsFolder, "Pico Debug (probe-rs)");
+
+      return;
+    }
+
     await commands.executeCommand("workbench.action.debug.selectandstart");
   }
 }