Skip to content

Commit a674537

Browse files
authored
Merge pull request #2766 from github/starcke/rename-ff
Rename feature flags.
2 parents 1178e4c + 0836307 commit a674537

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

extensions/ql-vscode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1430,7 +1430,7 @@
14301430
},
14311431
{
14321432
"command": "codeQL.openModelEditor",
1433-
"when": "config.codeQL.canary && config.codeQL.dataExtensions.editor"
1433+
"when": "config.codeQL.canary && config.codeQL.model.editor"
14341434
},
14351435
{
14361436
"command": "codeQLQueries.runLocalQueryContextMenu",

extensions/ql-vscode/src/config.ts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -705,16 +705,13 @@ export function showQueriesPanel(): boolean {
705705
return !!QUERIES_PANEL.getValue<boolean>();
706706
}
707707

708-
const DATA_EXTENSIONS = new Setting("dataExtensions", ROOT_SETTING);
709-
const LLM_GENERATION = new Setting("llmGeneration", DATA_EXTENSIONS);
708+
const MODEL_SETTING = new Setting("model", ROOT_SETTING);
709+
const LLM_GENERATION = new Setting("llmGeneration", MODEL_SETTING);
710710
const DISABLE_AUTO_NAME_EXTENSION_PACK = new Setting(
711711
"disableAutoNameExtensionPack",
712-
DATA_EXTENSIONS,
713-
);
714-
const EXTENSIONS_DIRECTORY = new Setting(
715-
"extensionsDirectory",
716-
DATA_EXTENSIONS,
712+
MODEL_SETTING,
717713
);
714+
const EXTENSIONS_DIRECTORY = new Setting("extensionsDirectory", MODEL_SETTING);
718715

719716
export function showLlmGeneration(): boolean {
720717
return !!LLM_GENERATION.getValue<boolean>();

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ describe("pickExtensionPack", () => {
164164
section?: string,
165165
scope?: ConfigurationScope | null,
166166
): VSCodeWorkspaceConfiguration => {
167-
expect(section).toEqual("codeQL.dataExtensions");
167+
expect(section).toEqual("codeQL.model");
168168
expect((scope as any)?.languageId).toEqual("java");
169169

170170
return {
@@ -205,7 +205,7 @@ describe("pickExtensionPack", () => {
205205
section?: string,
206206
scope?: ConfigurationScope | null,
207207
): VSCodeWorkspaceConfiguration => {
208-
expect(section).toEqual("codeQL.dataExtensions");
208+
expect(section).toEqual("codeQL.model");
209209
expect((scope as any)?.languageId).toEqual("java");
210210

211211
return {
@@ -311,7 +311,7 @@ describe("pickExtensionPack", () => {
311311
section?: string,
312312
scope?: ConfigurationScope | null,
313313
): VSCodeWorkspaceConfiguration => {
314-
expect(section).toEqual("codeQL.dataExtensions");
314+
expect(section).toEqual("codeQL.model");
315315
expect((scope as any)?.languageId).toEqual("java");
316316

317317
return {

0 commit comments

Comments
 (0)