Wait for documents to be re-opened before setting the clangd status to be connected again

Author: ahoppen

Sources/SourceKitLSP/Clang/ClangLanguageServer.swift

@@ -94,7 +94,7 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
   private let workspace: WeakWorkspace
 
   /// A callback with which `ClangLanguageServer` can request its owner to reopen all documents in case it has crashed.
-  private let reopenDocuments: (ToolchainLanguageServer) -> Void
+  private let reopenDocuments: (ToolchainLanguageServer) async -> Void
 
   /// The documents that have been opened and which language they have been
   /// opened with.
@@ -114,7 +114,7 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
     toolchain: Toolchain,
     options: SourceKitServer.Options,
     workspace: Workspace,
-    reopenDocuments: @escaping (ToolchainLanguageServer) -> Void,
+    reopenDocuments: @escaping (ToolchainLanguageServer) async -> Void,
     workspaceForDocument: @escaping (DocumentURI) async -> Workspace?
   ) async throws {
     guard let clangdPath = toolchain.clangd else {
@@ -245,7 +245,7 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
         // But since SourceKitServer more or less ignores them right now anyway, this should be fine for now.
         _ = try self.initializeSync(initializeRequest)
         self.clientInitialized(InitializedNotification())
-        self.reopenDocuments(self)
+        await self.reopenDocuments(self)
         self.state = .connected
       } catch {
         log("Failed to restart clangd after a crash.", level: .error)

Sources/SourceKitLSP/SourceKitServer.swift

@@ -406,10 +406,7 @@ public actor SourceKitServer {
         client: self,
         in: workspace,
         reopenDocuments: { [weak self] toolchainLanguageServer in
-          guard let self else { return }
-          Task {
-            await self.reopenDocuments(for: toolchainLanguageServer)
-          }
+          await self?.reopenDocuments(for: toolchainLanguageServer)
         },
         workspaceForDocument: { [weak self] document in
           guard let self else { return nil }
@@ -2008,7 +2005,7 @@ func languageService(
   options: SourceKitServer.Options,
   client: MessageHandler,
   in workspace: Workspace,
-  reopenDocuments: @escaping (ToolchainLanguageServer) -> Void,
+  reopenDocuments: @escaping (ToolchainLanguageServer) async -> Void,
   workspaceForDocument: @escaping (DocumentURI) async -> Workspace?
 ) async throws -> ToolchainLanguageServer? {
   let connectionToClient = LocalConnection()

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -150,7 +150,7 @@ public actor SwiftLanguageServer: ToolchainLanguageServer {
   private var stateChangeHandlers: [(_ oldState: LanguageServerState, _ newState: LanguageServerState) -> Void] = []
 
   /// A callback with which `SwiftLanguageServer` can request its owner to reopen all documents in case it has crashed.
-  private let reopenDocuments: (ToolchainLanguageServer) -> Void
+  private let reopenDocuments: (ToolchainLanguageServer) async -> Void
 
   /// Get the workspace that the document with the given URI belongs to.
   ///
@@ -166,7 +166,7 @@ public actor SwiftLanguageServer: ToolchainLanguageServer {
     toolchain: Toolchain,
     options: SourceKitServer.Options,
     workspace: Workspace,
-    reopenDocuments: @escaping (ToolchainLanguageServer) -> Void,
+    reopenDocuments: @escaping (ToolchainLanguageServer) async -> Void,
     workspaceForDocument: @escaping (DocumentURI) async -> Workspace?
   ) throws {
     guard let sourcekitd = toolchain.sourcekitd else { return nil }
@@ -1523,7 +1523,7 @@ extension SwiftLanguageServer: SKDNotificationHandler {
       self.state = .semanticFunctionalityDisabled
 
       // Ask our parent to re-open all of our documents.
-      self.reopenDocuments(self)
+      await self.reopenDocuments(self)
     }
 
     if case .connectionInterrupted = notification.error {

Sources/SourceKitLSP/ToolchainLanguageServer.swift

@@ -34,7 +34,7 @@ public protocol ToolchainLanguageServer: AnyObject {
     toolchain: Toolchain,
     options: SourceKitServer.Options,
     workspace: Workspace,
-    reopenDocuments: @escaping (ToolchainLanguageServer) -> Void,
+    reopenDocuments: @escaping (ToolchainLanguageServer) async -> Void,
     workspaceForDocument: @escaping (DocumentURI) async -> Workspace?
   ) async throws