shorten imports in tests by using @src/ to import files from src/

Author: matthewbastien

package-lock.json

@@ -2040,6 +2040,7 @@
     "source-map-support": "^0.5.21",
     "strip-ansi": "^6.0.1",
     "svgo": "^4.0.0",
+    "tsconfig-paths": "^4.2.0",
     "tsx": "^4.20.3",
     "typescript": "^5.9.2",
     "winston": "^3.17.0",

package.json

@@ -15,11 +15,23 @@
 // Use source-map-support to get better stack traces
 import "source-map-support/register";
 
+import * as fs from "fs";
+import * as path from "path";
 import * as chai from "chai";
 import * as sinonChai from "sinon-chai";
 import * as chaiAsPromised from "chai-as-promised";
 import * as chaiSubset from "chai-subset";
 import { installTagSupport } from "./tags";
+import * as tsConfigPaths from "tsconfig-paths";
+
+const tsConfig = JSON.parse(
+    // __dirname points to dist/test when transpiled, but we need the tsconfig.json in the real test/
+    fs.readFileSync(path.join(__dirname, "../../test/tsconfig.json"), "utf-8")
+);
+tsConfigPaths.register({
+    baseUrl: __dirname,
+    paths: tsConfig.compilerOptions.paths,
+});
 
 chai.use(sinonChai);
 chai.use(chaiAsPromised);

test/common.ts

@@ -14,10 +14,10 @@
 
 import * as vscode from "vscode";
 import * as path from "path";
-import { SwiftProcess } from "../src/tasks/SwiftProcess";
-import { SwiftExecution } from "../src/tasks/SwiftExecution";
-import { SwiftTask, createSwiftTask } from "../src/tasks/SwiftTaskProvider";
-import { SwiftToolchain } from "../src/toolchain/toolchain";
+import { SwiftProcess } from "@src/tasks/SwiftProcess";
+import { SwiftExecution } from "@src/tasks/SwiftExecution";
+import { SwiftTask, createSwiftTask } from "@src/tasks/SwiftTaskProvider";
+import { SwiftToolchain } from "@src/toolchain/toolchain";
 
 /** Workspace folder class */
 class TestWorkspaceFolder implements vscode.WorkspaceFolder {

test/fixtures.ts

@@ -14,7 +14,7 @@
 
 import * as assert from "assert";
 import * as vscode from "vscode";
-import { WorkspaceContext } from "../../src/WorkspaceContext";
+import { WorkspaceContext } from "@src/WorkspaceContext";
 import { testAssetUri } from "../fixtures";
 import { activateExtensionForTest, updateSettings } from "./utilities/testutilities";
 import { closeAllEditors } from "../utilities/commands";

test/integration-tests/BackgroundCompilation.test.ts

@@ -14,24 +14,24 @@
 
 import * as assert from "assert";
 import * as vscode from "vscode";
-import { SwiftToolchain } from "../../src/toolchain/toolchain";
+import { SwiftToolchain } from "@src/toolchain/toolchain";
 import {
     executeTaskAndWaitForResult,
     waitForNoRunningTasks,
     waitForStartTaskProcess,
 } from "../utilities/tasks";
-import { WorkspaceContext } from "../../src/WorkspaceContext";
+import { WorkspaceContext } from "@src/WorkspaceContext";
 import { testAssetUri, testSwiftTask } from "../fixtures";
-import { createBuildAllTask, resetBuildAllTaskCache } from "../../src/tasks/SwiftTaskProvider";
-import { DiagnosticsManager } from "../../src/DiagnosticsManager";
-import { FolderContext } from "../../src/FolderContext";
-import { Version } from "../../src/utilities/version";
+import { createBuildAllTask, resetBuildAllTaskCache } from "@src/tasks/SwiftTaskProvider";
+import { DiagnosticsManager } from "@src/DiagnosticsManager";
+import { FolderContext } from "@src/FolderContext";
+import { Version } from "@src/utilities/version";
 import {
     activateExtensionForSuite,
     folderInRootWorkspace,
     updateSettings,
 } from "./utilities/testutilities";
-import { DiagnosticStyle } from "../../src/configuration";
+import { DiagnosticStyle } from "@src/configuration";
 import { expect } from "chai";
 import { tag } from "../tags";
 

test/integration-tests/DiagnosticsManager.test.ts

@@ -21,7 +21,7 @@ import {
     activateExtensionForTest,
     deactivateExtension,
 } from "./utilities/testutilities";
-import { WorkspaceContext } from "../../src/WorkspaceContext";
+import { WorkspaceContext } from "@src/WorkspaceContext";
 import { testAssetUri } from "../fixtures";
 import { assertContains } from "./testexplorer/utilities";
 import { tag } from "../tags";

test/integration-tests/ExtensionActivation.test.ts

@@ -13,13 +13,13 @@
 //===----------------------------------------------------------------------===//
 
 import * as assert from "assert";
-import * as toolchain from "../../src/ui/ToolchainSelection";
+import * as toolchain from "@src/ui/ToolchainSelection";
 import { afterEach } from "mocha";
 import { stub, restore } from "sinon";
 import { testAssetUri } from "../fixtures";
-import { WorkspaceContext } from "../../src/WorkspaceContext";
-import { FolderContext } from "../../src/FolderContext";
-import { SwiftToolchain } from "../../src/toolchain/toolchain";
+import { WorkspaceContext } from "@src/WorkspaceContext";
+import { FolderContext } from "@src/FolderContext";
+import { SwiftToolchain } from "@src/toolchain/toolchain";
 import { activateExtensionForSuite, getRootWorkspaceFolder } from "./utilities/testutilities";
 import { MockedFunction, mockGlobalValue } from "../MockUtils";
 

test/integration-tests/FolderContext.test.ts

@@ -14,9 +14,9 @@
 
 import * as assert from "assert";
 import { testAssetUri } from "../fixtures";
-import { SwiftPackage } from "../../src/SwiftPackage";
-import { SwiftToolchain } from "../../src/toolchain/toolchain";
-import { Version } from "../../src/utilities/version";
+import { SwiftPackage } from "@src/SwiftPackage";
+import { SwiftToolchain } from "@src/toolchain/toolchain";
+import { Version } from "@src/utilities/version";
 import { tag } from "../tags";
 
 tag("medium").suite("SwiftPackage Test Suite", function () {

test/integration-tests/SwiftPackage.test.ts

@@ -20,15 +20,15 @@ import {
     waitForDebugAdapterRequest,
     waitUntilDebugSessionTerminates,
 } from "../utilities/debug";
-import { Version } from "../../src/utilities/version";
+import { Version } from "@src/utilities/version";
 import {
     activateExtensionForSuite,
     folderInRootWorkspace,
     updateSettings,
 } from "./utilities/testutilities";
-import { WorkspaceContext } from "../../src/WorkspaceContext";
+import { WorkspaceContext } from "@src/WorkspaceContext";
 import { closeAllEditors } from "../utilities/commands";
-import { Commands } from "../../src/commands";
+import { Commands } from "@src/commands";
 import { tag } from "../tags";
 
 tag("large").suite("SwiftSnippet Test Suite", function () {