Fix multiple LSP server handlers via concurrency guard and stop error handling

Co-authored-by: edvilme <5952839+edvilme@users.noreply.github.com>

Author: Copilot

src/common/server.ts

@@ -86,7 +86,11 @@ export async function restartServer(
 ): Promise<LanguageClient | undefined> {
     if (lsClient) {
         traceInfo(`Server: Stop requested`);
-        await lsClient.stop();
+        try {
+            await lsClient.stop();
+        } catch (ex) {
+            traceError(`Server: Stop failed: ${ex}`);
+        }
         _disposables.forEach((d) => d.dispose());
         _disposables = [];
     }

src/extension.ts

@@ -48,29 +48,43 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
     traceLog(`Module: ${serverInfo.module}`);
     traceVerbose(`Full Server Info: ${JSON.stringify(serverInfo)}`);
 
+    let isRestarting = false;
+    let restartTimer: NodeJS.Timeout | undefined;
     const runServer = async () => {
-        const interpreter = getInterpreterFromSetting(serverId);
-        if (interpreter && interpreter.length > 0) {
-            if (checkVersion(await resolveInterpreter(interpreter))) {
-                traceVerbose(`Using interpreter from ${serverInfo.module}.interpreter: ${interpreter.join(' ')}`);
-                lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);
+        if (isRestarting) {
+            if (restartTimer) {
+                clearTimeout(restartTimer);
             }
+            restartTimer = setTimeout(runServer, 1000);
             return;
         }
+        isRestarting = true;
+        try {
+            const interpreter = getInterpreterFromSetting(serverId);
+            if (interpreter && interpreter.length > 0) {
+                if (checkVersion(await resolveInterpreter(interpreter))) {
+                    traceVerbose(`Using interpreter from ${serverInfo.module}.interpreter: ${interpreter.join(' ')}`);
+                    lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);
+                }
+                return;
+            }
 
-        const interpreterDetails = await getInterpreterDetails();
-        if (interpreterDetails.path) {
-            traceVerbose(`Using interpreter from Python extension: ${interpreterDetails.path.join(' ')}`);
-            lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);
-            return;
-        }
+            const interpreterDetails = await getInterpreterDetails();
+            if (interpreterDetails.path) {
+                traceVerbose(`Using interpreter from Python extension: ${interpreterDetails.path.join(' ')}`);
+                lsClient = await restartServer(serverId, serverName, outputChannel, lsClient);
+                return;
+            }
 
-        traceError(
-            'Python interpreter missing:\r\n' +
-                '[Option 1] Select python interpreter using the ms-python.python.\r\n' +
-                `[Option 2] Set an interpreter using "${serverId}.interpreter" setting.\r\n` +
-                'Please use Python 3.8 or greater.',
-        );
+            traceError(
+                'Python interpreter missing:\r\n' +
+                    '[Option 1] Select python interpreter using the ms-python.python.\r\n' +
+                    `[Option 2] Set an interpreter using "${serverId}.interpreter" setting.\r\n` +
+                    'Please use Python 3.8 or greater.',
+            );
+        } finally {
+            isRestarting = false;
+        }
     };
 
     context.subscriptions.push(