Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion extensions/ql-vscode/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@
},
{
"command": "codeQL.openModelEditor",
"when": "config.codeQL.canary && config.codeQL.dataExtensions.editor"
"when": "config.codeQL.canary && config.codeQL.model.editor"
},
{
"command": "codeQLQueries.runLocalQueryContextMenu",
Expand Down
11 changes: 4 additions & 7 deletions extensions/ql-vscode/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -702,16 +702,13 @@ export function showQueriesPanel(): boolean {
return !!QUERIES_PANEL.getValue<boolean>();
}

const DATA_EXTENSIONS = new Setting("dataExtensions", ROOT_SETTING);
const LLM_GENERATION = new Setting("llmGeneration", DATA_EXTENSIONS);
const MODEL_SETTING = new Setting("model", ROOT_SETTING);
const LLM_GENERATION = new Setting("llmGeneration", MODEL_SETTING);
const DISABLE_AUTO_NAME_EXTENSION_PACK = new Setting(
"disableAutoNameExtensionPack",
DATA_EXTENSIONS,
);
const EXTENSIONS_DIRECTORY = new Setting(
"extensionsDirectory",
DATA_EXTENSIONS,
MODEL_SETTING,
);
const EXTENSIONS_DIRECTORY = new Setting("extensionsDirectory", MODEL_SETTING);

export function showLlmGeneration(): boolean {
return !!LLM_GENERATION.getValue<boolean>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ describe("pickExtensionPack", () => {
section?: string,
scope?: ConfigurationScope | null,
): VSCodeWorkspaceConfiguration => {
expect(section).toEqual("codeQL.dataExtensions");
expect(section).toEqual("codeQL.model");
expect((scope as any)?.languageId).toEqual("java");

return {
Expand Down Expand Up @@ -205,7 +205,7 @@ describe("pickExtensionPack", () => {
section?: string,
scope?: ConfigurationScope | null,
): VSCodeWorkspaceConfiguration => {
expect(section).toEqual("codeQL.dataExtensions");
expect(section).toEqual("codeQL.model");
expect((scope as any)?.languageId).toEqual("java");

return {
Expand Down Expand Up @@ -311,7 +311,7 @@ describe("pickExtensionPack", () => {
section?: string,
scope?: ConfigurationScope | null,
): VSCodeWorkspaceConfiguration => {
expect(section).toEqual("codeQL.dataExtensions");
expect(section).toEqual("codeQL.model");
expect((scope as any)?.languageId).toEqual("java");

return {
Expand Down