Use GHEC-DR URL in file blob URL

Author: koesie10

extensions/ql-vscode/src/extension.ts

@@ -865,8 +865,10 @@ async function activateWithInstalledDistribution(
     "variant-analyses",
   );
   await ensureDir(variantAnalysisStorageDir);
+  const variantAnalysisConfig = new VariantAnalysisConfigListener();
   const variantAnalysisResultsManager = new VariantAnalysisResultsManager(
     cliServer,
+    variantAnalysisConfig,
     extLogger,
   );
 
@@ -876,7 +878,7 @@ async function activateWithInstalledDistribution(
     variantAnalysisStorageDir,
     variantAnalysisResultsManager,
     dbModule.dbManager,
-    new VariantAnalysisConfigListener(),
+    variantAnalysisConfig,
   );
   ctx.subscriptions.push(variantAnalysisManager);
   ctx.subscriptions.push(variantAnalysisResultsManager);

extensions/ql-vscode/src/variant-analysis/variant-analysis-results-manager.ts

@@ -23,6 +23,7 @@ import { DisposableObject } from "../common/disposable-object";
 import { EventEmitter } from "vscode";
 import { unzipToDirectoryConcurrently } from "../common/unzip-concurrently";
 import { readRepoTask, writeRepoTask } from "./repo-tasks-store";
+import type { VariantAnalysisConfig } from "../config";
 
 type CacheKey = `${number}/${string}`;
 
@@ -62,6 +63,7 @@ export class VariantAnalysisResultsManager extends DisposableObject {
 
   constructor(
     private readonly cliServer: CodeQLCliServer,
+    private readonly config: VariantAnalysisConfig,
     private readonly logger: Logger,
   ) {
     super();
@@ -192,7 +194,7 @@ export class VariantAnalysisResultsManager extends DisposableObject {
       throw new Error("Missing database commit SHA");
     }
 
-    const fileLinkPrefix = this.createGitHubDotcomFileLinkPrefix(
+    const fileLinkPrefix = this.createGitHubFileLinkPrefix(
       repoTask.repository.fullName,
       repoTask.databaseCommitSha,
     );
@@ -283,11 +285,11 @@ export class VariantAnalysisResultsManager extends DisposableObject {
     return join(variantAnalysisStoragePath, fullName);
   }
 
-  private createGitHubDotcomFileLinkPrefix(
-    fullName: string,
-    sha: string,
-  ): string {
-    return `https://github.com/${fullName}/blob/${sha}`;
+  private createGitHubFileLinkPrefix(fullName: string, sha: string): string {
+    return new URL(
+      `/${fullName}/blob/${sha}`,
+      this.config.githubUrl,
+    ).toString();
   }
 
   public removeAnalysisResults(variantAnalysis: VariantAnalysis) {

extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-manager.test.ts

@@ -78,11 +78,12 @@ describe("Variant Analysis Manager", () => {
       new DbConfigStore(app),
       createMockVariantAnalysisConfig(),
     );
+    const variantAnalysisConfig = createMockVariantAnalysisConfig();
     variantAnalysisResultsManager = new VariantAnalysisResultsManager(
       cli,
+      variantAnalysisConfig,
       extLogger,
     );
-    const variantAnalysisConfig = createMockVariantAnalysisConfig();
     variantAnalysisManager = new VariantAnalysisManager(
       app,
       cli,

extensions/ql-vscode/test/vscode-tests/activated-extension/variant-analysis/variant-analysis-results-manager.test.ts

@@ -16,6 +16,7 @@ import type {
   VariantAnalysisScannedRepositoryResult,
 } from "../../../../src/variant-analysis/shared/variant-analysis";
 import { mockedObject } from "../../utils/mocking.helpers";
+import { createMockVariantAnalysisConfig } from "../../../factories/config";
 
 jest.setTimeout(10_000);
 
@@ -27,8 +28,10 @@ describe(VariantAnalysisResultsManager.name, () => {
     variantAnalysisId = faker.number.int();
 
     const cli = mockedObject<CodeQLCliServer>({});
+    const variantAnalysisConfig = createMockVariantAnalysisConfig();
     variantAnalysisResultsManager = new VariantAnalysisResultsManager(
       cli,
+      variantAnalysisConfig,
       extLogger,
     );
   });

extensions/ql-vscode/test/vscode-tests/cli-integration/variant-analysis/variant-analysis-manager.test.ts

@@ -56,11 +56,12 @@ describe("Variant Analysis Manager", () => {
       new DbConfigStore(app),
       createMockVariantAnalysisConfig(),
     );
+    const variantAnalysisConfig = createMockVariantAnalysisConfig();
     const variantAnalysisResultsManager = new VariantAnalysisResultsManager(
       cli,
+      variantAnalysisConfig,
       extLogger,
     );
-    const variantAnalysisConfig = createMockVariantAnalysisConfig();
     variantAnalysisManager = new VariantAnalysisManager(
       app,
       cli,