Skip to content

Commit 5bee5c6

Browse files
Convert handleRemoveDatabase to use createMultiSelectionCommand
1 parent 4a957ad commit 5bee5c6

1 file changed

Lines changed: 9 additions & 16 deletions

File tree

extensions/ql-vscode/src/local-databases-ui.ts

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,9 @@ export class DatabaseUI extends DisposableObject {
241241
this.handleMakeCurrentDatabase.bind(this),
242242
"codeQLDatabases.sortByName": this.handleSortByName.bind(this),
243243
"codeQLDatabases.sortByDateAdded": this.handleSortByDateAdded.bind(this),
244-
"codeQLDatabases.removeDatabase": this.handleRemoveDatabase.bind(this),
244+
"codeQLDatabases.removeDatabase": createMultiSelectionCommand(
245+
this.handleRemoveDatabase.bind(this),
246+
),
245247
"codeQLDatabases.upgradeDatabase": createMultiSelectionCommand(
246248
this.handleUpgradeDatabase.bind(this),
247249
),
@@ -647,24 +649,15 @@ export class DatabaseUI extends DisposableObject {
647649
}
648650

649651
private async handleRemoveDatabase(
650-
databaseItem: DatabaseItem,
651-
multiSelect: DatabaseItem[] | undefined,
652+
databaseItems: DatabaseItem[],
652653
): Promise<void> {
653654
return withProgress(
654655
async (progress, token) => {
655-
if (multiSelect?.length) {
656-
await Promise.all(
657-
multiSelect.map((dbItem) =>
658-
this.databaseManager.removeDatabaseItem(progress, token, dbItem),
659-
),
660-
);
661-
} else {
662-
await this.databaseManager.removeDatabaseItem(
663-
progress,
664-
token,
665-
databaseItem,
666-
);
667-
}
656+
await Promise.all(
657+
databaseItems.map((dbItem) =>
658+
this.databaseManager.removeDatabaseItem(progress, token, dbItem),
659+
),
660+
);
668661
},
669662
{
670663
title: "Removing database",

0 commit comments

Comments
 (0)