Skip to content

Commit 75b5c1d

Browse files
committed
Allow max queries to be configurable
Max number of simultaneous queries launchable by runQueries command is now configurable by codeQL.runningQueries.maxQueries.
1 parent db6fc5d commit 75b5c1d

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

extensions/ql-vscode/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## [UNRELEASED]
44

5+
- Max number of simultaneous queries launchable by runQueries command is now configurable by changing the codeQL.runningQueries.maxQueries setting.
6+
57
## 1.3.3 - 16 September 2020
68

79
- Fix display of raw results entities with label but no url.

extensions/ql-vscode/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@
152152
"default": false,
153153
"description": "Enable automatically saving a modified query file when running a query."
154154
},
155+
"codeQL.runningQueries.maxQueries": {
156+
"type": "integer",
157+
"default": 20,
158+
"description": "Max number of simultaneous queries to run using the 'CodeQL: Run Queries' command."
159+
},
155160
"codeQL.queryHistory.format": {
156161
"type": "string",
157162
"default": "[%t] %q on %d - %s",

extensions/ql-vscode/src/config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ const NUMBER_OF_THREADS_SETTING = new Setting('numberOfThreads', RUNNING_QUERIES
6767
const TIMEOUT_SETTING = new Setting('timeout', RUNNING_QUERIES_SETTING);
6868
const MEMORY_SETTING = new Setting('memory', RUNNING_QUERIES_SETTING);
6969
const DEBUG_SETTING = new Setting('debug', RUNNING_QUERIES_SETTING);
70+
export const MAX_QUERIES = new Setting('maxQueries', RUNNING_QUERIES_SETTING);
7071
export const AUTOSAVE_SETTING = new Setting('autoSave', RUNNING_QUERIES_SETTING);
7172

7273
/** When these settings change, the running query server should be restarted. */

extensions/ql-vscode/src/extension.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { testExplorerExtensionId, TestHub } from 'vscode-test-adapter-api';
1818
import { AstViewer } from './astViewer';
1919
import * as archiveFilesystemProvider from './archive-filesystem-provider';
2020
import { CodeQLCliServer } from './cli';
21-
import { DistributionConfigListener, QueryHistoryConfigListener, QueryServerConfigListener } from './config';
21+
import { DistributionConfigListener, MAX_QUERIES, QueryHistoryConfigListener, QueryServerConfigListener } from './config';
2222
import * as languageSupport from './languageSupport';
2323
import { DatabaseManager } from './databases';
2424
import { DatabaseUI } from './databases-ui';
@@ -466,11 +466,11 @@ async function activateWithInstalledDistribution(
466466
commands.registerCommand(
467467
'codeQL.runQueries',
468468
async (_: Uri | undefined, multi: Uri[]) => {
469-
const maxQueryCount = 20;
469+
const maxQueryCount = MAX_QUERIES.getValue() as number;
470470
try {
471471
const [files, dirFound] = await gatherQlFiles(multi.map(uri => uri.fsPath));
472472
if (files.length > maxQueryCount) {
473-
throw new Error(`You tried to run ${files.length} queries, but the maximum is ${maxQueryCount}. Try selecting fewer queries.`);
473+
throw new Error(`You tried to run ${files.length} queries, but the maximum is ${maxQueryCount}. Try selecting fewer queries or changing the 'codeQL.runningQueries.maxQueries' setting.`);
474474
}
475475
// warn user and display selected files when a directory is selected because some ql
476476
// files may be hidden from the user.

0 commit comments

Comments
 (0)