Merge remote-tracking branch 'origin/main' into koesie10/export-results-sorting-filtering

Author: koesie10

CONTRIBUTING.md

@@ -54,7 +54,7 @@ Alternatively, you can build the extension within VS Code via `Terminal > Run Bu
 
 Before running any of the launch commands, be sure to have run the `build` command to ensure that the JavaScript is compiled and the resources are copied to the proper location.
 
-We recommend that you keep `npm run watch` running in the backgound and you only need to re-run `npm run build` in the following situations:
+We recommend that you keep `npm run watch` running in the background and you only need to re-run `npm run build` in the following situations:
 
 1. on first checkout
 2. whenever any of the non-TypeScript resources have changed
@@ -152,7 +152,7 @@ The CLI integration tests require the CodeQL standard libraries in order to run
 
 #### Using a mock GitHub API server
 
-Multi-Repo Variant Analyses (MRVA) rely on the GitHub API. In order to make development and testing easy, we have functionality that allows us to intercept requests to the GitHub API and provide mock responses. 
+Multi-Repo Variant Analyses (MRVA) rely on the GitHub API. In order to make development and testing easy, we have functionality that allows us to intercept requests to the GitHub API and provide mock responses.
 
 ##### Using a pre-recorded test scenario
 

extensions/ql-vscode/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [UNRELEASED]
 
+- Warn users when their VS Code version is too old to support all features in the vscode-codeql extension. [#1674](https://github.com/github/vscode-codeql/pull/1674)
+
 ## 1.7.5 - 8 November 2022
 
 - Fix a bug where the AST Viewer was not working unless the associated CodeQL library pack is in the workspace. [#1735](https://github.com/github/vscode-codeql/pull/1735)

extensions/ql-vscode/README.md

@@ -99,7 +99,7 @@ When the results are ready, they're displayed in the CodeQL Query Results view.
 
 If there are any problems running a query, a notification is displayed in the bottom right corner of the application. In addition to the error message, the notification includes details of how to fix the problem.
 
-### Keyboad navigation
+### Keyboard navigation
 
 If you wish to navigate the query results from your keyboard, you can bind shortcuts to the **CodeQL: Navigate Up/Down/Left/Right in Result Viewer** commands.
 

extensions/ql-vscode/package-lock.json

@@ -328,10 +328,6 @@
         "command": "codeQL.exportSelectedVariantAnalysisResults",
         "title": "CodeQL: Export Variant Analysis Results"
       },
-      {
-        "command": "codeQL.openVariantAnalysis",
-        "title": "CodeQL: Open Variant Analysis"
-      },
       {
         "command": "codeQL.runQueries",
         "title": "CodeQL: Run Queries in Selected Files"
@@ -949,10 +945,6 @@
           "command": "codeQL.runVariantAnalysis",
           "when": "config.codeQL.canary && editorLangId == ql && resourceExtname == .ql"
         },
-        {
-          "command": "codeQL.openVariantAnalysis",
-          "when": "config.codeQL.canary && config.codeQL.variantAnalysis.liveResults"
-        },
         {
           "command": "codeQL.exportSelectedVariantAnalysisResults",
           "when": "config.codeQL.canary"

extensions/ql-vscode/package.json

@@ -1427,8 +1427,7 @@ export class CliVersionConstraint {
   }
 
   async supportsNewQueryServer() {
-    // TODO while under development, users _must_ opt-in to the new query server
-    // by setting the `codeql.canaryQueryServer` setting to `true`.
+    // This allows users to explicitly opt-out of the new query server.
     return allowCanaryQueryServer() &&
       this.isVersionAtLeast(CliVersionConstraint.CLI_VERSION_WITH_NEW_QUERY_SERVER);
   }

extensions/ql-vscode/src/cli.ts

@@ -346,9 +346,10 @@ export function isCanary() {
  */
 export const CANARY_QUERY_SERVER = new Setting('canaryQueryServer', ROOT_SETTING);
 
-
+// The default value for this setting is now `true`
 export function allowCanaryQueryServer() {
-  return !!CANARY_QUERY_SERVER.getValue<boolean>();
+  const value = CANARY_QUERY_SERVER.getValue<boolean>();
+  return value === undefined ? true : !!value;
 }
 
 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);
 
 /**
  * A path to a directory containing test scenarios. If this setting is not set,
- * the mock server will a default location for test scenarios in dev mode, and 
+ * the mock server will a default location for test scenarios in dev mode, and
  * will show a menu to select a directory in production mode.
  */
 const MOCK_GH_API_SERVER_SCENARIOS_PATH = new Setting('scenariosPath', MOCK_GH_API_SERVER);

extensions/ql-vscode/src/config.ts

@@ -2,11 +2,11 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import { cloneDbConfig, DbConfig } from './db-config';
 import * as chokidar from 'chokidar';
-import { DisposableObject } from '../pure/disposable-object';
+import { DisposableObject } from '../../pure/disposable-object';
 import { DbConfigValidator } from './db-config-validator';
-import { ValueResult } from '../common/value-result';
-import { App } from '../common/app';
-import { AppEvent, AppEventEmitter } from '../common/events';
+import { ValueResult } from '../../common/value-result';
+import { App } from '../../common/app';
+import { AppEvent, AppEventEmitter } from '../../common/events';
 
 export class DbConfigStore extends DisposableObject {
   public readonly onDidChangeConfig: AppEvent<void>;