Fix #235, Zephyr CMakeLists project prefix detection

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

Author: paulober

src/extension.mts

@@ -101,6 +101,7 @@ import { cmakeToolsForcePicoKit } from "./utils/cmakeToolsUtil.mjs";
 import { NewRustProjectPanel } from "./webview/newRustProjectPanel.mjs";
 import {
   CMAKELISTS_ZEPHYR_HEADER,
+  CMAKELISTS_ZEPHYR_REGEX,
   OPENOCD_VERSION,
   SDK_REPOSITORY_URL,
 } from "./utils/sharedConstants.mjs";
@@ -319,8 +320,8 @@ export async function activate(context: ExtensionContext): Promise<void> {
       await workspace.fs.readFile(Uri.file(cmakeListsFilePath))
     );
 
-    // Check for pico_zephyr in CMakeLists.txt
-    if (cmakeListsContents.startsWith(CMAKELISTS_ZEPHYR_HEADER)) {
+    // Check for zephyr pico project prefix line in CMakeLists.txt
+    if (cmakeListsContents.trimStart().match(CMAKELISTS_ZEPHYR_REGEX)) {
       Logger.info(LoggerSource.extension, "Project is of type: Zephyr");
 
       const vb = new VersionBundlesLoader(context.extensionUri);

src/utils/sharedConstants.mts

@@ -37,6 +37,7 @@ export const LICENSE_URL_7ZIP = "https://7-zip.org/license.txt";
 export const WINDOWS_X86_7ZIP_DOWNLOAD_URL = "https://www.7-zip.org/a/7zr.exe";
 
 export const CMAKELISTS_ZEPHYR_HEADER = "#pico-zephyr-project";
+export const CMAKELISTS_ZEPHYR_REGEX = /^#\s*pico-zephyr-project\s*$/mi;
 
 export const HTTP_STATUS_OK = 200;
 export const HTTP_STATUS_NOT_MODIFIED = 304;