Merge pull request #1738 from ahoppen/pop-outstanding-request-on-crash

Remove elements from `outstandingRequests` on crash
swiftlang · Oct 7, 2024 · dd95a3d · dd95a3d
2 parents dcafaa9 + e50b4d7
commit dd95a3d
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift b/Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift
@@ -172,13 +172,14 @@ public final class JSONRPCConnection: Connection {
     )
 
     ioGroup.notify(queue: queue) { [weak self] in
-      guard let self = self else { return }
+      guard let self else { return }
+      for outstandingRequest in self.outstandingRequests.values {
+        outstandingRequest.replyHandler(LSPResult.failure(ResponseError.internalError("JSON-RPC Connection closed")))
+      }
+      self.outstandingRequests = [:]
+      self.receiveHandler = nil  // break retain cycle
       Task {
-        for outstandingRequest in self.outstandingRequests.values {
-          outstandingRequest.replyHandler(LSPResult.failure(ResponseError.internalError("JSON-RPC Connection closed")))
-        }
         await self.closeHandler?()
-        self.receiveHandler = nil  // break retain cycle
       }
     }