update quickstart to fix switching presets (#4494)

Author: gcampbell-msft

CHANGELOG.md

@@ -30,6 +30,7 @@ Bug Fixes:
 - Fix ENOENT error at vscode startup on some circumstances [#2855](https://github.com/microsoft/vscode-cmake-tools/issues/2855) Contributed by STMicroelectronics
 - Fix repeat execution option in test presets [#4443](https://github.com/microsoft/vscode-cmake-tools/issues/4443)
 - Fix bug that makes some build hang [#4424](https://github.com/microsoft/vscode-cmake-tools/issues/4424) and [#4465](https://github.com/microsoft/vscode-cmake-tools/issues/4465)
+- Fix issue with switching to presets during Quick Start. [#4409](https://github.com/microsoft/vscode-cmake-tools/issues/4409)
 
 ## 1.20.53
 

src/cmakeProject.ts

@@ -1295,9 +1295,8 @@ export class CMakeProject {
         if (useCMakePresets === undefined) {
             useCMakePresets = this.workspaceContext.config.useCMakePresets;
         }
-        this._useCMakePresets = useCMakePresets === 'always' ? true : useCMakePresets === 'never' ? false : await this.hasPresetsFiles();
+        const usingCMakePresets = useCMakePresets === 'always' ? true : useCMakePresets === 'never' ? false : await this.hasPresetsFiles();
 
-        const usingCMakePresets = this.useCMakePresets;
         if (usingCMakePresets !== this.wasUsingCMakePresets) {
             this.wasUsingCMakePresets = usingCMakePresets;
             await this.setUseCMakePresets(usingCMakePresets);
@@ -3111,6 +3110,7 @@ export class CMakeProject {
         // Regardless of the following configure return code,
         // we want full feature set view for the whole workspace.
         await enableFullFeatureSet(true);
+        await this.doUseCMakePresetsChange();
         return (await this.configureInternal(ConfigureTrigger.quickStart, [], ConfigureType.Normal)).result;
     }
 
@@ -3148,13 +3148,13 @@ export class CMakeProject {
         }
 
         const targetType = await vscode.window.showQuickPick([
-            {
-                label: 'Library',
-                description: localize('create.library', 'Create a library')
-            },
             {
                 label: 'Executable',
                 description: localize('create.executable', 'Create an executable')
+            },
+            {
+                label: 'Library',
+                description: localize('create.library', 'Create a library')
             }
         ]);
 
@@ -3163,13 +3163,13 @@ export class CMakeProject {
         }
 
         const addlOptions = (await vscode.window.showQuickPick([
-            {
-                label: 'CPack',
-                description: localize('cpack.support', 'CPack support')
-            },
             {
                 label: 'CTest',
                 description: localize('ctest.support', 'CTest support')
+            },
+            {
+                label: 'CPack',
+                description: localize('cpack.support', 'CPack support')
             }
         ], { canPickMany: true, placeHolder: localize('select.additional.options', 'Select additional options') }));
 

src/presets/presetsController.ts

@@ -196,17 +196,19 @@ export class PresetsController implements vscode.Disposable {
             });
         }
         items.push({
-            name: SpecialOptions.ToolchainFile,
-            label: localize('toolchain.file', 'Toolchain File'),
-            description: localize('description.toolchain.file', 'Configure with a CMake toolchain file')
-        }, {
-            name: SpecialOptions.Custom,
-            label: localize('custom.config.preset', 'Custom'),
-            description: localize('description.custom.config.preset', 'Add a custom configure preset')
-        }, {
             name: SpecialOptions.CreateFromCompilers,
             label: localize('create.from.compilers', 'Create from Compilers'),
             description: localize('description.create.from.compilers', 'Create from a pair of compilers on this computer')
+        },
+        {
+            name: SpecialOptions.Custom,
+            label: localize('custom.config.preset', 'Custom'),
+            description: localize('description.custom.config.preset', 'Add a custom configure preset')
+        },
+        {
+            name: SpecialOptions.ToolchainFile,
+            label: localize('toolchain.file', 'Toolchain File'),
+            description: localize('description.toolchain.file', 'Configure with a CMake toolchain file')
         });
 
         const chosenItem = await vscode.window.showQuickPick(items,