Add support for updating system zephyr version

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

Author: paulober

.vscode/launch.json

@@ -13,7 +13,7 @@
 				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
 			"outFiles": [
-				"${workspaceFolder}/dist/**/*.js"
+				"${workspaceFolder}/dist/extension.js"
 			],
 			"preLaunchTask": "${defaultBuildTask}"
 		}

src/commands/getPaths.mts

@@ -631,6 +631,7 @@ export class GetZephyrSDKPathCommand extends CommandWithResult<
     try {
       await workspace.fs.stat(workspaceUri);
       const contents = await workspace.fs.readDirectory(workspaceUri);
+      // TODO: get zephr version form west manifest and sdk_version from zephyr directory
       const sdksDirectories = contents
         .filter(
           entry =>

src/commands/switchSDK.mts

@@ -5,13 +5,15 @@ import {
   window,
   workspace,
   commands,
+  type WorkspaceFolder,
 } from "vscode";
 import type UI from "../ui.mjs";
 import { updateVSCodeStaticConfigs } from "../utils/vscodeConfigUtil.mjs";
 import {
   getCmakeReleases,
   getNinjaReleases,
   getSDKReleases,
+  getZephyrReleases,
 } from "../utils/githubREST.mjs";
 import {
   downloadAndInstallCmake,
@@ -39,6 +41,9 @@ import Logger from "../logger.mjs";
 import type { Progress as GotProgress } from "got";
 import { SWITCH_SDK } from "./cmdIds.mjs";
 import { SDK_REPOSITORY_URL } from "../utils/sharedConstants.mjs";
+import State from "../state.mjs";
+import { compare, compareGe } from "../utils/semverUtil.mjs";
+import { updateZephyrVersion } from "../utils/setupZephyr.mjs";
 
 const DEFAULT_PICOTOOL_VERSION = "2.2.0-a4";
 
@@ -392,6 +397,60 @@ export default class SwitchSDKCommand extends Command {
     };
   }
 
+  private async switchZephyr(): Promise<void> {
+    const releases = await getZephyrReleases();
+    if (releases.length === 0) {
+      void window.showErrorMessage(
+        "Failed to get Zephyr releases. " +
+          "Make sure you are connected to the internet."
+      );
+
+      return;
+    }
+
+    // sort releases and filter out anything older than v4.2.0
+    const core = (v: string): string => v.replace(/^v/, "").split("-")[0];
+    const filtered = releases.filter(v => compareGe(core(v), "4.2.0"));
+
+    // sort DESC newest first
+    const sorted = filtered.sort((a, b) => {
+      const byCore = compare(core(b), core(a)); // flip for descending
+      if (byCore !== 0) {
+        return byCore;
+      }
+      const aPre = a.includes("-");
+      const bPre = b.includes("-");
+      if (aPre !== bPre) {
+        return aPre ? 1 : -1;
+      } // stable before prerelease
+
+      return 0;
+    });
+
+    const selectedVersion = await window.showQuickPick(
+      [{ label: "main" }, ...sorted.map(v => ({ label: v }))],
+      {
+        placeHolder: "Select Zephyr version",
+      }
+    );
+
+    if (selectedVersion === undefined) {
+      return;
+    }
+
+    const result = await updateZephyrVersion(selectedVersion.label);
+    if (result) {
+      this._ui.updateSDKVersion(selectedVersion.label.replace("v", ""));
+      // for reload the window
+      void commands.executeCommand("workbench.action.reloadWindow");
+    } else {
+      void window.showErrorMessage(
+        `Failed to switch to Zephyr version ${selectedVersion.label}. ` +
+          "Make sure all requirements are met."
+      );
+    }
+  }
+
   async execute(): Promise<void> {
     if (
       workspace.workspaceFolders === undefined ||
@@ -404,6 +463,11 @@ export default class SwitchSDKCommand extends Command {
 
     const workspaceFolder = workspace.workspaceFolders[0];
 
+    const isZephyrProject = State.getInstance().isZephyrProject;
+    if (isZephyrProject) {
+      return this.switchZephyr();
+    }
+
     const selectedSDK = await SwitchSDKCommand.askSDKVersion(
       this._versionBundlesLoader
     );

src/extension.mts

@@ -109,7 +109,9 @@ import VersionBundlesLoader from "./utils/versionBundles.mjs";
 import { unknownErrorToString } from "./utils/errorHelper.mjs";
 import {
   getBoardFromZephyrProject,
+  getZephyrVersion,
   setupZephyr,
+  updateZephyrCompilerPath,
 } from "./utils/setupZephyr.mjs";
 import { IMPORT_PROJECT } from "./commands/cmdIds.mjs";
 import {
@@ -438,6 +440,27 @@ export async function activate(context: ExtensionContext): Promise<void> {
       State.getInstance().isZephyrProject = true;
 
       ui.showStatusBarItems(false, true);
+      const selectedZephyrVersion = await getZephyrVersion();
+      if (selectedZephyrVersion === undefined) {
+        Logger.error(
+          LoggerSource.extension,
+          "Failed to get selected system Zephyr version. Defaulting to main."
+        );
+      }
+      ui.updateSDKVersion(selectedZephyrVersion ?? "main");
+
+      const cppCompilerUpdated = await updateZephyrCompilerPath(
+        workspaceFolder.uri,
+        selectedZephyrVersion ?? "main"
+      );
+
+      if (!cppCompilerUpdated) {
+        void window.showErrorMessage(
+          "Failed to update C++ compiler path in c_cpp_properties.json"
+        );
+
+        // TODO: maybe cancel activation
+      }
 
       // Update the board info if it can be found in tasks.json
       const tasksJsonFilePath = join(

src/ui.mts

@@ -21,8 +21,10 @@ const STATUS_BAR_ITEMS: {
   [key: string]: {
     text: string;
     rustText?: string;
+    zephyrText?: string;
     command: string;
     tooltip: string;
+    zephyrTooltip?: string;
     rustSupport: boolean;
     zephyrSupport: boolean;
   };
@@ -45,15 +47,16 @@ const STATUS_BAR_ITEMS: {
   },
   [StatusBarItemKey.picoSDKQuickPick]: {
     text: "Pico SDK: <version>",
+    zephyrText: "Zephyr version: <version>",
     command: `${extensionName}.${SWITCH_SDK}`,
     tooltip: "Select Pico SDK",
+    zephyrTooltip: "Select system wide installed zephyr version",
     rustSupport: false,
-    zephyrSupport: false,
+    zephyrSupport: true,
   },
   [StatusBarItemKey.picoBoardQuickPick]: {
     text: "Board: <board>",
     rustText: "Chip: <chip>",
-    // TODO: zephyrCommand option to zwphyr switch borad command or merge them that better
     command: `${extensionName}.${SWITCH_BOARD}`,
     tooltip: "Select Chip",
     rustSupport: true,
@@ -91,13 +94,32 @@ export default class UI {
       .filter(
         item => !isZephyrProject || STATUS_BAR_ITEMS[item.id].zephyrSupport
       )
-      .forEach(item => item.show());
+      .forEach(item => {
+        if (isZephyrProject) {
+          if (STATUS_BAR_ITEMS[item.id].zephyrText) {
+            item.text = STATUS_BAR_ITEMS[item.id].zephyrText!;
+          }
+          if (STATUS_BAR_ITEMS[item.id].zephyrTooltip) {
+            item.tooltip = STATUS_BAR_ITEMS[item.id].zephyrTooltip;
+          }
+        }
+        item.show();
+      });
   }
 
   public updateSDKVersion(version: string): void {
-    this._items[StatusBarItemKey.picoSDKQuickPick].text = STATUS_BAR_ITEMS[
-      StatusBarItemKey.picoSDKQuickPick
-    ].text.replace("<version>", version);
+    const isZephyrProject = State.getInstance().isZephyrProject;
+    let template = STATUS_BAR_ITEMS[StatusBarItemKey.picoSDKQuickPick].text;
+
+    if (isZephyrProject) {
+      template =
+        STATUS_BAR_ITEMS[StatusBarItemKey.picoSDKQuickPick].zephyrText!;
+    }
+
+    this._items[StatusBarItemKey.picoSDKQuickPick].text = template.replace(
+      "<version>",
+      version
+    );
     this._activityBarProvider.refreshSDK(version);
   }
 

src/utils/cmakeToolsUtil.mts

@@ -1,13 +1,13 @@
 import { commands, extensions, window, ProgressLocation } from "vscode";
 import Logger, { LoggerSource } from "../logger.mjs";
 
-
 export async function cmakeToolsForcePicoKit(): Promise<void> {
   // Check if the CMake Tools extension is installed and active
   let foundCmakeToolsExtension = false;
   for (let i = 0; i < 2; i++) {
-    const cmakeToolsExtension =
-      extensions.getExtension("ms-vscode.cmake-tools");
+    const cmakeToolsExtension = extensions.getExtension(
+      "ms-vscode.cmake-tools"
+    );
     if (cmakeToolsExtension !== undefined) {
       Logger.debug(
         LoggerSource.cmake,
@@ -21,11 +21,11 @@ export async function cmakeToolsForcePicoKit(): Promise<void> {
 
       // Attempt to activate the extension
       const onActivate = cmakeToolsExtension.activate();
-      const onTimeout = new Promise<string>((resolve) => {
+      const onTimeout = new Promise<string>(resolve => {
         setTimeout(resolve, 2000, "timeout");
       });
 
-      await Promise.race([onActivate, onTimeout]).then((value) => {
+      await Promise.race([onActivate, onTimeout]).then(value => {
         if (value === "timeout") {
           Logger.warn(
             LoggerSource.cmake,
@@ -38,65 +38,58 @@ export async function cmakeToolsForcePicoKit(): Promise<void> {
       });
     } else {
       // Undefined if not installed/disabled
-      Logger.debug(
-        LoggerSource.cmake,
-        `cmakeToolsExtension: undefined`
-      );
+      Logger.debug(LoggerSource.cmake, `cmakeToolsExtension: undefined`);
       break;
     }
     await new Promise(resolve => setTimeout(resolve, 1000));
   }
 
   if (!foundCmakeToolsExtension) {
     // Give up and return, as this function is non-essential
-    Logger.warn(
-      LoggerSource.cmake,
-      "cmakeToolsExtension not available yet"
-    );
+    Logger.warn(LoggerSource.cmake, "cmakeToolsExtension not available yet");
 
     return;
   }
 
-  let cmakeToolsKit = await commands.executeCommand(
-    "cmake.buildKit"
-  );
+  let cmakeToolsKit = await commands.executeCommand("cmake.buildKit");
   if (cmakeToolsKit === "Pico") {
     return;
   }
 
-  await window.withProgress({
-    location: ProgressLocation.Notification,
-    title: "Select the Pico kit in the dialog at the top of the window",
-    cancellable: false,
-  }, async progress => {
-    let i = 0;
-    while (cmakeToolsKit !== "Pico") {
-      if (i >= 2) {
-        const result = await window.showErrorMessage(
-          "You did not select the Pico kit - " +
-          "you must select the Pico kit in the dialog, " +
-          "else this extension will not work",
-          "Try again",
-          "Cancel"
-        );
+  await window.withProgress(
+    {
+      location: ProgressLocation.Notification,
+      title: "Select the Pico kit in the dialog at the top of the window",
+      cancellable: false,
+    },
+    async progress => {
+      let i = 0;
+      while (cmakeToolsKit !== "Pico") {
+        if (i >= 2) {
+          const result = await window.showErrorMessage(
+            "You did not select the Pico kit - " +
+              "you must select the Pico kit in the dialog, " +
+              "else this extension will not work",
+            "Try again",
+            "Cancel"
+          );
 
-        if (result === "Try again") {
-          i = 0;
-          continue;
-        }
+          if (result === "Try again") {
+            i = 0;
+            continue;
+          }
 
-        progress.report({increment: 100});
+          progress.report({ increment: 100 });
 
-        return;
+          return;
+        }
+        await commands.executeCommand("cmake.selectKit");
+        cmakeToolsKit = await commands.executeCommand("cmake.buildKit");
+        i++;
       }
-      await commands.executeCommand("cmake.selectKit");
-      cmakeToolsKit = await commands.executeCommand(
-        "cmake.buildKit"
-      );
-      i++;
-    }
-    progress.report({increment: 100});
+      progress.report({ increment: 100 });
 
-    return;
-  });
+      return;
+    }
+  );
 }

src/utils/githubREST.mts

@@ -239,6 +239,10 @@ async function getReleases(repository: GithubRepository): Promise<string[]> {
   }
 }
 
+export async function getZephyrReleases(): Promise<string[]> {
+  return getReleases(GithubRepository.zephyr);
+}
+
 export async function getSDKReleases(): Promise<string[]> {
   return getReleases(GithubRepository.picoSDK);
 }