Merge remote-tracking branch 'origin/main' into koesie10/add-metadata-to-repo-row

Author: koesie10

extensions/ql-vscode/.mocharc.json

@@ -1,6 +1,4 @@
 {
   "exit": true,
-  "require": [
-    "test/mocha.setup.js"
-  ]
+  "require": ["test/mocha.setup.js"]
 }

extensions/ql-vscode/package.json

@@ -1256,9 +1256,11 @@
     "test": "npm-run-all -p test:*",
     "test:unit": "mocha --config .mocharc.json test/pure-tests/**/*.ts",
     "test:view": "jest",
-    "preintegration": "rm -rf ./out/vscode-tests && gulp",
-    "integration": "node ./out/vscode-tests/run-integration-tests.js no-workspace,minimal-workspace",
-    "cli-integration": "npm run preintegration && node ./out/vscode-tests/run-integration-tests.js cli-integration",
+    "integration-setup": "rm -rf ./out/vscode-tests && gulp",
+    "integration": "npm run integration-setup && node ./out/vscode-tests/run-integration-tests.js no-workspace,minimal-workspace",
+    "integration:no-workspace": "npm run integration-setup && node ./out/vscode-tests/run-integration-tests.js no-workspace",
+    "integration:minimal-workspace": "npm run integration-setup && node ./out/vscode-tests/run-integration-tests.js minimal-workspace",
+    "cli-integration": "npm run integration-setup && node ./out/vscode-tests/run-integration-tests.js cli-integration",
     "update-vscode": "node ./node_modules/vscode/bin/install",
     "format": "tsfmt -r && eslint . --ext .ts,.tsx --fix",
     "lint": "eslint . --ext .ts,.tsx --max-warnings=0",

extensions/ql-vscode/src/extension.ts

@@ -525,9 +525,6 @@ async function activateWithInstalledDistribution(
   ctx.subscriptions.push(logScannerService);
   ctx.subscriptions.push(logScannerService.scanners.registerLogScannerProvider(new JoinOrderScannerProvider(() => joinOrderWarningThreshold())));
 
-  void logger.log('Reading query history');
-  await qhm.readQueryHistory();
-
   void logger.log('Initializing compare view.');
   const compareView = new CompareView(
     ctx,
@@ -1229,6 +1226,9 @@ async function activateWithInstalledDistribution(
 
   await commands.executeCommand('codeQLDatabases.removeOrphanedDatabases');
 
+  void logger.log('Reading query history');
+  await qhm.readQueryHistory();
+
   void logger.log('Successfully finished extension initialization.');
 
   return {

extensions/ql-vscode/src/history-item-label-provider.ts

@@ -7,6 +7,7 @@ import { RemoteQueryHistoryItem } from './remote-queries/remote-query-history-it
 import { VariantAnalysisHistoryItem } from './remote-queries/variant-analysis-history-item';
 import { assertNever } from './pure/helpers-pure';
 import { pluralize } from './pure/word';
+import { humanizeQueryStatus } from './query-status';
 
 interface InterpolateReplacements {
   t: string; // Start time
@@ -86,7 +87,7 @@ export class HistoryItemLabelProvider {
       q: `${item.remoteQuery.queryName} (${item.remoteQuery.language})`,
       d: buildRepoLabel(item),
       r: resultCount,
-      s: item.status,
+      s: humanizeQueryStatus(item.status),
       f: path.basename(item.remoteQuery.queryFilePath),
       '%': '%'
     };
@@ -99,7 +100,7 @@ export class HistoryItemLabelProvider {
       q: `${item.variantAnalysis.query.name} (${item.variantAnalysis.query.language})`,
       d: buildRepoLabel(item),
       r: resultCount,
-      s: item.status,
+      s: humanizeQueryStatus(item.status),
       f: path.basename(item.variantAnalysis.query.filePath),
       '%': '%',
     };

extensions/ql-vscode/src/mocks/scenarios/problem-query-warnings/13-getVariantAnalysis.json

@@ -966,7 +966,7 @@
             }
           ]
         },
-        "not_found_repo_nwos": {
+        "not_found_repos": {
           "repository_count": 110,
           "repository_full_names": [
             "evanw/node-source-map-support",

extensions/ql-vscode/src/mocks/scenarios/problem-query-warnings/14-getVariantAnalysis.json

@@ -966,7 +966,7 @@
             }
           ]
         },
-        "not_found_repo_nwos": {
+        "not_found_repos": {
           "repository_count": 110,
           "repository_full_names": [
             "evanw/node-source-map-support",

extensions/ql-vscode/src/mocks/scenarios/problem-query-warnings/15-getVariantAnalysis.json

@@ -966,7 +966,7 @@
             }
           ]
         },
-        "not_found_repo_nwos": {
+        "not_found_repos": {
           "repository_count": 110,
           "repository_full_names": [
             "evanw/node-source-map-support",

extensions/ql-vscode/src/mocks/scenarios/problem-query-warnings/16-getVariantAnalysis.json

@@ -966,7 +966,7 @@
             }
           ]
         },
-        "not_found_repo_nwos": {
+        "not_found_repos": {
           "repository_count": 110,
           "repository_full_names": [
             "evanw/node-source-map-support",

extensions/ql-vscode/src/mocks/scenarios/problem-query-warnings/17-getVariantAnalysis.json

@@ -966,7 +966,7 @@
             }
           ]
         },
-        "not_found_repo_nwos": {
+        "not_found_repos": {
           "repository_count": 110,
           "repository_full_names": [
             "evanw/node-source-map-support",

extensions/ql-vscode/src/mocks/scenarios/problem-query-warnings/18-getVariantAnalysis.json

@@ -970,7 +970,7 @@
             }
           ]
         },
-        "not_found_repo_nwos": {
+        "not_found_repos": {
           "repository_count": 110,
           "repository_full_names": [
             "evanw/node-source-map-support",