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

Tidy up language dropdown

Browse Source
This commit is contained in:
shati-patel
2021-11-10 15:44:26 +00:00
committed by Shati Patel
parent 3e0ea1ba77
commit ae555969b5
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/ql-vscode/src/helpers.ts
View File

@@ -497,14 +497,14 @@ export async function findLanguage(
}
// will be undefined if user cancels the quick pick.
return await askForLanguage(cliServer, false);
return await askForLanguage(false);
}
export const supportedLanguages = ['cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby'];
export async function askForLanguage(cliServer: CodeQLCliServer, throwOnEmpty = true): Promise<string | undefined> {
const availableLanguages = Object.keys(await cliServer.resolveLanguages()).sort();
export async function askForLanguage(throwOnEmpty = true): Promise<string | undefined> {
const language = await Window.showQuickPick(
availableLanguages,
supportedLanguages,
{ placeHolder: 'Select target language for your query', ignoreFocusOut: true }
);
if (!language) {

2
extensions/ql-vscode/src/run-remote-query.ts
View File

@@ -134,7 +134,7 @@ async function generateQueryPack(cliServer: cli.CodeQLCliServer, queryFile: stri
} else {
// open popup to ask for language if not already hardcoded
language = fallbackLanguage || await askForLanguage(cliServer);
language = fallbackLanguage || await askForLanguage();
// copy only the query file to the query pack directory
// and generate a synthetic query pack

4
extensions/ql-vscode/src/vscode-tests/cli-integration/run-cli.test.ts
View File

@@ -6,7 +6,7 @@ import { SemVer } from 'semver';
import { CodeQLCliServer, QueryInfoByLanguage } from '../../cli';
import { CodeQLExtensionInterface } from '../../extension';
import { skipIfNoCodeQL } from '../ensureCli';
import { getOnDiskWorkspaceFolders, getQlPackForDbscheme, languageToDbScheme } from '../../helpers';
import { getOnDiskWorkspaceFolders, getQlPackForDbscheme, languageToDbScheme, supportedLanguages } from '../../helpers';
import { resolveQueries } from '../../contextual/queryResolver';
import { KeyType } from '../../contextual/keyType';
@@ -14,8 +14,6 @@ import { KeyType } from '../../contextual/keyType';
* Perform proper integration tests by running the CLI
*/
describe('Use cli', function() {
const supportedLanguages = ['cpp', 'csharp', 'go', 'java', 'javascript', 'python'];
this.timeout(60000);
let cli: CodeQLCliServer;