Fix error in extension.test.ts (#1134)

Author: matthewbastien

test/integration-tests/extension.test.ts

@@ -14,32 +14,37 @@
 
 import * as vscode from "vscode";
 import * as assert from "assert";
-import * as swiftExtension from "../../src/extension";
+import { Api } from "../../src/extension";
 import { WorkspaceContext } from "../../src/WorkspaceContext";
 import { getBuildAllTask } from "../../src/tasks/SwiftTaskProvider";
 import { SwiftExecution } from "../../src/tasks/SwiftExecution";
 import { testAssetUri } from "../fixtures";
 import { FolderContext } from "../../src/FolderContext";
 
-export const rootWorkspaceFolder = vscode.workspace.workspaceFolders?.values().next().value;
-export const globalWorkspaceContextPromise = new Promise<WorkspaceContext>(resolve => {
-    const workspaceFolder = vscode.workspace.workspaceFolders?.values().next().value;
-    if (!workspaceFolder) {
-        throw new Error("No workspace folders found in workspace");
+function getRootWorkspaceFolder(): vscode.WorkspaceFolder {
+    const result = vscode.workspace.workspaceFolders?.at(0);
+    assert(result, "No workspace folders were opened for the tests to use");
+    return result;
+}
+
+export const globalWorkspaceContextPromise: Promise<WorkspaceContext> = (async () => {
+    const workspaceFolder = getRootWorkspaceFolder();
+    const ext = vscode.extensions.getExtension<Api>("sswg.swift-lang");
+    if (!ext) {
+        throw new Error(`Unable to find extension "sswg.swift-lang"`);
     }
-    const ext = vscode.extensions.getExtension<swiftExtension.Api>("sswg.swift-lang")!;
-    ext.activate().then(api => {
-        const packageFolder = testAssetUri("defaultPackage");
-        api.workspaceContext
-            .addPackageFolder(packageFolder, rootWorkspaceFolder)
-            .then(() => resolve(api.workspaceContext));
-    });
-});
+    const api = await ext.activate();
+    const packageFolder = testAssetUri("defaultPackage");
+    await api.workspaceContext.addPackageFolder(packageFolder, workspaceFolder);
+    return api.workspaceContext;
+})();
+
 export const folderContextPromise = async (name: string): Promise<FolderContext> => {
+    const workspaceFolder = getRootWorkspaceFolder();
     const workspaceContext = await globalWorkspaceContextPromise;
     let folder = workspaceContext.folders.find(f => f.workspaceFolder.name === `test/${name}`);
     if (!folder) {
-        folder = await workspaceContext.addPackageFolder(testAssetUri(name), rootWorkspaceFolder);
+        folder = await workspaceContext.addPackageFolder(testAssetUri(name), workspaceFolder);
     }
     return folder;
 };