Merge pull request #856 from ahoppen/ahoppen/remove-dead-code

Author: ahoppen

Sources/LSPTestSupport/TestJSONRPCConnection.swift

@@ -88,7 +88,6 @@ public final class TestClient: MessageHandler {
     self.server = server
   }
 
-  public var replyQueue: DispatchQueue = DispatchQueue(label: "testclient-reply-queue")
   var oneShotNotificationHandlers: [((Any) -> Void)] = []
   var oneShotRequestHandlers: [((Any) -> Void)] = []
 
@@ -157,13 +156,8 @@ extension TestClient: Connection {
   }
 
   /// Send a request to the language server and (asynchronously) receive a reply.
-  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
-    return server.send(request, queue: queue, reply: reply)
-  }
-
-  /// Convenience method to get reply on replyQueue.
   public func send<Request>(_ request: Request, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
-    return send(request, queue: replyQueue, reply: reply)
+    return server.send(request, reply: reply)
   }
 
 

Sources/LanguageServerProtocol/Connection.swift

@@ -19,7 +19,7 @@ public protocol Connection: AnyObject {
   func send<Notification>(_: Notification) where Notification: NotificationType
 
   /// Send a request and (asynchronously) receive a reply.
-  func send<Request>(_: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType
+  func send<Request>(_: Request, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType
 
   /// Send a request synchronously. **Use wisely**.
   func sendSync<Request>(_: Request) throws -> Request.Response where Request: RequestType
@@ -29,7 +29,7 @@ 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, queue: DispatchQueue.global()) { _result in
+    _ = send(request) { _result in
       result = _result
       semaphore.signal()
     }
@@ -119,23 +119,18 @@ extension LocalConnection: Connection {
 
   public func send<Request: RequestType>(
     _ request: Request,
-    queue: DispatchQueue,
     reply: @escaping (LSPResult<Request.Response>) -> Void
   ) -> RequestID {
     let id = nextRequestID()
 
     guard let handler = self.handler else {
-      queue.async {
-        reply(.failure(.serverCancelled))
-      }
+      reply(.failure(.serverCancelled))
       return id
     }
 
     precondition(self.state == .started)
     handler.handle(request, id: id, from: ObjectIdentifier(self)) { result in
-      queue.async {
-        reply(result)
-      }
+      reply(result)
     }
 
     return id

Sources/LanguageServerProtocolJSONRPC/JSONRPCConnection.swift

@@ -408,7 +408,7 @@ extension JSONRPCConnection: Connection {
     }
   }
 
-  public func send<Request>(_ request: Request, queue: DispatchQueue, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
+  public func send<Request>(_ request: Request, reply: @escaping (LSPResult<Request.Response>) -> Void) -> RequestID where Request: RequestType {
 
     let id: RequestID = self.queue.sync {
       let id = nextRequestID()
@@ -423,10 +423,9 @@ extension JSONRPCConnection: Connection {
         responseType: Request.Response.self,
         queue: queue,
         replyHandler: { anyResult in
-          queue.async {
-            reply(anyResult.map { $0 as! Request.Response })
-          }
-      })
+          reply(anyResult.map { $0 as! Request.Response })
+        }
+      )
       return id
     }
 

Sources/SKCore/BuildServerBuildSystem.swift

@@ -47,8 +47,7 @@ public actor BuildServerBuildSystem: MessageHandler {
   let projectRoot: AbsolutePath
   let buildFolder: AbsolutePath?
   let serverConfig: BuildServerConfig
-  let requestQueue: DispatchQueue
-
+  
   var buildServer: JSONRPCConnection?
 
   /// The queue on which all messages that originate from the build server are
@@ -95,7 +94,6 @@ public actor BuildServerBuildSystem: MessageHandler {
 #endif
     self.buildFolder = buildFolder
     self.projectRoot = projectRoot
-    self.requestQueue = DispatchQueue(label: "build_server_request_queue")
     self.serverConfig = config
     try self.initializeBuildServer()
   }
@@ -119,13 +117,13 @@ public actor BuildServerBuildSystem: MessageHandler {
 
   deinit {
     if let buildServer = self.buildServer {
-      _ = buildServer.send(ShutdownBuild(), queue: DispatchQueue.global(), reply: { result in
+      _ = buildServer.send(ShutdownBuild()) { result in
         if let error = result.failure {
           log("error shutting down build server: \(error)")
         }
         buildServer.send(ExitBuildNotification())
         buildServer.close()
-      })
+      }
     }
   }
 
@@ -239,7 +237,7 @@ extension BuildServerBuildSystem: BuildSystem {
 
   public func registerForChangeNotifications(for uri: DocumentURI, language: Language) {
     let request = RegisterForChanges(uri: uri, action: .register)
-    _ = self.buildServer?.send(request, queue: requestQueue, reply: { result in
+    _ = self.buildServer?.send(request) { result in
       Task {
         if let error = result.failure {
           log("error registering \(uri): \(error)", level: .error)
@@ -249,18 +247,18 @@ extension BuildServerBuildSystem: BuildSystem {
           await self.buildSettingsChanged(for: uri, settings: nil)
         }
       }
-    })
+    }
   }
 
   /// Unregister the given file for build-system level change notifications, such as command
   /// line flag changes, dependency changes, etc.
   public func unregisterForChangeNotifications(for uri: DocumentURI) {
     let request = RegisterForChanges(uri: uri, action: .unregister)
-    _ = self.buildServer?.send(request, queue: requestQueue, reply: { result in
+    _ = self.buildServer?.send(request) { result in
       if let error = result.failure {
         log("error unregistering \(uri): \(error)", level: .error)
       }
-    })
+    }
   }
 
   public func filesDidChange(_ events: [FileEvent]) {}

Sources/SKCore/BuildSystemManager.swift

@@ -17,63 +17,6 @@ import Dispatch
 
 import struct TSCBasic.AbsolutePath
 
-/// Status for a given main file.
-enum MainFileStatus: Equatable {
-  /// Waiting for the `BuildSystem` to return settings.
-  case waiting
-
-  /// No response from `BuildSystem` yet, using arguments from the fallback build system.
-  case waitingUsingFallback(FileBuildSettings)
-
-  /// Two cases here:
-  /// - Primary build system gave us fallback arguments to use.
-  /// - Primary build system didn't handle the file, using arguments from the fallback build system.
-  /// No longer waiting.
-  case fallback(FileBuildSettings)
-
-  /// Using settings from the primary `BuildSystem`.
-  case primary(FileBuildSettings)
-
-  /// No settings provided by primary and fallback `BuildSystem`s.
-  case unsupported
-}
-
-extension MainFileStatus {
-  /// Whether fallback build settings are being used.
-  /// If no build settings are available, returns false.
-  var usingFallbackSettings: Bool {
-    switch self {
-    case .waiting: return false
-    case .unsupported: return false
-    case .waitingUsingFallback(_): return true
-    case .fallback(_): return true
-    case .primary(_): return false
-    }
-  }
-
-  /// The active build settings, if any.
-  var buildSettings: FileBuildSettings? {
-    switch self {
-    case .waiting: return nil
-    case .unsupported: return nil
-    case .waitingUsingFallback(let settings): return settings
-    case .fallback(let settings): return settings
-    case .primary(let settings): return settings
-    }
-  }
-
-  /// Corresponding change from this status, if any.
-  var buildSettingsChange: FileBuildSettingsChange? {
-    switch self {
-    case .waiting: return nil
-    case .unsupported: return .removedOrUnavailable
-    case .waitingUsingFallback(let settings): return .fallback(settings)
-    case .fallback(let settings): return .fallback(settings)
-    case .primary(let settings): return .modified(settings)
-    }
-  }
-}
-
 /// `BuildSystem` that integrates client-side information such as main-file lookup as well as providing
 ///  common functionality such as caching.
 ///
@@ -205,24 +148,6 @@ extension BuildSystemManager {
     await buildSystem?.registerForChangeNotifications(for: mainFile, language: language)
   }
 
-  /// Return settings for `file` based on  the `change` settings for `mainFile`.
-  ///
-  /// This is used when inferring arguments for header files (e.g. main file is a `.m`  while file is  a` .h`).
-  nonisolated func convert(
-    change: FileBuildSettingsChange,
-    ofMainFile mainFile: DocumentURI,
-    to file: DocumentURI
-  ) -> FileBuildSettingsChange {
-    guard mainFile != file else { return change }
-    switch change {
-    case .removedOrUnavailable: return .removedOrUnavailable
-    case .fallback(let settings):
-      return .fallback(settings.patching(newFile: file.pseudoPath, originalFile: mainFile.pseudoPath))
-    case .modified(let settings):
-      return .modified(settings.patching(newFile: file.pseudoPath, originalFile: mainFile.pseudoPath))
-    }
-  }
-
   public func unregisterForChangeNotifications(for uri: DocumentURI) async {
     guard let mainFile = self.watchedFiles[uri]?.mainFile else {
       log("Unbalanced calls for registerForChangeNotifications and unregisterForChangeNotifications", level: .warning)

Sources/SKCore/CMakeLists.txt

@@ -9,7 +9,6 @@ add_library(SKCore STATIC
   CompilationDatabaseBuildSystem.swift
   FallbackBuildSystem.swift
   FileBuildSettings.swift
-  FileBuildSettingsChange.swift
   MainFilesProvider.swift
   PathPrefixMapping.swift
   Toolchain.swift

Sources/SKCore/FileBuildSettingsChange.swift

@@ -81,39 +81,6 @@ extension SourceKitD {
     return dict
   }
 
-  /// Send the given request and asynchronously receive a reply dictionary (or error) on the given queue.
-  // FIXME: (async) Remove this in favor of the async version
-  public func send(
-    _ req: SKDRequestDictionary,
-    _ queue: DispatchQueue,
-    reply: @escaping (Result<SKDResponseDictionary, SKDError>) -> Void
-  ) -> sourcekitd_request_handle_t? {
-    logRequest(req)
-
-    var handle: sourcekitd_request_handle_t? = nil
-
-    api.send_request(req.dict, &handle) { [weak self] _resp in
-      guard let self = self else { return }
-
-      let resp = SKDResponse(_resp, sourcekitd: self)
-
-      logResponse(resp)
-
-      guard let dict = resp.value else {
-        queue.async {
-         reply(.failure(resp.error!))
-        }
-        return
-      }
-
-      queue.async {
-        reply(.success(dict))
-      }
-    }
-
-    return handle
-  }
-
   public func send(_ req: SKDRequestDictionary) async throws -> SKDResponseDictionary {
     logRequest(req)
 

Sources/SourceKitD/SourceKitD.swift

@@ -4,6 +4,7 @@ add_library(SourceKitLSP STATIC
   DocumentManager.swift
   IndexStoreDB+MainFilesProvider.swift
   RangeAdjuster.swift
+  ResponseError+Init.swift
   Sequence+AsyncMap.swift
   SourceKitIndexDelegate.swift
   SourceKitLSPCommandMetadata.swift
@@ -20,7 +21,6 @@ target_sources(SourceKitLSP PRIVATE
   Swift/CursorInfo.swift
   Swift/Diagnostic.swift
   Swift/EditorPlaceholder.swift
-  Swift/ExpressionTypeInfo.swift
   Swift/OpenInterface.swift
   Swift/SemanticRefactorCommand.swift
   Swift/SemanticRefactoring.swift