Merge pull request #63 from CodinGame/fix-connection-retry

Check languageClient status after starting it

Author: CGNonofr

src/languageClient.ts

@@ -152,6 +152,10 @@ export class LanguageClientManager implements LanguageClient {
       try {
         this.startPromise = this._start()
         await this.startPromise
+        // If the initialize request fails, the start method still returns a resolve promise due to a vscode-languageclient bug
+        if (!(this.languageClient?.isRunning() ?? false)) {
+          throw new Error('Language server not running')
+        }
         started = true
       } catch (error) {
         this.languageClient = undefined
@@ -299,8 +303,12 @@ export class LanguageClientManager implements LanguageClient {
         }
         case State.Stopped: {
           this.updateStatus('closed')
-
-          if (state.oldState === State.Running && !this.isDisposed()) {
+          setTimeout(() => {
+            // setTimeout is required or the dispose() fails (Client is stopping but no stop promise available.)
+            void languageClient.dispose()
+          })
+          if (state.oldState === State.Running && !this.isDisposed() && this.languageClient === languageClient) {
+            this.languageClient = undefined
             console.info('[LSP] Restarting language client', state)
             this.start().catch(error => {
               monaco.errorHandler.onUnexpectedError(new Error('[LSP] Language client stopped', {