Fix errors after rebase

Author: award999

test/integration-tests/SwiftSnippet.test.ts

@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import * as vscode from "vscode";
-import { folderContextPromise } from "./extension.test";
 import { testAssetPath, testAssetUri } from "../fixtures";
 import { waitForNoRunningTasks } from "../utilities/tasks";
 import { expect } from "chai";
@@ -24,26 +23,33 @@ import {
     waitUntilDebugSessionTerminates,
 } from "../utilities/debug";
 import { Version } from "../../src/utilities/version";
+import { activateExtensionForSuite, folderInRootWorkspace } from "./utilities/testutilities";
+import { WorkspaceContext } from "../../src/WorkspaceContext";
 
 suite("SwiftSnippet Test Suite", () => {
     const uri = testAssetUri("defaultPackage/Snippets/hello.swift");
     const breakpoints = [
         new vscode.SourceBreakpoint(new vscode.Location(uri, new vscode.Position(2, 0))),
     ];
+    let workspaceContext: WorkspaceContext;
 
-    suiteSetup(async function () {
-        const folder = await folderContextPromise("defaultPackage");
-        if (folder.workspaceContext.toolchain.swiftVersion.isLessThan(new Version(6, 0, 0))) {
-            this.skip();
-        }
-        await waitForNoRunningTasks();
+    activateExtensionForSuite({
+        async setup(ctx) {
+            workspaceContext = ctx;
 
-        // File needs to be open for command to be enabled
-        const doc = await vscode.workspace.openTextDocument(uri.fsPath);
-        await vscode.window.showTextDocument(doc);
-
-        // Set a breakpoint
-        vscode.debug.addBreakpoints(breakpoints);
+            const folder = await folderInRootWorkspace("defaultPackage", workspaceContext);
+            if (folder.workspaceContext.toolchain.swiftVersion.isLessThan(new Version(6, 0, 0))) {
+                this.skip();
+            }
+            await waitForNoRunningTasks();
+    
+            // File needs to be open for command to be enabled
+            const doc = await vscode.workspace.openTextDocument(uri.fsPath);
+            await vscode.window.showTextDocument(doc);
+    
+            // Set a breakpoint
+            vscode.debug.addBreakpoints(breakpoints);
+        },
     });
 
     suiteTeardown(async () => {

test/integration-tests/commands/build.test.ts

@@ -16,7 +16,7 @@ import * as vscode from "vscode";
 import * as fs from "fs/promises";
 import * as path from "path";
 import { expect } from "chai";
-import { waitForNoRunningTasks } from "../../utilities";
+import { waitForNoRunningTasks } from "../../utilities/tasks";
 import { testAssetUri } from "../../fixtures";
 import { FolderContext } from "../../../src/FolderContext";
 import { WorkspaceContext } from "../../../src/WorkspaceContext";
@@ -100,7 +100,6 @@ suite("Build Commands", function () {
         const bpPromise = waitForDebugAdapterCommand(
             "Debug PackageExe (defaultPackage)",
             "stackTrace",
-            workspaceContext
         );
 
         const result = vscode.commands.executeCommand(Commands.DEBUG);

test/integration-tests/commands/dependency.test.ts

@@ -18,7 +18,7 @@ import {
     PackageDependenciesProvider,
     PackageNode,
 } from "../../../src/ui/PackageDependencyProvider";
-import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilities";
+import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilities/tasks";
 import { getBuildAllTask, SwiftTask } from "../../../src/tasks/SwiftTaskProvider";
 import { testAssetUri } from "../../fixtures";
 import { FolderContext } from "../../../src/FolderContext";

test/integration-tests/language/macro.test.ts

@@ -19,7 +19,7 @@ import { LanguageClientManager } from "../../../src/sourcekit-lsp/LanguageClient
 import { WorkspaceContext } from "../../../src/WorkspaceContext";
 import { testAssetUri } from "../../fixtures";
 import { FolderContext } from "../../../src/FolderContext";
-import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilities";
+import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilities/tasks";
 import { getBuildAllTask, SwiftTask } from "../../../src/tasks/SwiftTaskProvider";
 import { Version } from "../../../src/utilities/version";
 import { activateExtensionForSuite, folderInRootWorkspace } from "../utilities/testutilities";

test/integration-tests/utilities/testutilities.ts

@@ -19,7 +19,7 @@ import { Api } from "../../../src/extension";
 import { testAssetUri } from "../../fixtures";
 import { WorkspaceContext } from "../../../src/WorkspaceContext";
 import { FolderContext } from "../../../src/FolderContext";
-import { waitForNoRunningTasks } from "../../utilities";
+import { waitForNoRunningTasks } from "../../utilities/tasks";
 
 function getRootWorkspaceFolder(): vscode.WorkspaceFolder {
     const result = vscode.workspace.workspaceFolders?.at(0);