Fix UI for settings override of package presets (#3770)

* Fix UI for settings override of package presets

* Fix linter errors

package.json

@@ -1738,7 +1738,7 @@
         },
         {
           "command": "cmake.projectStatus.selectPackagePreset",
-          "when": "view == cmake.projectStatus && cmake:enableFullFeatureSet && viewItem == 'packagePreset'",
+          "when": "view == cmake.projectStatus && cmake:enableFullFeatureSet && viewItem =~ /packagePreset/",
           "group": "inline"
         },
         {

src/drivers/cmakeDriver.ts

@@ -254,7 +254,7 @@ export abstract class CMakeDriver implements vscode.Disposable {
         for (const term of this._compileTerms.values()) {
             term.dispose();
         }
-        for (const sub of [this._settingsSub, this._argsSub, this._envSub, this._buildArgsSub, this._buildEnvSub, this._testArgsSub, this._testEnvSub, this._packEnvSub, this._generalEnvSub]) {
+        for (const sub of [this._settingsSub, this._argsSub, this._envSub, this._buildArgsSub, this._buildEnvSub, this._testArgsSub, this._testEnvSub, this._packEnvSub, this._packArgsSub, this._generalEnvSub]) {
             sub.dispose();
         }
         rollbar.invokeAsync(localize('async.disposing.cmake.driver', 'Async disposing CMake driver'), () => this.asyncDispose());
@@ -1835,6 +1835,9 @@ export abstract class CMakeDriver implements vscode.Disposable {
     private readonly _packEnvSub = this.config.onChange('cpackEnvironment', async () => {
         await onPackageSettingsChange();
     });
+    private readonly _packArgsSub = this.config.onChange('cpackArgs', async () => {
+        await onPackageSettingsChange();
+    });
     private readonly _generalEnvSub = this.config.onChange('environment', async () => {
         await this.doConfigureSettingsChange();
         await onBuildSettingsChange();

src/extension.ts

@@ -1014,9 +1014,13 @@ export class ExtensionManager implements vscode.Disposable {
         return Array.from(result);
     }
 
+    viewPackageSettings(): void {
+        void vscode.commands.executeCommand('workbench.action.openSettings', '@id:cmake.cpackArgs, @id:cmake.cpackEnvironment, @id:cmake.environment');
+    }
+
     /**
-     * Show UI to allow the user to select an active kit
-     */
+    * Show UI to allow the user to select an active kit
+    */
     async selectKit(folder?: vscode.WorkspaceFolder): Promise<boolean> {
         if (util.isTestMode()) {
             log.trace(localize('selecting.kit.in.test.mode', 'Running CMakeTools in test mode. selectKit is disabled.'));
@@ -2161,6 +2165,7 @@ async function setup(context: vscode.ExtensionContext, progress?: ProgressHandle
         'selectTestPreset',
         'viewTestSettings',
         'selectPackagePreset',
+        'viewPackageSettings',
         'selectWorkflowPreset',
         'selectActiveFolder',
         'editKits',

src/projectStatus.ts

@@ -92,6 +92,9 @@ export class ProjectStatus {
                 await runCommand('selectPackagePreset');
                 await this.refresh(node);
             }),
+            vscode.commands.registerCommand('cmake.projectStatus.viewPackageSettings', async (_node: Node) => {
+                await runCommand('viewPackageSettings');
+            }),
             vscode.commands.registerCommand('cmake.projectStatus.selectWorkflowPreset', async (node: Node) => {
                 await runCommand('selectWorkflowPreset');
                 await this.refresh(node);
@@ -668,6 +671,9 @@ class PackageNode extends Node {
         return this.initialize();
     }
 
+    async refresh(): Promise<void> {
+        await this.packagePreset?.refresh();
+    }
 }
 
 class WorkflowNode extends Node {

src/ui/util.ts

@@ -18,5 +18,5 @@ export async function onTestSettingsChange(): Promise<void> {
 
 export async function onPackageSettingsChange(): Promise<void> {
     await treeDataProvider.refreshPackageNode();
-    // No updates necessary to status bar, package/workflow presets live in Project Status View only.
+    getStatusBar()?.updatePackagePresetButton();
 }