Update integration test version numbers

Also, fix a typo and remove comment.

.github/workflows/main.yml

@@ -121,7 +121,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        version: ['v2.3.1', 'v2.3.0']
+        version: ['v2.2.6', 'v2.3.3', 'v2.4.0']
     env:
       CLI_VERSION: ${{ matrix.version }}
 

extensions/ql-vscode/src/query-history.ts

@@ -60,12 +60,6 @@ interface QueryHistoryDataProvider extends vscode.TreeDataProvider<CompletedQuer
  * Tree data provider for the query history view.
  */
 class HistoryTreeDataProvider extends DisposableObject implements QueryHistoryDataProvider {
-  /**
-   * XXX: This idiom for how to get a `.fire()`-able event emitter was
-   * cargo culted from another vscode extension. It seems rather
-   * involved and I hope there's something better that can be done
-   * instead.
-   */
   private _onDidChangeTreeData = super.push(new vscode.EventEmitter<CompletedQuery | undefined>());
 
   readonly onDidChangeTreeData: vscode.Event<CompletedQuery | undefined> = this

extensions/ql-vscode/src/vscode-tests/ensureCli.ts

@@ -35,7 +35,7 @@ const _10MB = _1MB * 10;
 
 // CLI version to test. Hard code the latest as default. And be sure
 // to update the env if it is not otherwise set.
-const CLI_VERSION = process.env.CLI_VERSION || 'v2.3.1';
+const CLI_VERSION = process.env.CLI_VERSION || 'v2.4.0';
 process.env.CLI_VERSION = CLI_VERSION;
 
 // Base dir where CLIs will be downloaded into

extensions/ql-vscode/src/vscode-tests/run-integration-tests.ts

@@ -28,8 +28,8 @@ const VSCODE_VERSION = 'stable';
 //   - minimal-workspace - Tests with a simple workspace selected upon launch.
 //   - cli-integration - Tests that require a cli to invoke actual commands
 enum TestDir {
-  NoWorskspace = 'no-workspace',
-  MinimalWorskspace = 'minimal-workspace',
+  NoWorksspace = 'no-workspace',
+  MinimalWorksspace = 'minimal-workspace',
   CliIntegration = 'cli-integration'
 }
 
@@ -108,12 +108,12 @@ main();
 
 function getLaunchArgs(dir: TestDir) {
   switch (dir) {
-    case TestDir.NoWorskspace:
+    case TestDir.NoWorksspace:
       return [
         '--disable-extensions'
       ];
 
-    case TestDir.MinimalWorskspace:
+    case TestDir.MinimalWorksspace:
       return [
         '--disable-extensions',
         path.resolve(__dirname, '../../test/data')