Merge pull request #946 from ahoppen/ahoppen/remove-connection-sendsync

Remove `Connection.sendSync`

Author: ahoppen

Sources/LanguageServerProtocol/Connection.swift

@@ -17,29 +17,13 @@ import SKSupport
 public protocol Connection: AnyObject {
 
   /// Send a notification without a reply.
-  func send<Notification>(_: Notification) where Notification: NotificationType
+  func send(_ notification: some NotificationType)
 
   /// Send a request and (asynchronously) receive a reply.
   func send<Request: RequestType>(
     _: Request,
     reply: @escaping (LSPResult<Request.Response>) -> Void
   ) -> RequestID
-
-  /// Send a request synchronously. **Use wisely**.
-  func sendSync<Request>(_: Request) throws -> Request.Response where Request: RequestType
-}
-
-extension Connection {
-  public func sendSync<Request>(_ request: Request) throws -> Request.Response where Request: RequestType {
-    var result: LSPResult<Request.Response>? = nil
-    let semaphore = DispatchSemaphore(value: 0)
-    _ = send(request) { _result in
-      result = _result
-      semaphore.signal()
-    }
-    semaphore.wait()
-    return try result!.get()
-  }
 }
 
 /// An abstract message handler, such as a language server or client.

Sources/SKCore/BuildServerBuildSystem.swift

@@ -102,7 +102,7 @@ public actor BuildServerBuildSystem: MessageHandler {
     self.buildFolder = buildFolder
     self.projectRoot = projectRoot
     self.serverConfig = config
-    try self.initializeBuildServer()
+    try await self.initializeBuildServer()
   }
 
   /// Creates a build system using the Build Server Protocol config.
@@ -134,7 +134,7 @@ public actor BuildServerBuildSystem: MessageHandler {
     }
   }
 
-  private func initializeBuildServer() throws {
+  private func initializeBuildServer() async throws {
     var serverPath = try AbsolutePath(validating: serverConfig.argv[0], relativeTo: projectRoot)
     var flags = Array(serverConfig.argv[1...])
     if serverPath.suffix == ".py" {
@@ -172,7 +172,7 @@ public actor BuildServerBuildSystem: MessageHandler {
     )
 
     let buildServer = try makeJSONRPCBuildServer(client: self, serverPath: serverPath, serverFlags: flags)
-    let response = try buildServer.sendSync(initializeRequest)
+    let response = try await buildServer.send(initializeRequest)
     buildServer.send(InitializedBuildNotification())
     logger.log("initialized build server \(response.displayName)")
 

Sources/SourceKitLSP/Clang/ClangLanguageServer.swift

@@ -127,7 +127,7 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
     self.workspace = WeakWorkspace(workspace)
     self.state = .connected
     self.sourceKitServer = sourceKitServer
-    try startClangdProcesss()
+    try startClangdProcess()
   }
 
   private func buildSettings(for document: DocumentURI) async -> ClangBuildSettings? {
@@ -172,7 +172,7 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
   }
 
   /// Start the `clangd` process, either on creation of the `ClangLanguageServerShim` or after `clangd` has crashed.
-  private func startClangdProcesss() throws {
+  private func startClangdProcess() throws {
     // Since we are starting a new clangd process, reset the list of open document
     openDocuments = [:]
 
@@ -248,11 +248,11 @@ actor ClangLanguageServerShim: ToolchainLanguageServer, MessageHandler {
       try await Task.sleep(nanoseconds: UInt64(restartDelay) * 1_000_000_000)
       self.clangRestartScheduled = false
       do {
-        try self.startClangdProcesss()
-        // FIXME: We assume that clangd will return the same capabilites after restarting.
+        try self.startClangdProcess()
+        // FIXME: We assume that clangd will return the same capabilities after restarting.
         // Theoretically they could have changed and we would need to inform SourceKitServer about them.
         // But since SourceKitServer more or less ignores them right now anyway, this should be fine for now.
-        _ = try self.initializeSync(initializeRequest)
+        _ = try await self.initialize(initializeRequest)
         self.clientInitialized(InitializedNotification())
         if let sourceKitServer {
           await sourceKitServer.reopenDocuments(for: self)
@@ -393,11 +393,11 @@ extension ClangLanguageServerShim {
 
 extension ClangLanguageServerShim {
 
-  func initializeSync(_ initialize: InitializeRequest) throws -> InitializeResult {
+  func initialize(_ initialize: InitializeRequest) async throws -> InitializeResult {
     // Store the initialize request so we can replay it in case clangd crashes
     self.initializeRequest = initialize
 
-    let result = try clangd.sendSync(initialize)
+    let result = try await clangd.send(initialize)
     self.capabilities = result.capabilities
     return result
   }

Sources/SourceKitLSP/SourceKitServer.swift

@@ -516,7 +516,7 @@ public actor SourceKitServer {
       }
 
       let pid = Int(ProcessInfo.processInfo.processIdentifier)
-      let resp = try await service.initializeSync(
+      let resp = try await service.initialize(
         InitializeRequest(
           processId: pid,
           rootPath: nil,

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -196,7 +196,7 @@ public actor SwiftLanguageServer: ToolchainLanguageServer {
 
 extension SwiftLanguageServer {
 
-  public func initializeSync(_ initialize: InitializeRequest) throws -> InitializeResult {
+  public func initialize(_ initialize: InitializeRequest) throws -> InitializeResult {
     sourcekitd.addNotificationHandler(self)
 
     return InitializeResult(

Sources/SourceKitLSP/ToolchainLanguageServer.swift

@@ -43,7 +43,7 @@ public protocol ToolchainLanguageServer: AnyObject {
 
   // MARK: - Lifetime
 
-  func initializeSync(_ initialize: InitializeRequest) async throws -> InitializeResult
+  func initialize(_ initialize: InitializeRequest) async throws -> InitializeResult
   func clientInitialized(_ initialized: InitializedNotification) async
 
   /// Shut the server down and return once the server has finished shutting down