refactor: source EXTENSION_ID/ENV_VARS/OUTPUT_CHANNEL_NAME from constants

src/commands/flow.ts

@@ -1,5 +1,13 @@
 import * as vscode from "vscode";
-import { LOG_EVENTS, REF_TYPES, REV_KINDS, SIDE_B_KINDS, TITLE_PREFIX, UI_TEXT } from "../constants";
+import {
+  LOG_EVENTS,
+  OUTPUT_CHANNEL_NAME,
+  REF_TYPES,
+  REV_KINDS,
+  SIDE_B_KINDS,
+  TITLE_PREFIX,
+  UI_TEXT,
+} from "../constants";
 import type { GitRepo } from "../git/GitRepo";
 import type { GitRunner } from "../git/GitRunner";
 import type { GitApi } from "../vscodeGitApi";
@@ -29,7 +37,7 @@ export const reportGitError = ({ output, op, e }: { output: vscode.OutputChannel
   if (e.stderr !== undefined && e.stderr !== "") {
     output.appendLine(e.stderr);
   }
-  void vscode.window.showErrorMessage(`${TITLE_PREFIX} ${op} failed (see Output → Diffr).`);
+  void vscode.window.showErrorMessage(`${TITLE_PREFIX} ${op} failed (see Output → ${OUTPUT_CHANNEL_NAME}).`);
 };
 
 export const resolveSideB = async ({

src/logger.ts

@@ -1,7 +1,5 @@
 import pino, { type Logger as PinoLogger, type Level, multistream } from "pino";
-import { LOG_LEVELS } from "./constants";
-
-const ENV_LOG_LEVEL_VAR = "DIFFR_LOG_LEVEL";
+import { ENV_VARS, LOG_LEVELS } from "./constants";
 
 export interface Logger {
   trace: (fields: object, msg?: string) => void;
@@ -18,7 +16,7 @@ export interface LogStreamEntry {
 
 const streams: LogStreamEntry[] = [{ stream: process.stdout }];
 
-const envLevel = process.env[ENV_LOG_LEVEL_VAR];
+const envLevel = process.env[ENV_VARS.logLevel];
 
 const buildPino = (): PinoLogger =>
   pino(

src/test/runTests.ts

@@ -2,6 +2,7 @@ import * as path from "node:path";
 import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { runTests } from "@vscode/test-electron";
+import { ENV_VARS, EXTENSION_ID } from "../constants";
 
 const repoRoot = path.resolve(__dirname, "..", "..");
 const extensionDevelopmentPath = repoRoot;
@@ -30,7 +31,7 @@ const main = async (): Promise<void> => {
   }
   const coverageDir = process.env["NODE_V8_COVERAGE"];
   const extensionTestsEnv: Record<string, string> = {
-    DIFFR_E2E: "1",
+    [ENV_VARS.e2e]: "1",
   };
   if (coverageDir !== undefined && coverageDir !== "") {
     extensionTestsEnv["NODE_V8_COVERAGE"] = coverageDir;
@@ -39,7 +40,7 @@ const main = async (): Promise<void> => {
     extensionDevelopmentPath,
     extensionTestsPath,
     extensionTestsEnv,
-    launchArgs: [workspacePath, "--disable-telemetry", "--enable-proposed-api", "nimblesite.diffr"],
+    launchArgs: [workspacePath, "--disable-telemetry", "--enable-proposed-api", EXTENSION_ID],
   });
 };
 

src/test/suite/activation.test.ts

@@ -1,9 +1,8 @@
 import { strict as assert } from "node:assert";
 import * as vscode from "vscode";
-import { COMMAND_IDS, OUTPUT_CHANNEL_NAME } from "../../constants";
+import { COMMAND_IDS, EXTENSION_ID, OUTPUT_CHANNEL_NAME } from "../../constants";
 import { tick } from "./helpers";
 
-const EXTENSION_ID = "nimblesite.diffr";
 const TICK_MS = 20;
 
 const ALL_COMMAND_IDS: readonly string[] = Object.values(COMMAND_IDS);

src/test/suite/commands.test.ts

@@ -1,6 +1,6 @@
 import { strict as assert } from "node:assert";
 import * as vscode from "vscode";
-import { COMMAND_IDS } from "../../constants";
+import { COMMAND_IDS, EXTENSION_ID } from "../../constants";
 import {
   accept,
   allDiffTabs,
@@ -16,8 +16,6 @@ import {
   workspaceRoot,
 } from "./helpers";
 
-const EXTENSION_ID = "nimblesite.diffr";
-
 const ensureActivated = async (): Promise<void> => {
   const ext = vscode.extensions.getExtension(EXTENSION_ID);
   if (ext !== undefined && !ext.isActive) {

src/test/suite/contentProvider.test.ts

@@ -1,9 +1,8 @@
 import { strict as assert } from "node:assert";
 import * as vscode from "vscode";
+import { EXTENSION_ID } from "../../constants";
 import { readSeedShas, waitForRepoReady } from "./helpers";
 
-const EXTENSION_ID = "nimblesite.diffr";
-
 const readDiffr = async (uriString: string): Promise<string> => {
   const doc = await vscode.workspace.openTextDocument(vscode.Uri.parse(uriString));
   return doc.getText();