Rename SourceKitDImpl to DynamicallyLoadedSourceKitD

This makes it clearer how exactly `SourceKitDImpl` interacts with sourcekitd.

Author: ahoppen

Sources/Diagnose/SourcekitdRequestCommand.swift

@@ -40,7 +40,7 @@ public struct SourceKitdRequestCommand: AsyncParsableCommand {
   public func run() async throws {
     let requestString = try String(contentsOf: URL(fileURLWithPath: sourcekitdRequestPath))
 
-    let sourcekitd = try SourceKitDImpl.getOrCreate(
+    let sourcekitd = try DynamicallyLoadedSourceKitD.getOrCreate(
       dylibPath: try! AbsolutePath(validating: sourcekitdPath)
     )
 

Sources/SourceKitD/CMakeLists.txt

@@ -6,7 +6,7 @@ add_library(SourceKitD STATIC
   SKDResponseArray.swift
   SKDResponseDictionary.swift
   SourceKitD.swift
-  SourceKitDImpl.swift
+  DynamicallyLoadedSourceKitD.swift
   SourceKitDRegistry.swift
   sourcekitd_functions.swift
   sourcekitd_uids.swift)

Sources/SourceKitD/SourceKitDImpl.swift renamed to Sources/SourceKitD/DynamicallyLoadedSourceKitD.swift

@@ -21,7 +21,7 @@ import struct TSCBasic.AbsolutePath
 ///
 /// Users of this class should not call the api functions `initialize`, `shutdown`, or
 /// `set_notification_handler`, which are global state managed internally by this class.
-public final class SourceKitDImpl: SourceKitD {
+public final class DynamicallyLoadedSourceKitD: SourceKitD {
 
   /// The path to the sourcekitd dylib.
   public let path: AbsolutePath
@@ -49,7 +49,7 @@ public final class SourceKitDImpl: SourceKitD {
 
   public static func getOrCreate(dylibPath: AbsolutePath) throws -> SourceKitD {
     try SourceKitDRegistry.shared
-      .getOrAdd(dylibPath, create: { try SourceKitDImpl(dylib: dylibPath) })
+      .getOrAdd(dylibPath, create: { try DynamicallyLoadedSourceKitD(dylib: dylibPath) })
   }
 
   init(dylib path: AbsolutePath) throws {

Sources/SourceKitD/SourceKitD.swift

@@ -112,10 +112,6 @@ extension SourceKitD {
 
     return dict
   }
-
-  public func log(request: SKDRequestDictionary) {}
-  public func log(response: SKDResponse) {}
-  public func log(crashedRequest: SKDRequestDictionary, fileContents: String?) {}
 }
 
 /// A sourcekitd notification handler in a class to allow it to be uniquely referenced.

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -158,7 +158,7 @@ public actor SwiftLanguageServer: ToolchainLanguageServer {
     guard let sourcekitd = toolchain.sourcekitd else { return nil }
     self.sourceKitServer = sourceKitServer
     self.swiftFormat = toolchain.swiftFormat
-    self.sourcekitd = try SourceKitDImpl.getOrCreate(dylibPath: sourcekitd)
+    self.sourcekitd = try DynamicallyLoadedSourceKitD.getOrCreate(dylibPath: sourcekitd)
     self.capabilityRegistry = workspace.capabilityRegistry
     self.serverOptions = options
     self.documentManager = DocumentManager()

Tests/DiagnoseTests/DiagnoseTests.swift

@@ -204,7 +204,9 @@ private struct InProcessSourceKitRequestExecutor: SourceKitRequestExecutor {
   func run(request requestYaml: String) async throws -> SourceKitDRequestResult {
     logger.info("Sending request: \(requestYaml)")
 
-    let sourcekitd = try SourceKitDImpl.getOrCreate(dylibPath: try! AbsolutePath(validating: sourcekitd.path))
+    let sourcekitd = try DynamicallyLoadedSourceKitD.getOrCreate(
+      dylibPath: try! AbsolutePath(validating: sourcekitd.path)
+    )
     let response = try await sourcekitd.run(requestYaml: requestYaml)
 
     logger.info("Received response: \(response.description)")

Tests/SourceKitDTests/SourceKitDRegistryTests.swift

@@ -75,4 +75,8 @@ final class FakeSourceKitD: SourceKitD {
   static func getOrCreate(_ path: AbsolutePath, in registry: SourceKitDRegistry) -> SourceKitD {
     return registry.getOrAdd(path, create: { Self.init() })
   }
+
+  public func log(request: SKDRequestDictionary) {}
+  public func log(response: SKDResponse) {}
+  public func log(crashedRequest: SKDRequestDictionary, fileContents: String?) {}
 }

Tests/SourceKitDTests/SourceKitDTests.swift

@@ -28,7 +28,7 @@ import class TSCBasic.Process
 final class SourceKitDTests: XCTestCase {
   func testMultipleNotificationHandlers() async throws {
     let sourcekitdPath = await ToolchainRegistry.forTesting.default!.sourcekitd!
-    let sourcekitd = try SourceKitDImpl.getOrCreate(dylibPath: sourcekitdPath)
+    let sourcekitd = try DynamicallyLoadedSourceKitD.getOrCreate(dylibPath: sourcekitdPath)
     let keys = sourcekitd.keys
     let path = DocumentURI.for(.swift).pseudoPath
 
@@ -47,7 +47,7 @@ final class SourceKitDTests: XCTestCase {
         expectation1.fulfill()
       }
     }
-    // SourceKitDImpl weakly references handlers
+    // DynamicallyLoadedSourceKitD weakly references handlers
     defer {
       _fixLifetime(handler1)
     }
@@ -59,7 +59,7 @@ final class SourceKitDTests: XCTestCase {
         expectation2.fulfill()
       }
     }
-    // SourceKitDImpl weakly references handlers
+    // DynamicallyLoadedSourceKitD weakly references handlers
     defer {
       _fixLifetime(handler2)
     }