feat(language-client): fix hang when server crashed during shutdown

neoclide · Jan 5, 2021 · 7648463 · 7648463
1 parent 353b9e1
commit 7648463
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/language-client/client.ts b/src/language-client/client.ts
@@ -3925,10 +3925,7 @@ export abstract class BaseLanguageClient {
 
   protected handleConnectionClosed() {
     // Check whether this is a normal shutdown in progress or the client stopped normally.
-    if (
-      this.state === ClientState.Stopping ||
-      this.state === ClientState.Stopped
-    ) {
+    if (this.state === ClientState.Stopped) {
       return
     }
     try {
@@ -3939,10 +3936,12 @@ export abstract class BaseLanguageClient {
       // Disposing a connection could fail if error cases.
     }
     let action = CloseAction.DoNotRestart
-    try {
-      action = this._clientOptions.errorHandler!.closed()
-    } catch (error) {
-      // Ignore errors coming from the error handler.
+    if (this.state !== ClientState.Stopping) {
+      try {
+        action = this._clientOptions.errorHandler!.closed();
+      } catch (error) {
+        // Ignore errors coming from the error handler.
+      }
     }
     this._connectionPromise = undefined
     this._resolvedConnection = undefined
@@ -4140,7 +4139,7 @@ export abstract class BaseLanguageClient {
 
     const generalCapabilities = ensure(result, 'general')!;
     generalCapabilities.regularExpressions = { engine: 'ECMAScript', version: 'ES2020' };
-    generalCapabilities.markdown = { parser: 'marked', version: '1.1.0'};
+    generalCapabilities.markdown = { parser: 'marked', version: '1.1.0' };
 
     for (let feature of this._features) {
       feature.fillClientCapabilities(result)