Sepatate start / stop server logic

astral-sh · Jul 24, 2024 · c21d41a · c21d41a
1 parent 382286f
commit c21d41a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/common/server.ts b/src/common/server.ts
@@ -396,21 +396,14 @@ async function createServer(
 }
 
 let _disposables: Disposable[] = [];
-export async function restartServer(
+
+export async function startServer(
   projectRoot: vscode.WorkspaceFolder,
   workspaceSettings: ISettings,
   serverId: string,
   serverName: string,
   outputChannel: LogOutputChannel,
-  lsClient?: LanguageClient,
 ): Promise<LanguageClient | undefined> {
-  if (lsClient) {
-    traceInfo(`Server: Stop requested`);
-    await lsClient.stop();
-    _disposables.forEach((d) => d.dispose());
-    _disposables = [];
-  }
-
   updateStatus(undefined, LanguageStatusSeverity.Information, true);
 
   const extensionSettings = await getExtensionSettings(serverId);
@@ -454,3 +447,10 @@ export async function restartServer(
 
   return newLSClient;
 }
+
+export async function stopServer(lsClient: LanguageClient): Promise<void> {
+  traceInfo(`Server: Stop requested`);
+  await lsClient.stop();
+  _disposables.forEach((d) => d.dispose());
+  _disposables = [];
+}
diff --git a/src/extension.ts b/src/extension.ts
@@ -7,7 +7,7 @@ import {
   onDidChangePythonInterpreter,
   resolveInterpreter,
 } from "./common/python";
-import { restartServer } from "./common/server";
+import { startServer, stopServer } from "./common/server";
 import {
   checkIfConfigurationChanged,
   getInterpreterFromSetting,
@@ -89,6 +89,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     restartInProgress = true;
 
     try {
+      if (lsClient) {
+        await stopServer(lsClient);
+      }
+
       const projectRoot = await getProjectRoot();
       const workspaceSettings = await getWorkspaceSettings(serverId, projectRoot);
 
@@ -124,13 +128,12 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
         }
       }
 
-      lsClient = await restartServer(
+      lsClient = await startServer(
         projectRoot,
         workspaceSettings,
         serverId,
         serverName,
         outputChannel,
-        lsClient,
       );
     } finally {
       // Ensure that we reset the flag in case of an error, early return, or success.
@@ -268,6 +271,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 
 export async function deactivate(): Promise<void> {
   if (lsClient) {
-    await lsClient.stop();
+    await stopServer(lsClient);
   }
 }