From cf50a71a16913f64241c2df6cf5e3dd916d2855a Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Thu, 14 Dec 2023 10:08:14 +0100 Subject: [PATCH 1/2] Remove GitHub database download feature flag This removes the `codeQL.githubDatabase.enable` setting and always enables the GitHub database download feature. --- extensions/ql-vscode/src/config.ts | 7 ------- .../databases/github-databases/github-databases-module.ts | 4 ---- 2 files changed, 11 deletions(-) diff --git a/extensions/ql-vscode/src/config.ts b/extensions/ql-vscode/src/config.ts index e3b1b370bb4..5f206572d98 100644 --- a/extensions/ql-vscode/src/config.ts +++ b/extensions/ql-vscode/src/config.ts @@ -762,8 +762,6 @@ export class ModelConfigListener extends ConfigListener implements ModelConfig { const GITHUB_DATABASE_SETTING = new Setting("githubDatabase", ROOT_SETTING); -// Feature flag for the GitHub database downnload. -const GITHUB_DATABASE_ENABLE = new Setting("enable", GITHUB_DATABASE_SETTING); const GITHUB_DATABASE_DOWNLOAD = new Setting( "download", GITHUB_DATABASE_SETTING, @@ -778,7 +776,6 @@ const GitHubDatabaseUpdateValues = ["ask", "never"] as const; type GitHubDatabaseUpdate = (typeof GitHubDatabaseUpdateValues)[number]; export interface GitHubDatabaseConfig { - enable: boolean; download: GitHubDatabaseDownload; update: GitHubDatabaseUpdate; setDownload( @@ -802,10 +799,6 @@ export class GitHubDatabaseConfigListener ); } - public get enable() { - return !!GITHUB_DATABASE_ENABLE.getValue(); - } - public get download(): GitHubDatabaseDownload { const value = GITHUB_DATABASE_DOWNLOAD.getValue(); return GitHubDatabaseDownloadValues.includes(value) ? value : "ask"; diff --git a/extensions/ql-vscode/src/databases/github-databases/github-databases-module.ts b/extensions/ql-vscode/src/databases/github-databases/github-databases-module.ts index 663e5a39ea1..09ae8efa654 100644 --- a/extensions/ql-vscode/src/databases/github-databases/github-databases-module.ts +++ b/extensions/ql-vscode/src/databases/github-databases/github-databases-module.ts @@ -60,10 +60,6 @@ export class GitHubDatabasesModule extends DisposableObject { } private async initialize(): Promise { - if (!this.config.enable) { - return; - } - // Start the check and downloading the database asynchronously. We don't want to block on this // in extension activation since this makes network requests and waits for user input. void this.promptGitHubRepositoryDownload().catch((e: unknown) => { From 4bd1981a344057f43198108b3835566c4324f450 Mon Sep 17 00:00:00 2001 From: Koen Vlaswinkel Date: Thu, 14 Dec 2023 10:10:14 +0100 Subject: [PATCH 2/2] Update CHANGELOG --- extensions/ql-vscode/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md index 7df2ea5ea4e..5b9d5c7c9e0 100644 --- a/extensions/ql-vscode/CHANGELOG.md +++ b/extensions/ql-vscode/CHANGELOG.md @@ -2,6 +2,7 @@ ## [UNRELEASED] +- Add a prompt for downloading a GitHub database when opening a GitHub repository. [#3138](https://github.com/github/vscode-codeql/pull/3138) - Avoid showing a popup when hovering over source elements in database source files. [#3125](https://github.com/github/vscode-codeql/pull/3125) ## 1.11.0 - 13 December 2023