Skip to content

Commit e808e78

Browse files
committed
fix: handling installables selection
1 parent 71a0cf3 commit e808e78

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/managers/builtin/pipUtils.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,14 @@ async function selectWorkspaceOrCommon(
116116
if (selected && !Array.isArray(selected)) {
117117
try {
118118
if (selected.label === PackageManagement.workspaceDependencies) {
119-
const installArgs = await selectFromInstallableToInstall(installable);
120-
return { install: installArgs ?? [], uninstall: [] };
119+
return await selectFromInstallableToInstall(installable);
121120
} else if (selected.label === PackageManagement.searchCommonPackages) {
122121
return await selectFromCommonPackagesToInstall(common, installed);
123-
} else {
122+
} else if (selected.label === PackageManagement.skipPackageInstallation) {
124123
traceInfo('Package Installer: user selected skip package installation');
125124
return undefined;
125+
} else {
126+
return undefined;
126127
}
127128
// eslint-disable-next-line @typescript-eslint/no-explicit-any
128129
} catch (ex: any) {

src/managers/common/pickers.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ function groupByInstalled(items: PackageQuickPickItem[], installed?: string[]):
105105
};
106106
}
107107

108-
export interface CommonPackagesResult {
108+
interface PackagesPickerResult {
109109
install: string[];
110110
uninstall: string[];
111111
}
112112

113-
function selectionsToResult(selections: string[], installed: string[]): CommonPackagesResult {
113+
function selectionsToResult(selections: string[], installed: string[]): PackagesPickerResult {
114114
const install: string[] = selections;
115115
const uninstall: string[] = [];
116116
installed.forEach((i) => {
@@ -128,7 +128,7 @@ export async function selectFromCommonPackagesToInstall(
128128
common: Installable[],
129129
installed: string[],
130130
preSelected?: PackageQuickPickItem[] | undefined,
131-
): Promise<CommonPackagesResult | undefined> {
131+
): Promise<PackagesPickerResult | undefined> {
132132
const { installedItems, items } = groupByInstalled(common.map(installableToQuickPickItem), installed);
133133
const preSelectedItems = items.filter((i) => (preSelected ?? installedItems).some((s) => s.id === i.id));
134134
let selected: PackageQuickPickItem | PackageQuickPickItem[] | undefined;
@@ -232,7 +232,7 @@ function getGroupedItems(items: Installable[]): PackageQuickPickItem[] {
232232
export async function selectFromInstallableToInstall(
233233
installable: Installable[],
234234
preSelected?: PackageQuickPickItem[],
235-
): Promise<string[] | undefined> {
235+
): Promise<PackagesPickerResult | undefined> {
236236
const items: PackageQuickPickItem[] = [];
237237

238238
if (installable && installable.length > 0) {
@@ -263,9 +263,9 @@ export async function selectFromInstallableToInstall(
263263

264264
if (selected) {
265265
if (Array.isArray(selected)) {
266-
return selected.flatMap((s) => s.args ?? []);
266+
return { install: selected.flatMap((s) => s.args ?? []), uninstall: [] };
267267
} else {
268-
return selected.args ?? [];
268+
return { install: selected.args ?? [], uninstall: [] };
269269
}
270270
}
271271
return undefined;

0 commit comments

Comments
 (0)