Skip to content

Commit ede534c

Browse files
authored
Merge pull request #1744 from github/aeisenberg/new-query-server
Enable the new query server by default
2 parents 9a7489f + 2dd482a commit ede534c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

extensions/ql-vscode/src/cli.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,8 +1427,7 @@ export class CliVersionConstraint {
14271427
}
14281428

14291429
async supportsNewQueryServer() {
1430-
// TODO while under development, users _must_ opt-in to the new query server
1431-
// by setting the `codeql.canaryQueryServer` setting to `true`.
1430+
// This allows users to explicitly opt-out of the new query server.
14321431
return allowCanaryQueryServer() &&
14331432
this.isVersionAtLeast(CliVersionConstraint.CLI_VERSION_WITH_NEW_QUERY_SERVER);
14341433
}

extensions/ql-vscode/src/config.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -346,9 +346,10 @@ export function isCanary() {
346346
*/
347347
export const CANARY_QUERY_SERVER = new Setting('canaryQueryServer', ROOT_SETTING);
348348

349-
349+
// The default value for this setting is now `true`
350350
export function allowCanaryQueryServer() {
351-
return !!CANARY_QUERY_SERVER.getValue<boolean>();
351+
const value = CANARY_QUERY_SERVER.getValue<boolean>();
352+
return value === undefined ? true : !!value;
352353
}
353354

354355
export const JOIN_ORDER_WARNING_THRESHOLD = new Setting('joinOrderWarningThreshold', LOG_INSIGHTS_SETTING);
@@ -458,7 +459,7 @@ const MOCK_GH_API_SERVER_ENABLED = new Setting('enabled', MOCK_GH_API_SERVER);
458459

459460
/**
460461
* A path to a directory containing test scenarios. If this setting is not set,
461-
* the mock server will a default location for test scenarios in dev mode, and
462+
* the mock server will a default location for test scenarios in dev mode, and
462463
* will show a menu to select a directory in production mode.
463464
*/
464465
const MOCK_GH_API_SERVER_SCENARIOS_PATH = new Setting('scenariosPath', MOCK_GH_API_SERVER);

0 commit comments

Comments
 (0)