Merge remote-tracking branch 'upstream/main' into aeisenberg/run-with-all-data-extensions

Author: aeisenberg

.vscode/settings.json

@@ -48,6 +48,14 @@
     "env": {
       "LANG": "en-US",
       "TZ": "UTC",
+
+      // Uncomment to set a custom path to a CodeQL checkout.
+      // "TEST_CODEQL_PATH": "../codeql",
+
+      // Uncomment to set a custom path to a CodeQL CLI executable.
+      // This is the CodeQL version that will be used in the tests.
+      // "CLI_PATH": "/path/to/customg/codeql",
+
       // Uncomment to debug integration tests
       // "VSCODE_WAIT_FOR_DEBUGGER": "true",
     }

extensions/ql-vscode/package.json

@@ -377,7 +377,7 @@
       },
       {
         "command": "codeQLVariantAnalysisRepositories.openConfigFile",
-        "title": "Open Database Configuration File",
+        "title": "Open database configuration file",
         "icon": "$(json)"
       },
       {
@@ -476,7 +476,7 @@
       },
       {
         "command": "codeQLDatabases.setCurrentDatabase",
-        "title": "Set Current Database"
+        "title": "Select"
       },
       {
         "command": "codeQLDatabases.removeDatabase",

extensions/ql-vscode/src/databases/ui/db-panel.ts

@@ -254,6 +254,11 @@ export class DbPanel extends DisposableObject {
         "Not a selectable database item. Please select a valid item.",
       );
     }
+
+    // Optimistically update the UI to select the item that the user
+    // selected to avoid delay in the UI.
+    this.dataProvider.updateSelectedItem(treeViewItem);
+
     await this.dbManager.setSelectedDbItem(treeViewItem.dbItem);
   }
 

extensions/ql-vscode/src/databases/ui/db-tree-data-provider.ts

@@ -48,6 +48,23 @@ export class DbTreeDataProvider
     });
   }
 
