Remove withProgress options from commands for separation of concerns

Author: edvilme

SETTINGS_ARCHITECTURE.md

@@ -1,4 +1,4 @@
-import { CancellationToken, l10n, LogOutputChannel, ProgressLocation, window, WorkspaceConfiguration } from 'vscode';
+import { CancellationToken, LogOutputChannel, WorkspaceConfiguration } from 'vscode';
 import { getConfiguration } from '../../../common/workspace.apis';
 
 /**
@@ -7,7 +7,6 @@ import { getConfiguration } from '../../../common/workspace.apis';
  */
 export interface BaseExecuteArgs {
     cancellationToken?: CancellationToken;
-    showProgress?: boolean;
 }
 
 /**
@@ -37,38 +36,6 @@ export abstract class PackageManagerCommand {
         this.config = configSection ? getConfiguration(`python-envs.packageManager.${configSection}`) : undefined;
     }
 
-    /**
-     * Executes this command and optionally wraps execution with a progress indicator.
-     */
-    public executeWithProgress<T = unknown, A extends BaseExecuteArgs = BaseExecuteArgs>(
-        executeArgs?: A,
-        title?: string,
-    ): Promise<T> {
-        if (!executeArgs?.showProgress) {
-            return this.execute(executeArgs) as Promise<T>;
-        }
-
-        return Promise.resolve(
-            window.withProgress(
-                {
-                    location: ProgressLocation.Notification,
-                    title: title ?? l10n.t('Running package manager command'),
-                    cancellable: true,
-                },
-                (_progress, token) =>
-                    this.execute({
-                        ...executeArgs,
-                        cancellationToken: executeArgs.cancellationToken ?? token,
-                    }) as Promise<T>,
-            ),
-        );
-    }
-
-    /**
-     * Subclasses implement command execution.
-     */
-    abstract execute(executeArgs?: BaseExecuteArgs): Promise<unknown>;
-
     /**
      * Subclasses implement to build the command arguments.
      */

src/managers/base/commands/packageManagerCommand.ts

@@ -21,6 +21,7 @@ import {
     PythonEnvironment,
     PythonEnvironmentApi,
 } from '../../api';
+import { withProgress } from '../../common/window.apis';
 import { CommandConstructorOptions } from '../base/commands/index';
 import { updatePackagesAndNotify } from '../common/packageChanges';
 import { createPipOrUvCommand } from './commands/factory';
@@ -100,7 +101,10 @@ export class PipPackageManager implements PackageManager, Disposable {
                     UvUninstallCommand,
                 );
                 const packages = parsePackageSpecs(toUninstall);
-                await uninstallCmd.executeWithProgress({ packages, showProgress: true }, 'Installing packages');
+                await withProgress(
+                    { location: ProgressLocation.Notification, title: 'Installing packages', cancellable: true },
+                    (_progress, token) => uninstallCmd.execute({ packages, cancellationToken: token }),
+                );
             }
 
             // Execute install if needed
@@ -111,9 +115,10 @@ export class PipPackageManager implements PackageManager, Disposable {
                     UvInstallCommand,
                 );
                 const packages = parsePackageSpecs(toInstall);
-                await installCmd.executeWithProgress(
-                    { packages, upgrade: options.upgrade, showProgress: true },
-                    'Installing packages',
+                await withProgress(
+                    { location: ProgressLocation.Notification, title: 'Installing packages', cancellable: true },
+                    (_progress, token) =>
+                        installCmd.execute({ packages, upgrade: options.upgrade, cancellationToken: token }),
                 );
             }
 

src/managers/builtin/pipPackageManager.ts

@@ -284,7 +284,7 @@ export async function getWorkspacePackagesToInstall(
                 PipListCommand,
                 UvListCommand,
             );
-            const data = await listCmd.executeWithProgress<{ name: string }[]>({ showProgress: true });
+            const data = await listCmd.execute();
             installed = data?.map((pkg) => pkg.name);
         }
         common = mergePackages(common, installed ?? []);