fix test suite setup

swiftlang · Nov 27, 2024 · 315d56a · 315d56a
1 parent e3abc99
commit 315d56a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/sourcekit-lsp/LanguageClientManager.ts b/src/sourcekit-lsp/LanguageClientManager.ts
@@ -272,7 +272,7 @@ export class LanguageClientManager implements vscode.Disposable {
     // The language client stops asnyhronously, so we need to wait for it to stop
     // instead of doing it in dispose, which must be synchronous.
     async stop() {
-        if (this.languageClient && this.languageClient.state === langclient.State.Running) {
+        if (this.languageClient && this.languageClient.state === State.Running) {
             await this.languageClient.dispose();
         }
     }

diff --git a/test/integration-tests/documentation/DocumentationPreview.test.ts b/test/integration-tests/documentation/DocumentationPreview.test.ts
@@ -15,7 +15,7 @@
 import * as vscode from "vscode";
 import contextKeys from "../../../src/contextKeys";
 import { expect } from "chai";
-import { folderContextPromise, globalWorkspaceContextPromise } from "../extension.test";
+import { activateExtensionForSuite, folderInRootWorkspace } from "../utilities/testutilities";
 import { waitForNoRunningTasks } from "../../utilities";
 import { testAssetUri } from "../../fixtures";
 import { FolderContext } from "../../../src/FolderContext";
@@ -32,11 +32,13 @@ suite("Documentation Preview", function () {
     let folderContext: FolderContext;
     let workspaceContext: WorkspaceContext;
 
-    suiteSetup(async function () {
-        workspaceContext = await globalWorkspaceContextPromise;
-        await waitForNoRunningTasks();
-        folderContext = await folderContextPromise("SlothCreatorExample");
-        await workspaceContext.focusFolder(folderContext);
+    activateExtensionForSuite({
+        async setup(ctx) {
+            workspaceContext = ctx;
+            await waitForNoRunningTasks();
+            folderContext = await folderInRootWorkspace("SlothCreatorExample", ctx);
+            await ctx.focusFolder(folderContext);
+        },
     });
 
     suiteTeardown(async () => {