+  /**
+   * Updates the selected item and re-renders the tree.
+   * @param selectedItem The item to select.
+   */
+  public updateSelectedItem(selectedItem: DbTreeViewItem): void {
+    // Unselect all items
+    for (const item of this.dbTreeItems) {
+      item.setAsUnselected();
+    }
+
+    // Select the new item
+    selectedItem.setAsSelected();
+
+    // Re-render the tree
+    this._onDidChangeTreeData.fire(undefined);
+  }
+
   /**
    * Called when expanding a node (including the root node).
    * @param node The node to expand.

extensions/ql-vscode/src/databases/ui/db-tree-view-item.ts

@@ -36,11 +36,19 @@ export class DbTreeViewItem extends vscode.TreeItem {
     if (dbItem) {
       this.contextValue = getContextValue(dbItem);
       if (isSelectableDbItem(dbItem) && dbItem.selected) {
-        // Define the resource id to drive the UI to render this item as selected.
-        this.resourceUri = vscode.Uri.parse(SELECTED_DB_ITEM_RESOURCE_URI);
+        this.setAsSelected();
       }
     }
   }
+
+  public setAsSelected(): void {
+    // Define the resource id to drive the UI to render this item as selected.
+    this.resourceUri = vscode.Uri.parse(SELECTED_DB_ITEM_RESOURCE_URI);
+  }
+
+  public setAsUnselected(): void {
+    this.resourceUri = undefined;
+  }
 }
 
 function getContextValue(dbItem: DbItem): string | undefined {

extensions/ql-vscode/src/extension.ts

@@ -4,28 +4,28 @@ import {
   CancellationTokenSource,
   commands,
   Disposable,
+  env,
   ExtensionContext,
   extensions,
   languages,
   ProgressLocation,
   ProgressOptions,
+  ProviderResult,
+  QuickPickItem,
+  Range,
   Uri,
+  version as vscodeVersion,
   window as Window,
-  env,
   window,
-  QuickPickItem,
-  Range,
   workspace,
-  ProviderResult,
-  version as vscodeVersion,
 } from "vscode";
 import { LanguageClient } from "vscode-languageclient/node";
-import { platform, arch } from "os";
+import { arch, platform } from "os";
 import { ensureDir } from "fs-extra";
-import { join, basename } from "path";
+import { basename, join } from "path";
 import { dirSync } from "tmp-promise";
 import { testExplorerExtensionId, TestHub } from "vscode-test-adapter-api";
-import { parse, lt } from "semver";
+import { lt, parse } from "semver";
 
 import { AstViewer } from "./astViewer";
 import {
@@ -38,7 +38,6 @@ import {
   CliConfigListener,
   DistributionConfigListener,
   isCanary,
-  isVariantAnalysisLiveResultsEnabled,
   joinOrderWarningThreshold,
   MAX_QUERIES,
   QueryHistoryConfigListener,
@@ -48,10 +47,10 @@ import { install } from "./languageSupport";
 import { DatabaseItem, DatabaseManager } from "./databases";
 import { DatabaseUI } from "./databases-ui";
 import {
-  TemplateQueryDefinitionProvider,
-  TemplateQueryReferenceProvider,
   TemplatePrintAstProvider,
   TemplatePrintCfgProvider,
+  TemplateQueryDefinitionProvider,
+  TemplateQueryReferenceProvider,
 } from "./contextual/templateProvider";
 import {
   DEFAULT_DISTRIBUTION_VERSION_RANGE,
@@ -65,22 +64,22 @@ import {
 } from "./distribution";
 import {
   findLanguage,
-  tmpDirDisposal,
-  showBinaryChoiceDialog,
   showAndLogErrorMessage,
-  showAndLogWarningMessage,
+  showAndLogExceptionWithTelemetry,
   showAndLogInformationMessage,
+  showAndLogWarningMessage,
+  showBinaryChoiceDialog,
   showInformationMessageWithAction,
   tmpDir,
-  showAndLogExceptionWithTelemetry,
+  tmpDirDisposal,
 } from "./helpers";
 import { asError, assertNever, getErrorMessage } from "./pure/helpers-pure";
 import { spawnIdeServer } from "./ide-server";
 import { ResultsView } from "./interface";
 import { WebviewReveal } from "./interface-utils";
 import {
-  ideServerLogger,
   extLogger,
+  ideServerLogger,
   ProgressReporter,
   queryServerLogger,
 } from "./common";
@@ -98,25 +97,20 @@ import {
   commandRunner,
   commandRunnerWithProgress,
   ProgressCallback,
-  withProgress,
   ProgressUpdate,
+  withProgress,
 } from "./commandRunner";
 import { CodeQlStatusBarHandler } from "./status-bar";
-
-import { RemoteQueriesManager } from "./remote-queries/remote-queries-manager";
-import { RemoteQueryResult } from "./remote-queries/remote-query-result";
 import { URLSearchParams } from "url";
 import {
   handleDownloadPacks,
   handleInstallPackDependencies,
 } from "./packaging";
 import { HistoryItemLabelProvider } from "./query-history/history-item-label-provider";
 import {
-  exportRemoteQueryResults,
   exportSelectedRemoteQueryResults,
   exportVariantAnalysisResults,
 } from "./remote-queries/export-results";
-import { RemoteQuery } from "./remote-queries/remote-query";
 import { EvalLogViewer } from "./eval-log-viewer";
 import { SummaryLanguageSupport } from "./log-insights/summary-language-support";
 import { JoinOrderScannerProvider } from "./log-insights/join-order";
@@ -656,23 +650,11 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  void extLogger.log("Initializing remote queries manager.");
-  const rqm = new RemoteQueriesManager(
-    ctx,
-    app,
-    cliServer,
-    queryStorageDir,
-    extLogger,
-  );
-  ctx.subscriptions.push(rqm);
-
   void extLogger.log("Initializing query history.");
   const qhm = new QueryHistoryManager(
-    app,
     qs,
     dbm,
     localQueryResultsView,
-    rqm,
     variantAnalysisManager,
     evalLogViewer,
     queryStorageDir,
@@ -1112,19 +1094,11 @@ async function activateWithInstalledDistribution(
             message: "Getting credentials",
           });
 
-          if (isVariantAnalysisLiveResultsEnabled()) {
-            await variantAnalysisManager.runVariantAnalysis(
-              uri || window.activeTextEditor?.document.uri,
-              progress,
-              token,
-            );
-          } else {
-            await rqm.runRemoteQuery(
-              uri || window.activeTextEditor?.document.uri,
-              progress,
-              token,
-            );
-          }
+          await variantAnalysisManager.runVariantAnalysis(
+            uri || window.activeTextEditor?.document.uri,
+            progress,
+            token,
+          );
         } else {
           throw new Error(
             "Variant analysis requires the CodeQL Canary version to run.",
@@ -1138,21 +1112,6 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  ctx.subscriptions.push(
-    commandRunner(
-      "codeQL.monitorRemoteQuery",
-      async (queryId: string, query: RemoteQuery, token: CancellationToken) => {
-        await rqm.monitorRemoteQuery(queryId, query, token);
-      },
-    ),
-  );
-
-  ctx.subscriptions.push(
-    commandRunner("codeQL.copyRepoList", async (queryId: string) => {
-      await rqm.copyRemoteQueryRepoListToClipboard(queryId);
-    }),
-  );
-
   ctx.subscriptions.push(
     commandRunner(
       "codeQL.openVariantAnalysisLogs",
@@ -1215,30 +1174,12 @@ async function activateWithInstalledDistribution(
     ),
   );
 
-  ctx.subscriptions.push(
-    commandRunner(
-      "codeQL.autoDownloadRemoteQueryResults",
-      async (queryResult: RemoteQueryResult, token: CancellationToken) => {
-        await rqm.autoDownloadRemoteQueryResults(queryResult, token);
-      },
-    ),
-  );
-
   ctx.subscriptions.push(
     commandRunner("codeQL.exportSelectedVariantAnalysisResults", async () => {
       await exportSelectedRemoteQueryResults(qhm);
     }),
   );
 
-  ctx.subscriptions.push(
-    commandRunner(
-      "codeQL.exportRemoteQueryResults",
-      async (queryId: string) => {
-        await exportRemoteQueryResults(qhm, rqm, queryId, app.credentials);
-      },
-    ),
-  );
-
   ctx.subscriptions.push(
     commandRunnerWithProgress(
       "codeQL.exportVariantAnalysisResults",

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

@@ -7,7 +7,6 @@ import {
   getRawQueryName,
   QueryHistoryInfo,
 } from "./query-history-info";
-import { RemoteQueryHistoryItem } from "../remote-queries/remote-query-history-item";
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
 import { assertNever } from "../pure/helpers-pure";
 import { pluralize } from "../pure/word";
@@ -34,9 +33,6 @@ export class HistoryItemLabelProvider {
       case "local":
         replacements = this.getLocalInterpolateReplacements(item);
         break;
-      case "remote":
-        replacements = this.getRemoteInterpolateReplacements(item);
-        break;
       case "variant-analysis":
         replacements = this.getVariantAnalysisInterpolateReplacements(item);
         break;
@@ -92,25 +88,6 @@ export class HistoryItemLabelProvider {
     };
   }
 
-  private getRemoteInterpolateReplacements(
-    item: RemoteQueryHistoryItem,
-  ): InterpolateReplacements {
-    const resultCount = item.resultCount
-      ? `(${pluralize(item.resultCount, "result", "results")})`
-      : "";
-    return {
-      t: new Date(item.remoteQuery.executionStartTime).toLocaleString(
-        env.language,
-      ),
-      q: `${item.remoteQuery.queryName} (${item.remoteQuery.language})`,
-      d: buildRepoLabel(item),
-      r: resultCount,
-      s: humanizeQueryStatus(item.status),
-      f: basename(item.remoteQuery.queryFilePath),
-      "%": "%",
-    };
-  }
-
   private getVariantAnalysisInterpolateReplacements(
     item: VariantAnalysisHistoryItem,
   ): InterpolateReplacements {

extensions/ql-vscode/src/query-history/history-tree-data-provider.ts

@@ -236,8 +236,6 @@ export class HistoryTreeDataProvider
     switch (item.t) {
       case "local":
         return item.initialInfo.start.getTime();
-      case "remote":
-        return item.remoteQuery.executionStartTime;
       case "variant-analysis":
         return item.variantAnalysis.executionStartTime;
       default: