Move CMake Tools option out of advanced settings

will-v-pi · will-v-pi · commit 4cbb4fb341a5 · 2025-03-17T14:42:43.000Z
Also make it persistent like entry point naming preferences, and make both update whenever toggled, rather than only updating when projects are created
diff --git a/src/settings.mts b/src/settings.mts
@@ -34,6 +34,7 @@ export type GlobalStateType = Memento & {
 
 const LAST_PROJECT_ROOT_STATE_KEY = "lastProjectRoot";
 const ENTRY_POINT_NAMING_PREF = "entryPointNamingPref";
+const CMAKE_TOOLS_PREF = "cmakeToolsPref";
 
 export default class Settings {
   private static instance?: Settings;
@@ -149,4 +150,12 @@ export default class Settings {
   public getEntryPointNamingPref(): boolean {
     return this.globalState.get<boolean>(ENTRY_POINT_NAMING_PREF, true);
   }
+
+  public async setCMakeToolsPref(useCMakeTools: boolean): Promise<void> {
+    await this.globalState.update(CMAKE_TOOLS_PREF, useCMakeTools);
+  }
+
+  public getCMakeToolsPref(): boolean {
+    return this.globalState.get<boolean>(CMAKE_TOOLS_PREF, false);
+  }
 }
diff --git a/src/webview/newProjectPanel.mts b/src/webview/newProjectPanel.mts
@@ -120,7 +120,8 @@ interface SubmitMessageValue extends ImportProjectMessageValue {
 
 export interface WebviewMessage {
   command: string;
-  value: object | string | SubmitMessageValue;
+  value: object | string | SubmitMessageValue | boolean;
+  key?: string;
 }
 
 enum BoardType {
@@ -768,6 +769,20 @@ export class NewProjectPanel {
               );
             }
             break;
+          case 'updateSetting':
+            {
+              const key = message.key as string;
+              const value = message.value as boolean;
+              switch (key) {
+                case "cmakeTools":
+                  await this._settings.setCMakeToolsPref(value);
+                  break;
+                case "entryProjectName":
+                  await this._settings.setEntryPointNamingPref(value);
+                  break;
+              }
+            }
+            break;
         }
       },
       null,
@@ -1633,8 +1648,11 @@ export class NewProjectPanel {
     // Restrict the webview to only load specific scripts
     const nonce = getNonce();
     const isWindows = process.platform === "win32";
+
+    // Get the default values from global state
     const useProjectNameAsEntryPointFileName =
       this._settings.getEntryPointNamingPref();
+    const defaultUseCmakeTools = this._settings.getCMakeToolsPref();
 
     return `<!DOCTYPE html>
     <html lang="en">
@@ -2163,11 +2181,15 @@ export class NewProjectPanel {
                         </div>
                     </div>
                 </div>
-                <div id="section-extension-integration" class="snap-end advanced-option" hidden>
+                <div id="section-extension-integration" class="snap-end">
                   <h3 class="text-xl font-semibold text-gray-900 dark:text-white mb-8">CMake Tools</h3>
                   <div class="flex items-stretch space-x-4">
                       <div class="flex items-center px-4 py-2 border border-gray-200 rounded dark:border-gray-700">
-                          <input id="use-cmake-tools-cb" type="checkbox" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 outline-none focus:ring-0 focus:ring-offset-5 dark:bg-gray-700 dark:border-gray-600">
+                          <input id="use-cmake-tools-cb" type="checkbox" class="w-4 h-4 text-blue-600 bg-gray-100 border-gray-300 outline-none focus:ring-0 focus:ring-offset-5 dark:bg-gray-700 dark:border-gray-600" ${
+                            defaultUseCmakeTools
+                              ? 'checked'
+                              : ''
+                            }>
                           <label for="use-cmake-tools-cb" class="w-full py-4 ml-2 text-sm font-medium text-gray-900 dark:text-gray-300">Enable CMake-Tools extension integration</label>
                       </div>
                   </div>
diff --git a/web/state.js b/web/state.js
@@ -401,6 +401,12 @@ function setupStateSystem(vscode) {
             break;
           case "entry-project-name-code-gen-cblist":
             state.entryProjectNameCodeGen = checkbox.checked;
+            // Send message to update the global preference
+            vscode.postMessage({
+              command: 'updateSetting',
+              key: 'entryProjectName',
+              value: checkbox.checked
+            });
             break;
           case "cpp-code-gen-cblist":
             state.cppCodeGen = checkbox.checked;
@@ -416,6 +422,12 @@ function setupStateSystem(vscode) {
             break;
           case "use-cmake-tools-cb":
             state.useCMakeTools = checkbox.checked;
+            // Send message to update the global preference
+            vscode.postMessage({
+              command: 'updateSetting',
+              key: 'cmakeTools',
+              value: checkbox.checked
+            });
             break;
         }
 
