Make SKD{Request,Response}{Dictionary,Array} Sendable

Author: ahoppen

Sources/SourceKitD/SKDRequestArray.swift

@@ -31,9 +31,9 @@ extension SourceKitD {
   }
 }
 
-public final class SKDRequestArray {
-  public let array: sourcekitd_api_object_t
-  public let sourcekitd: SourceKitD
+public final class SKDRequestArray: Sendable {
+  nonisolated(unsafe) let array: sourcekitd_api_object_t
+  private let sourcekitd: SourceKitD
 
   public init(_ array: sourcekitd_api_object_t? = nil, sourcekitd: SourceKitD) {
     self.array = array ?? sourcekitd.api.request_array_create(nil, 0)!

Sources/SourceKitD/SKDRequestDictionary.swift

@@ -49,9 +49,9 @@ extension SourceKitD {
   }
 }
 
-public final class SKDRequestDictionary {
-  public let dict: sourcekitd_api_object_t
-  public let sourcekitd: SourceKitD
+public final class SKDRequestDictionary: Sendable {
+  nonisolated(unsafe) let dict: sourcekitd_api_object_t
+  private let sourcekitd: SourceKitD
 
   public init(_ dict: sourcekitd_api_object_t? = nil, sourcekitd: SourceKitD) {
     self.dict = dict ?? sourcekitd.api.request_dictionary_create(nil, nil, 0)!

Sources/SourceKitD/SKDResponse.swift

@@ -22,11 +22,8 @@ import CRT
 #endif
 
 public final class SKDResponse: Sendable {
-  /// - Note: `sourcekitd_api_response_t` is a typedef for `void *`, so we can't mark it as sendable. But we know that
-  ///   it stays alive until we deinit this `SKDResponse`. We also require that only a single `SKDResponse` may manage
-  ///   the `sourcekitd_api_response_t`, so raw response cannot be modified or disposed in any other way.
-  private nonisolated(unsafe) let response: sourcekitd_api_response_t
-  public let sourcekitd: SourceKitD
+  private nonisolated let response: sourcekitd_api_response_t
+  let sourcekitd: SourceKitD
 
   /// Creates a new `SKDResponse` that exclusively manages the raw `sourcekitd_api_response_t`.
   ///

Sources/SourceKitD/SKDResponseArray.swift

@@ -20,9 +20,9 @@ import Musl
 import CRT
 #endif
 
-public final class SKDResponseArray {
-  public let array: sourcekitd_api_variant_t
-  let resp: SKDResponse
+public final class SKDResponseArray: Sendable {
+  private let array: sourcekitd_api_variant_t
+  private let resp: SKDResponse
 
   public var sourcekitd: SourceKitD { return resp.sourcekitd }
 

Sources/SourceKitD/SKDResponseDictionary.swift

@@ -20,9 +20,9 @@ import Musl
 import CRT
 #endif
 
-public final class SKDResponseDictionary {
-  public let dict: sourcekitd_api_variant_t
-  let resp: SKDResponse
+public final class SKDResponseDictionary: Sendable {
+  private let dict: sourcekitd_api_variant_t
+  private let resp: SKDResponse
 
   public var sourcekitd: SourceKitD { return resp.sourcekitd }