mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into koesie10/download-github-database-authentication

Browse Source
This commit is contained in:
Koen Vlaswinkel
2023-11-20 11:14:13 +01:00
parent 5d42cbc1c8 422f0eb7e4
commit feca898c85
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/ql-vscode/src/databases/github-database-module.ts
View File

@@ -7,8 +7,8 @@ import { asError, getErrorMessage } from "../common/helpers-pure";
import { import {
askForGitHubDatabaseDownload, askForGitHubDatabaseDownload,
CodeqlDatabase, CodeqlDatabase,
findGitHubDatabasesForRepository,
downloadDatabaseFromGitHub, downloadDatabaseFromGitHub,
findGitHubDatabasesForRepository,
} from "./github-database-prompt"; } from "./github-database-prompt";
import { GitHubDatabaseConfig, GitHubDatabaseConfigListener } from "../config"; import { GitHubDatabaseConfig, GitHubDatabaseConfigListener } from "../config";
import { DatabaseManager } from "./local-databases"; import { DatabaseManager } from "./local-databases";

13
extensions/ql-vscode/src/databases/github-database-prompt.ts
View File

@@ -39,22 +39,17 @@ export async function askForGitHubDatabaseDownload(
): Promise<boolean> { ): Promise<boolean> {
const languages = databases.map((database) => database.language); const languages = databases.map((database) => database.language);
const databasesMessage = const message =
databases.length === 1 databases.length === 1
? `This repository has an origin (GitHub) that has a ${getLanguageDisplayName( ? `This repository has an origin (GitHub) that has a ${getLanguageDisplayName(
languages[0], languages[0],
)} CodeQL database.` )} CodeQL database. Download the existing database from GitHub?`
: `This repository has an origin (GitHub) that has ${joinLanguages( : `This repository has an origin (GitHub) that has ${joinLanguages(
languages, languages,
)} CodeQL databases.`; )} CodeQL databases. Download any existing databases from GitHub?`;
const connectMessage =
databases.length === 1
? `Download the existing database from GitHub?`
: `Download any existing databases from GitHub?`;
const answer = await showNeverAskAgainDialog( const answer = await showNeverAskAgainDialog(
`${databasesMessage} ${connectMessage}`, message,
false, false,
"Download", "Download",
"Not now", "Not now",