Skip to content

Fix not setting database as selected if it already exists #2384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertbrignull merged 6 commits into from
Apr 27, 2023
Merged

Fix not setting database as selected if it already exists #2384

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6273714
Make database selected even if it's already in the list
robertbrignull Apr 27, 2023
9941a42
Set makeSelected to true for two calls
robertbrignull Apr 27, 2023
92f23d1
Change default value of makeSelected from false to true
robertbrignull Apr 27, 2023
e0cb1df
Update expected args in test
robertbrignull Apr 27, 2023
44a0962
Add changelog entry
robertbrignull Apr 27, 2023
b786b56
Fix tests
robertbrignull Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions extensions/ql-vscode/src/databases/local-databases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ export class DatabaseManager extends DisposableObject {
progress: ProgressCallback,
token: vscode.CancellationToken,
uri: vscode.Uri,
makeSelected = false,
makeSelected = true,
displayName?: string,
isTutorialDatabase?: boolean,
): Promise<DatabaseItem> {
Expand All @@ -645,12 +645,15 @@ export class DatabaseManager extends DisposableObject {
public async addExistingDatabaseItem(
databaseItem: DatabaseItem,
progress: ProgressCallback,
makeSelected = true,
makeSelected: boolean,
token: vscode.CancellationToken,
isTutorialDatabase?: boolean,
): Promise<DatabaseItem> {
const existingItem = this.findDatabaseItem(databaseItem.databaseUri);
if (existingItem !== undefined) {
if (makeSelected) {
await this.setCurrentDatabaseItem(existingItem);
}
return existingItem;
}

Expand Down
1 change: 1 addition & 0 deletions extensions/ql-vscode/src/test-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ export class TestRunner extends DisposableObject {
},
token,
uri,
false,
);
await this.databaseManager.renameDatabaseItem(
reopenedDatabase,
Expand Down
3 changes: 0 additions & 3 deletions extensions/ql-vscode/test/vscode-tests/minimal-workspace/local-databases.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -753,13 +753,10 @@ describe("local databases", () => {
});

it("should set the database as the currently selected one", async () => {
const makeSelected = true;

await databaseManager.openDatabase(
{} as ProgressCallback,
{} as CancellationToken,
mockDbItem.databaseUri,
makeSelected,
);

expect(setCurrentDatabaseItemSpy).toBeCalledTimes(1);
Expand Down
1 change: 1 addition & 0 deletions extensions/ql-vscode/test/vscode-tests/no-workspace/test-runner.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ describe("test-runner", () => {
expect.anything(),
expect.anything(),
preTestDatabaseItem.databaseUri,
false,
);

expect(renameDatabaseItemSpy).toBeCalledTimes(1);
Expand Down