Update names for consistency

Author: edvilme

src/api.ts

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+import type { Pep440Version } from '@renovatebot/pep440';
 import type {
     Disposable,
     Event,
@@ -15,7 +16,6 @@ import type {
 } from 'vscode';
 
 export type { Pep440Version } from '@renovatebot/pep440';
-import type { Pep440Version } from '@renovatebot/pep440';
 
 /**
  * The path to an icon, or a theme-specific configuration of icons.
@@ -710,12 +710,15 @@ export interface PackageManager {
 
     /**
      * Retrieves the list of available versions for a given package.
-     * @param packageName - The name of the package to look up.
      * @param environment - The Python environment context for the lookup.
+     * @param packageName - The name of the package to look up.
      * @returns A promise that resolves to an array of {@link Pep440Version} objects (newest first),
      *          or `undefined` if this manager does not support version listing.
      */
-    getAvailableVersions?(packageName: string, environment: PythonEnvironment): Promise<Pep440Version[] | undefined>;
+    getPackageAvailableVersions?(
+        environment: PythonEnvironment,
+        packageName: string,
+    ): Promise<Pep440Version[] | undefined>;
 
     /**
      * Formats a versioned install specification for this package manager.

src/features/envCommands.ts

@@ -344,7 +344,7 @@ export async function managePackageVersion(context: unknown, em: EnvironmentMana
         // Try to fetch available versions for a QuickPick experience
         const availableVersions = await withProgress(
             { location: ProgressLocation.Window, title: l10n.t('Fetching available versions for {0}...', pkg.name) },
-            () => packageManager.getAvailableVersions(pkg.name, environment),
+            () => packageManager.getPackageAvailableVersions(environment, pkg.name),
         );
 
         if (availableVersions && availableVersions.length > 0) {

src/features/pythonApi.ts

@@ -287,7 +287,7 @@ class PythonEnvironmentApiImpl implements PythonEnvironmentApi {
         if (!manager) {
             return undefined;
         }
-        return manager.getAvailableVersions(packageName, environment);
+        return manager.getPackageAvailableVersions(environment, packageName);
     }
 
     createPackageItem(info: PackageInfo, environment: PythonEnvironment, manager: PackageManager): Package {

src/internal.api.ts

@@ -1,3 +1,4 @@
+import type { Pep440Version } from '@renovatebot/pep440';
 import { CancellationError, Disposable, Event, LogOutputChannel, MarkdownString, Uri } from 'vscode';
 import {
     CreateEnvironmentOptions,
@@ -28,7 +29,6 @@ import {
     ResolveEnvironmentContext,
     SetEnvironmentScope,
 } from './api';
-import type { Pep440Version } from '@renovatebot/pep440';
 import { ISSUES_URL } from './common/constants';
 import { CreateEnvironmentNotSupported, RemoveEnvironmentNotSupported } from './common/errors/NotSupportedError';
 import { traceWarn } from './common/logging';
@@ -385,9 +385,12 @@ export class InternalPackageManager implements PackageManager {
         return this.manager.getVersion ? this.manager.getVersion(environment) : Promise.resolve(undefined);
     }
 
-    getAvailableVersions(packageName: string, environment: PythonEnvironment): Promise<Pep440Version[] | undefined> {
-        return this.manager.getAvailableVersions
-            ? this.manager.getAvailableVersions(packageName, environment)
+    getPackageAvailableVersions(
+        environment: PythonEnvironment,
+        packageName: string,
+    ): Promise<Pep440Version[] | undefined> {
+        return this.manager.getPackageAvailableVersions
+            ? this.manager.getPackageAvailableVersions(environment, packageName)
             : Promise.resolve(undefined);
     }
 

src/managers/builtin/pipPackageManager.ts

@@ -151,9 +151,9 @@ export class PipPackageManager implements PackageManager, Disposable {
         }
     }
 
-    async getAvailableVersions(
-        packageName: string,
+    async getPackageAvailableVersions(
         environment: PythonEnvironment,
+        packageName: string,
     ): Promise<Pep440Version[] | undefined> {
         try {
             const python = environment.execInfo?.run?.executable;

src/managers/conda/condaPackageManager.ts

@@ -1,5 +1,5 @@
-import { explain as parse, rcompare } from '@renovatebot/pep440';
 import type { Pep440Version } from '@renovatebot/pep440';
+import { explain as parse, rcompare } from '@renovatebot/pep440';
 import {
     CancellationError,
     Disposable,
@@ -157,13 +157,16 @@ export class CondaPackageManager implements PackageManager, Disposable {
             const output = await runCondaExecutable(['--version'], this.log);
             // "conda X.Y.Z"
             const match = output.match(/conda\s+(\d+\.\d+(?:\.\d+)*)/i);
-            return match ? parse(match[1]) ?? undefined : undefined;
+            return match ? (parse(match[1]) ?? undefined) : undefined;
         } catch {
             return undefined;
         }
     }
 
-    async getAvailableVersions(packageName: string, _environment: PythonEnvironment): Promise<Pep440Version[] | undefined> {
+    async getPackageAvailableVersions(
+        _environment: PythonEnvironment,
+        packageName: string,
+    ): Promise<Pep440Version[] | undefined> {
         try {
             const output = await runCondaExecutable(['search', packageName, '--json'], this.log);
             const parsed = JSON.parse(output);

src/managers/poetry/poetryPackageManager.ts

@@ -1,3 +1,5 @@
+import type { Pep440Version } from '@renovatebot/pep440';
+import { explain as parse } from '@renovatebot/pep440';
 import * as fsapi from 'fs-extra';
 import * as path from 'path';
 import {
@@ -22,8 +24,6 @@ import {
     PythonEnvironment,
     PythonEnvironmentApi,
 } from '../../api';
-import { explain as parse } from '@renovatebot/pep440';
-import type { Pep440Version } from '@renovatebot/pep440';
 import { spawnProcess } from '../../common/childProcess.apis';
 import { showErrorMessage, showInputBox, withProgress } from '../../common/window.apis';
 import { updatePackagesAndNotify } from '../common/packageChanges';
@@ -155,10 +155,13 @@ export class PoetryPackageManager implements PackageManager, Disposable {
             return undefined;
         }
         const versionStr = await getPoetryVersion(poetry);
-        return versionStr ? parse(versionStr) ?? undefined : undefined;
+        return versionStr ? (parse(versionStr) ?? undefined) : undefined;
     }
 
-    async getAvailableVersions(_packageName: string, _environment: PythonEnvironment): Promise<Pep440Version[] | undefined> {
+    async getPackageAvailableVersions(
+        _environment: PythonEnvironment,
+        _packageName: string,
+    ): Promise<Pep440Version[] | undefined> {
         // Poetry doesn't have a native "list available versions" command.
         // Poetry 2.x supports `poetry search` but it was disabled on PyPI.
         // Return undefined to indicate this manager doesn't support version listing.