Correctly Handle Language Server Timeout When Quitting

Author: thecoolwinter

CodeEdit/AppDelegate.swift

@@ -270,8 +270,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, ObservableObject {
                 TaskNotificationHandler.postTask(action: .create, model: task)
             }
 
-            try await withTimeout(
-                duration: .seconds(5.0),
+            try? await withTimeout(
+                duration: .seconds(2.0),
                 onTimeout: {
                     // Stop-gap measure to ensure we don't hang on CMD-Q
                     await self.lspService.killAllServers()

CodeEdit/Features/LSP/LanguageServer/LanguageServer.swift

@@ -258,9 +258,7 @@ class LanguageServer<DocumentType: LanguageServerDocument> {
     /// Shuts down the language server and exits it.
     public func shutdown() async throws {
         self.logger.info("Shutting down language server")
-        try await withTimeout(duration: .seconds(1.0)) {
-            try await self.lspInstance.shutdownAndExit()
-        }
+        try await self.lspInstance.shutdownAndExit()
     }
 }
 

CodeEdit/Utils/withTimeout.swift

@@ -30,7 +30,7 @@ public func withTimeout<R>(
         }
         // Start timeout child task.
         group.addTask {
-            if .now > deadline {
+            if .now < deadline {
                 try await Task.sleep(until: deadline) // sleep until the deadline
             }
             try Task.checkCancellation()
@@ -39,8 +39,12 @@ public func withTimeout<R>(
             throw TimedOutError()
         }
         // First finished child task wins, cancel the other task.
-        let result = try await group.next()!
-        group.cancelAll()
-        return result
+        defer { group.cancelAll() }
+        do {
+            let result = try await group.next()!
+            return result
+        } catch {
+            throw error
+        }
     }
 }