Skip to content

Commit 1440339

Browse files
authored
Rename "allowHttp" setting (#3069)
1 parent be2891d commit 1440339

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

extensions/ql-vscode/CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- When adding a CodeQL database, we no longer add the database source folder to the workspace by default (since this caused bugs in single-folder workspaces). [#3047](https://github.com/github/vscode-codeql/pull/3047)
66
- You can manually add individual database source folders to the workspace with the "Add Database Source to Workspace" right-click command in the databases view.
77
- To restore the old behavior of adding all database source folders by default, set the `codeQL.addingDatabases.addDatabaseSourceToWorkspace` setting to `true`.
8-
- Rename the `codeQL.databaseDownload.allowHttp` setting to `codeQL.addingDatabases.allowHttp`, so that database-related settings are grouped together in the Settings UI. [#3047](https://github.com/github/vscode-codeql/pull/3047)
8+
- Rename the `codeQL.databaseDownload.allowHttp` setting to `codeQL.addingDatabases.allowHttp`, so that database-related settings are grouped together in the Settings UI. [#3047](https://github.com/github/vscode-codeql/pull/3047) & [#3069](https://github.com/github/vscode-codeql/pull/3069)
99
- The "Sort by Language" action in the databases view now sorts by name within each language. [#3055](https://github.com/github/vscode-codeql/pull/3055)
1010

1111
## 1.9.4 - 6 November 2023

extensions/ql-vscode/src/config.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -641,12 +641,23 @@ export function isCodespacesTemplate() {
641641
return !!CODESPACES_TEMPLATE.getValue<boolean>();
642642
}
643643

644+
// Deprecated after v1.9.4. Can be removed in a few versions.
645+
const DATABASE_DOWNLOAD_SETTING = new Setting("databaseDownload", ROOT_SETTING);
646+
const DEPRECATED_ALLOW_HTTP_SETTING = new Setting(
647+
"allowHttp",
648+
DATABASE_DOWNLOAD_SETTING,
649+
);
650+
644651
const ADDING_DATABASES_SETTING = new Setting("addingDatabases", ROOT_SETTING);
645652

646653
const ALLOW_HTTP_SETTING = new Setting("allowHttp", ADDING_DATABASES_SETTING);
647654

648655
export function allowHttp(): boolean {
649-
return ALLOW_HTTP_SETTING.getValue<boolean>() || false;
656+
return (
657+
ALLOW_HTTP_SETTING.getValue<boolean>() ||
658+
DEPRECATED_ALLOW_HTTP_SETTING.getValue<boolean>() ||
659+
false
660+
);
650661
}
651662

652663
const ADD_DATABASE_SOURCE_TO_WORKSPACE_SETTING = new Setting(

0 commit comments

Comments
 (0)