Skip to content

Make the "Create query" location workspace-specific #2769

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
shati-patel merged 2 commits into from
Aug 31, 2023
Merged

Make the "Create query" location workspace-specific #2769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edbf396
Make the "Create query" location workspace-specific
shati-patel Aug 31, 2023
e8dbde8
Fix tests
shati-patel Aug 31, 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/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ export function getQlPackLocation(): string | undefined {
}

export async function setQlPackLocation(folder: string | undefined) {
await QL_PACK_LOCATION.updateValue(folder, ConfigurationTarget.Global);
await QL_PACK_LOCATION.updateValue(folder, ConfigurationTarget.Workspace);
}

/**
Expand All @@ -690,7 +690,10 @@ export function getAutogenerateQlPacks(): AutogenerateQLPacks {
}

export async function setAutogenerateQlPacks(choice: AutogenerateQLPacks) {
await AUTOGENERATE_QL_PACKS.updateValue(choice, ConfigurationTarget.Global);
await AUTOGENERATE_QL_PACKS.updateValue(
choice,
ConfigurationTarget.Workspace,
);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ...s/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ describe("SkeletonQueryWizard", () => {

await wizard.determineStoragePath();

expect(updateValueSpy).toHaveBeenCalledWith(storagePath, 1);
expect(updateValueSpy).toHaveBeenCalledWith(storagePath, 2);
});

describe("when the user is using the codespace template", () => {
Expand Down
2 changes: 1 addition & 1 deletion ...sions/ql-vscode/test/vscode-tests/minimal-workspace/local-queries/local-databases.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ describe("local databases", () => {
await (databaseManager as any).createSkeletonPacks(mockDbItem);

expect(generateSpy).not.toBeCalled();
expect(updateValueSpy).toHaveBeenCalledWith("never", 1);
expect(updateValueSpy).toHaveBeenCalledWith("never", 2);
});

it("should create the skeleton QL pack for the user", async () => {
Expand Down