Skip to content

Commit bed56ef

Browse files
committed
Make public methods private in local databases UI
Some of the methods in the `DatabaseUI` were public because they were used in the `extension.ts` file. We have moved these method calls into this file, so they do not need to be public anymore. We can also get rid of the separation between some of these methods, so I've moved them into the function that calls them.
1 parent 7ab986f commit bed56ef

File tree

1 file changed

+19
-33
lines changed

1 file changed

+19
-33
lines changed

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

Lines changed: 19 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ export class DatabaseUI extends DisposableObject {
249249
await this.databaseManager.setCurrentDatabaseItem(databaseItem);
250250
}
251251

252-
public async chooseDatabaseFolder(
252+
private async chooseDatabaseFolder(
253253
progress: ProgressCallback,
254254
token: CancellationToken,
255255
): Promise<void> {
@@ -410,7 +410,7 @@ export class DatabaseUI extends DisposableObject {
410410
}
411411
}
412412

413-
public async chooseDatabaseArchive(
413+
private async chooseDatabaseArchive(
414414
progress: ProgressCallback,
415415
token: CancellationToken,
416416
): Promise<void> {
@@ -447,50 +447,36 @@ export class DatabaseUI extends DisposableObject {
447447
);
448448
}
449449

450-
public async chooseDatabaseInternet(
451-
progress: ProgressCallback,
452-
token: CancellationToken,
453-
): Promise<DatabaseItem | undefined> {
454-
return await promptImportInternetDatabase(
455-
this.databaseManager,
456-
this.storagePath,
457-
progress,
458-
token,
459-
this.queryServer?.cliServer,
460-
);
461-
}
462-
463450
private async handleChooseDatabaseInternet(): Promise<void> {
464451
return withProgress(
465452
async (progress, token) => {
466-
await this.chooseDatabaseInternet(progress, token);
453+
await promptImportInternetDatabase(
454+
this.databaseManager,
455+
this.storagePath,
456+
progress,
457+
token,
458+
this.queryServer?.cliServer,
459+
);
467460
},
468461
{
469462
title: "Adding database from URL",
470463
},
471464
);
472465
}
473466

474-
public async chooseDatabaseGithub(
475-
progress: ProgressCallback,
476-
token: CancellationToken,
477-
): Promise<DatabaseItem | undefined> {
478-
const credentials = isCanary() ? this.app.credentials : undefined;
479-
480-
return await promptImportGithubDatabase(
481-
this.databaseManager,
482-
this.storagePath,
483-
credentials,
484-
progress,
485-
token,
486-
this.queryServer?.cliServer,
487-
);
488-
}
489-
490467
private async handleChooseDatabaseGithub(): Promise<void> {
491468
return withProgress(
492469
async (progress, token) => {
493-
await this.chooseDatabaseGithub(progress, token);
470+
const credentials = isCanary() ? this.app.credentials : undefined;
471+
472+
await promptImportGithubDatabase(
473+
this.databaseManager,
474+
this.storagePath,
475+
credentials,
476+
progress,
477+
token,
478+
this.queryServer?.cliServer,
479+
);
494480
},
495481
{
496482
title: "Adding database from GitHub",

0 commit comments

Comments
 (0)