Merge remote-tracking branch 'origin/main' into koesie10/variant-analysis-remove-item-tests

Author: koesie10

.github/workflows/main.yml

@@ -47,7 +47,7 @@ jobs:
           cp dist/*.vsix artifacts
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: matrix.os == 'ubuntu-latest'
         with:
           name: vscode-codeql-extension

.vscode/settings.json

@@ -42,13 +42,28 @@
     "LANG": "en-US",
     "TZ": "UTC"
   },
-  // Uncomment to debug integration tests
-  // "jestrunner.debugOptions": {
-  //   "attachSimplePort": 9223,
-  //   "env": {
-  //     "VSCODE_WAIT_FOR_DEBUGGER": "true",
-  //   }
-  // },
+  "jestrunner.debugOptions": {
+    // Uncomment to debug integration tests
+    // "attachSimplePort": 9223,
+    "env": {
+      "LANG": "en-US",
+      "TZ": "UTC",
+      // Uncomment to debug integration tests
+      // "VSCODE_WAIT_FOR_DEBUGGER": "true",
+    }
+  },
+  "terminal.integrated.env.linux": {
+    "LANG": "en-US",
+    "TZ": "UTC"
+  },
+  "terminal.integrated.env.osx": {
+    "LANG": "en-US",
+    "TZ": "UTC"
+  },
+  "terminal.integrated.env.windows": {
+    "LANG": "en-US",
+    "TZ": "UTC"
+  },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true,

extensions/ql-vscode/package-lock.json

@@ -1286,7 +1286,7 @@
     "watch:webpack": "gulp watchView",
     "watch:files": "gulp watchTestData",
     "test": "npm-run-all -p test:*",
-    "test:unit": "jest --projects test",
+    "test:unit": "cross-env TZ=UTC LANG=en-US jest --projects test",
     "test:view": "jest --projects src/view",
     "integration": "npm-run-all integration:*",
     "integration:no-workspace": "jest --projects src/vscode-tests/no-workspace",
@@ -1397,6 +1397,7 @@
     "ansi-colors": "^4.1.1",
     "applicationinsights": "^2.3.5",
     "babel-loader": "^8.2.5",
+    "cross-env": "^7.0.3",
     "css-loader": "~3.1.0",
     "del": "^6.0.0",
     "eslint": "^8.23.1",

extensions/ql-vscode/package.json

@@ -1,3 +1,29 @@
+diff --git a/node_modules/jest-runner-vscode/dist/child/environment.js b/node_modules/jest-runner-vscode/dist/child/environment.js
+index 1ac28d5..f91f216 100644
+--- a/node_modules/jest-runner-vscode/dist/child/environment.js
++++ b/node_modules/jest-runner-vscode/dist/child/environment.js
+@@ -10,6 +10,21 @@ const wrap_io_1 = __importDefault(require("./wrap-io"));
+ const load_pnp_1 = __importDefault(require("./load-pnp"));
+ const ipc = new ipc_client_1.default('env');
+ class VSCodeEnvironment extends jest_environment_node_1.default {
++    constructor(config, context) {
++        super(config, context);
++        // The _VSCODE_NODE_MODULES is a proxy which will require a module if any property
++        // on it is accessed. This is a workaround for the fact that jest will call
++        // _isMockFunction on the module, which will cause that function to be required.
++        this.global._VSCODE_NODE_MODULES = new Proxy(this.global._VSCODE_NODE_MODULES, {
++          get(target, prop) {
++            if (prop === '_isMockFunction') {
++              return undefined;
++            }
++            return target[prop];
++          },
++        });
++    }
++
+     async setup() {
+         await super.setup();
+         await (0, load_pnp_1.default)();
 diff --git a/node_modules/jest-runner-vscode/dist/child/runner.js b/node_modules/jest-runner-vscode/dist/child/runner.js
 index 0663c5c..4991663 100644
 --- a/node_modules/jest-runner-vscode/dist/child/runner.js

extensions/ql-vscode/patches/jest-runner-vscode+3.0.1.patch

@@ -1,6 +1,11 @@
 import { pathExists, writeJSON, readJSON, readJSONSync } from "fs-extra";
 import { join } from "path";
-import { cloneDbConfig, DbConfig, SelectedDbItem } from "./db-config";
+import {
+  cloneDbConfig,
+  DbConfig,
+  ExpandedDbItem,
+  SelectedDbItem,
+} from "./db-config";
 import * as chokidar from "chokidar";
 import { DisposableObject, DisposeHandler } from "../../pure/disposable-object";
 import { DbConfigValidator } from "./db-config-validator";
@@ -72,6 +77,19 @@ export class DbConfigStore extends DisposableObject {
     await this.writeConfig(config);
   }
 
+  public async updateExpandedState(expandedItems: ExpandedDbItem[]) {
+    if (!this.config) {
+      throw Error("Cannot update expansion state if config is not loaded");
+    }
+
+    const config: DbConfig = {
+      ...this.config,
+      expanded: expandedItems,
+    };
+
+    await this.writeConfig(config);
+  }
+
   private async writeConfig(config: DbConfig): Promise<void> {
     await writeJSON(this.configPath, config, {
       spaces: 2,
@@ -137,6 +155,7 @@ export class DbConfigStore extends DisposableObject {
           databases: [],
         },
       },
+      expanded: [],
     };
   }
 }

extensions/ql-vscode/src/databases/config/db-config-store.ts

@@ -2,6 +2,7 @@
 
 export interface DbConfig {
   databases: DbConfigDatabases;
+  expanded: ExpandedDbItem[];
   selected?: SelectedDbItem;
 }
 
@@ -87,6 +88,37 @@ export interface LocalDatabase {
   storagePath: string;
 }
 
+export type ExpandedDbItem =
+  | RootLocalExpandedDbItem
+  | LocalUserDefinedListExpandedDbItem
+  | RootRemoteExpandedDbItem
+  | RemoteUserDefinedListExpandedDbItem;
+
+export enum ExpandedDbItemKind {
+  RootLocal = "rootLocal",
+  LocalUserDefinedList = "localUserDefinedList",
+  RootRemote = "rootRemote",
+  RemoteUserDefinedList = "remoteUserDefinedList",
+}
+
+export interface RootLocalExpandedDbItem {
+  kind: ExpandedDbItemKind.RootLocal;
+}
+
+export interface LocalUserDefinedListExpandedDbItem {
+  kind: ExpandedDbItemKind.LocalUserDefinedList;
+  listName: string;
+}
+
+export interface RootRemoteExpandedDbItem {
+  kind: ExpandedDbItemKind.RootRemote;
+}
+
+export interface RemoteUserDefinedListExpandedDbItem {
+  kind: ExpandedDbItemKind.RemoteUserDefinedList;
+  listName: string;
+}
+
 export function cloneDbConfig(config: DbConfig): DbConfig {
   return {
     databases: {
@@ -108,6 +140,7 @@ export function cloneDbConfig(config: DbConfig): DbConfig {
         databases: config.databases.local.databases.map((db) => ({ ...db })),
       },
     },
+    expanded: config.expanded.map(cloneDbConfigExpandedItem),
     selected: config.selected
       ? cloneDbConfigSelectedItem(config.selected)
       : undefined,
@@ -150,3 +183,17 @@ function cloneDbConfigSelectedItem(selected: SelectedDbItem): SelectedDbItem {
       };
   }
 }
+
+function cloneDbConfigExpandedItem(item: ExpandedDbItem): ExpandedDbItem {
+  switch (item.kind) {
+    case ExpandedDbItemKind.RootLocal:
+    case ExpandedDbItemKind.RootRemote:
+      return { kind: item.kind };
+    case ExpandedDbItemKind.LocalUserDefinedList:
+    case ExpandedDbItemKind.RemoteUserDefinedList:
+      return {
+        kind: item.kind,
+        listName: item.listName,
+      };
+  }
+}