Format files

Author: rockbruno

Sources/SourceKitBazelBSP/RequestHandlers/InitializeHandler.swift

@@ -204,10 +204,11 @@ final class InitializeHandler {
             data: SourceKitInitializeBuildResponseData(
                 indexDatabasePath: initializedConfig.indexDatabasePath,
                 indexStorePath: initializedConfig.indexStorePath,
-//                multiTargetPreparation: MultiTargetPreparationSupport(
-//                    supported: true,
-//                    batchSize: batchSize
-//                ),
+                // Commented out on purpose while we get batching working upstream
+                //                multiTargetPreparation: MultiTargetPreparationSupport(
+                //                    supported: true,
+                //                    batchSize: batchSize
+                //                ),
                 outputPathsProvider: nil,
                 prepareProvider: true,
                 sourceKitOptionsProvider: true,

Sources/SourceKitBazelBSP/RequestHandlers/TargetSourcesHandler.swift

@@ -113,12 +113,12 @@ final class TargetSourcesHandler {
                 SourceItem(
                     uri: src,
                     kind: .file,
-                    generated: false, // FIXME: Need to handle this properly
+                    generated: false,  // FIXME: Need to handle this properly
                     dataKind: .sourceKit,
                     data: SourceKitSourceItemData(
                         language: language,
                         kind: kind,
-                        outputPath: nil, // FIXME: Related to the same flag on initialize?
+                        outputPath: nil,  // FIXME: Related to the same flag on initialize?
                         copyDestinations: copyDestinations
                     ).encodeToLSPAny()
                 )

Sources/SourceKitBazelBSP/Server/LSPConnection.swift

@@ -30,17 +30,10 @@ package protocol LSPTaskLogger: AnyObject {
 /// Extends the original sourcekit-lsp `Connection` type to include JSONRPCConnection's start method
 /// and task logging utilities.
 package protocol LSPConnection: Connection, LSPTaskLogger, AnyObject {
-    func startJSONRPC(receiveHandler: MessageHandler, closeHandler: @escaping @Sendable () async -> Void)
+    func start(receiveHandler: MessageHandler, closeHandler: nonisolated(nonsending) @escaping @Sendable () async -> Void)
 }
 
 extension JSONRPCConnection: LSPConnection {
-    package func startJSONRPC(
-        receiveHandler: any LanguageServerProtocol.MessageHandler,
-        closeHandler: @escaping @Sendable () async -> Void
-    ) {
-        self.start(receiveHandler: receiveHandler, closeHandler: closeHandler as nonisolated(nonsending) @Sendable () async -> Void)
-    }
-
     package func startWorkTask(id: TaskId, title: String) {
         send(TaskStartNotification(taskId: id, data: WorkDoneProgressTask(title: title).encodeToLSPAny()))
     }

Sources/SourceKitBazelBSP/Server/SourceKitBazelBSPServer.swift

@@ -108,7 +108,7 @@ package final class SourceKitBazelBSPServer {
     ) {
         let connection = JSONRPCConnection(
             name: "sourcekit-lsp",
-            protocol: BuildServerProtocol.bspRegistry,
+            protocol: MessageRegistry.bspProtocol,
             inFD: inputHandle,
             outFD: outputHandle
         )
@@ -130,7 +130,7 @@ package final class SourceKitBazelBSPServer {
     package func run(parkThread: Bool = true) {
         logger.info("Connecting to sourcekit-lsp...")
 
-        connection.startJSONRPC(
+        connection.start(
             receiveHandler: handler,
             closeHandler: {
                 logger.info("Connection closed, exiting.")

Tests/SourceKitBazelBSPTests/Fakes/LSPConnectionFake.swift

@@ -28,7 +28,7 @@ final class LSPConnectionFake: LSPConnection {
     nonisolated(unsafe) private(set) var startReceivedHandler: MessageHandler?
     nonisolated(unsafe) private(set) var sentNotifications: [any NotificationType] = []
 
-    func startJSONRPC(receiveHandler: MessageHandler, closeHandler: @escaping @Sendable () async -> Void) {
+    func start(receiveHandler: MessageHandler, closeHandler: @escaping @Sendable () async -> Void) {
         startCalled = true
         startReceivedHandler = receiveHandler
     }