Merge pull request #1292 from ahoppen/sourcekitlsp-in-swift-6-mode

Make the `SourceKitLSP` module build in Swift 6 mode

Author: ahoppen

Sources/LSPLogging/Logging.swift

@@ -28,6 +28,16 @@ public typealias LogLevel = os.OSLogType
 public typealias Logger = os.Logger
 public typealias Signposter = OSSignposter
 
+#if compiler(<5.11)
+extension OSSignposter: @unchecked Sendable {}
+extension OSSignpostID: @unchecked Sendable {}
+extension OSSignpostIntervalState: @unchecked Sendable {}
+#else
+extension OSSignposter: @retroactive @unchecked Sendable {}
+extension OSSignpostID: @retroactive @unchecked Sendable {}
+extension OSSignpostIntervalState: @retroactive @unchecked Sendable {}
+#endif
+
 extension os.Logger {
   public func makeSignposter() -> Signposter {
     return OSSignposter(logger: self)

Sources/LSPLogging/LoggingScope.swift

@@ -80,7 +80,7 @@ public func withLoggingScope<Result>(
 /// - SeeAlso: ``withLoggingScope(_:_:)-6qtga``
 public func withLoggingScope<Result>(
   _ scope: String,
-  _ operation: () async throws -> Result
+  @_inheritActorContext _ operation: @Sendable () async throws -> Result
 ) async rethrows -> Result {
   return try await LoggingScope.$_scope.withValue(
     scope,

Sources/LSPLogging/NonDarwinLogging.swift

@@ -361,14 +361,14 @@ public struct NonDarwinLogger: Sendable {
 
 // MARK: - Signposter
 
-public struct NonDarwinSignpostID {}
+public struct NonDarwinSignpostID: Sendable {}
 
-public struct NonDarwinSignpostIntervalState {}
+public struct NonDarwinSignpostIntervalState: Sendable {}
 
 /// A type that is API-compatible to `OSLogMessage` for all uses within sourcekit-lsp.
 ///
 /// Since non-Darwin platforms don't have signposts, the type just has no-op operations.
-public struct NonDarwinSignposter {
+public struct NonDarwinSignposter: Sendable {
   public func makeSignpostID() -> NonDarwinSignpostID {
     return NonDarwinSignpostID()
   }

Sources/LanguageServerProtocol/Connection.swift

@@ -44,7 +44,7 @@ public protocol MessageHandler: AnyObject, Sendable {
   func handle<Request: RequestType>(
     _ request: Request,
     id: RequestID,
-    reply: @escaping (LSPResult<Request.Response>) -> Void
+    reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
   )
 }
 
@@ -110,7 +110,7 @@ public final class LocalConnection: Connection, @unchecked Sendable {
 
   public func send<Request: RequestType>(
     _ request: Request,
-    reply: @escaping (LSPResult<Request.Response>) -> Void
+    reply: @Sendable @escaping (LSPResult<Request.Response>) -> Void
   ) -> RequestID {
     let id = nextRequestID()
 

Sources/LanguageServerProtocol/Message.swift

@@ -24,7 +24,7 @@ public protocol _RequestType: MessageType {
   func _handle(
     _ handler: MessageHandler,
     id: RequestID,
-    reply: @escaping (LSPResult<ResponseType>, RequestID) -> Void
+    reply: @Sendable @escaping (LSPResult<ResponseType>, RequestID) -> Void
   )
 }
 
@@ -49,7 +49,7 @@ extension RequestType {
   public func _handle(
     _ handler: MessageHandler,
     id: RequestID,
-    reply: @escaping (LSPResult<ResponseType>, RequestID) -> Void
+    reply: @Sendable @escaping (LSPResult<ResponseType>, RequestID) -> Void
   ) {
     handler.handle(self, id: id) { response in
       reply(response.map({ $0 as ResponseType }), id)

Sources/LanguageServerProtocol/Requests/CodeActionRequest.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-public typealias CodeActionProvider = (CodeActionRequest) async throws -> [CodeAction]
+public typealias CodeActionProvider = @Sendable (CodeActionRequest) async throws -> [CodeAction]
 
 /// Request for returning all possible code actions for a given text document and range.
 ///

Sources/LanguageServerProtocol/SupportTypes/ServerCapabilities.swift

@@ -587,7 +587,7 @@ public struct DocumentRangeFormattingOptions: WorkDoneProgressOptions, Codable,
   }
 }
 
-public struct FoldingRangeOptions: Codable, Hashable {
+public struct FoldingRangeOptions: Codable, Hashable, Sendable {
   /// Currently empty in the spec.
   public init() {}
 }

Sources/SKCore/BuildSystemManager.swift

@@ -17,6 +17,10 @@ import LanguageServerProtocol
 
 import struct TSCBasic.AbsolutePath
 
+#if canImport(os)
+import os
+#endif
+
 /// `BuildSystem` that integrates client-side information such as main-file lookup as well as providing
 ///  common functionality such as caching.
 ///
@@ -169,7 +173,7 @@ extension BuildSystemManager {
       logger.error("Getting build settings failed: \(error.forLogging)")
     }
 
-    guard var settings = fallbackBuildSystem?.buildSettings(for: document, language: language) else {
+    guard var settings = await fallbackBuildSystem?.buildSettings(for: document, language: language) else {
       return nil
     }
     if buildSystem == nil {

Sources/SKCore/FallbackBuildSystem.swift

@@ -21,7 +21,7 @@ import struct TSCBasic.AbsolutePath
 import class TSCBasic.Process
 
 /// A simple BuildSystem suitable as a fallback when accurate settings are unknown.
-public final class FallbackBuildSystem {
+public actor FallbackBuildSystem {
 
   let buildSetup: BuildSetup
 
@@ -38,6 +38,10 @@ public final class FallbackBuildSystem {
     )
   }()
 
+  @_spi(Testing) public func setSdkPath(_ newValue: AbsolutePath?) {
+    self.sdkpath = newValue
+  }
+
   /// Delegate to handle any build system events.
   public weak var delegate: BuildSystemDelegate? = nil
 

Sources/SKSupport/LineTable.swift

@@ -11,8 +11,11 @@
 //===----------------------------------------------------------------------===//
 
 import LSPLogging
+#if canImport(os)
+import os
+#endif
 
-public struct LineTable: Hashable {
+public struct LineTable: Hashable, Sendable {
   @usableFromInline
   var impl: [String.Index]