diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index c61a0e96ac3..f4514cc924f 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -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", diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts index 3a6f002c598..03d05a180d5 100644 --- a/extensions/ql-vscode/src/config.ts +++ b/extensions/ql-vscode/src/config.ts @@ -702,16 +702,13 @@ export function showQueriesPanel(): boolean { return !!QUERIES_PANEL.getValue(); } -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(); diff --git a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts index 7f0fa6424bf..191ac7aecdb 100644 --- a/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts +++ b/extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts @@ -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 { @@ -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 { @@ -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 {