Merge pull request #2093 from ahoppen/remove-dynamically-loaded-sourcekitd

Remove the split between `SourceKitD` and `DynamicallyLoadedSourceKitD`

Author: ahoppen

Sources/BuildSystemIntegration/BuildSystemMessageDependencyTracker.swift

@@ -14,7 +14,7 @@ import BuildServerProtocol
 package import LanguageServerProtocol
 import LanguageServerProtocolExtensions
 import SKLogging
-package import SwiftExtensions
+import SwiftExtensions
 
 /// A lightweight way of describing tasks that are created from handling BSP
 /// requests or notifications for the purpose of dependency tracking.

Sources/Csourcekitd/include/plugin.h

@@ -114,7 +114,7 @@ typedef const void *_Null_unspecified (*sourcekitd_api_variant_functions_data_ge
 typedef bool (^sourcekitd_api_cancellable_request_handler_t)(
   _Null_unspecified sourcekitd_api_object_t,
   _Null_unspecified sourcekitd_api_request_handle_t,
-  void (^_Null_unspecified __attribute__((swift_attr("@Sendable"))))(_Null_unspecified sourcekitd_api_response_t)
+  void (^_Null_unspecified SWIFT_SENDABLE)(_Null_unspecified sourcekitd_api_response_t)
 );
 typedef void (^sourcekitd_api_cancellation_handler_t)(_Null_unspecified sourcekitd_api_request_handle_t);
 typedef _Null_unspecified sourcekitd_api_uid_t (*sourcekitd_api_uid_get_from_cstr_t)(const char *_Null_unspecified string);
@@ -233,11 +233,11 @@ typedef struct {
     _Null_unspecified sourcekitd_api_plugin_initialize_params_t
   );
 
-  _Null_unspecified sourcekitd_api_uid_get_from_cstr_t (*_Nonnull plugin_initialize_uid_get_from_cstr)(
+  _Null_unspecified SWIFT_SENDABLE sourcekitd_api_uid_get_from_cstr_t (*_Nonnull plugin_initialize_uid_get_from_cstr)(
     _Null_unspecified sourcekitd_api_plugin_initialize_params_t
   );
 
-  _Null_unspecified sourcekitd_api_uid_get_string_ptr_t (*_Nonnull plugin_initialize_uid_get_string_ptr)(
+  _Null_unspecified SWIFT_SENDABLE sourcekitd_api_uid_get_string_ptr_t (*_Nonnull plugin_initialize_uid_get_string_ptr)(
     _Null_unspecified sourcekitd_api_plugin_initialize_params_t
   );
 
@@ -251,7 +251,7 @@ typedef struct {
 typedef struct {
   void (*_Nonnull plugin_initialize_register_cancellable_request_handler)(
     _Nonnull sourcekitd_api_plugin_initialize_params_t,
-    _Nonnull sourcekitd_api_cancellable_request_handler_t
+    _Nonnull SWIFT_SENDABLE sourcekitd_api_cancellable_request_handler_t
   );
 
   /// Adds a function that will be called when a request is cancelled.
@@ -260,7 +260,7 @@ typedef struct {
   /// handle to be cancelled, it should ignore the cancellation request.
   void (*_Nonnull plugin_initialize_register_cancellation_handler)(
     _Nonnull sourcekitd_api_plugin_initialize_params_t,
-    _Nonnull sourcekitd_api_cancellation_handler_t
+    _Nonnull SWIFT_SENDABLE sourcekitd_api_cancellation_handler_t
   );
 
   void *_Null_unspecified(*_Nonnull plugin_initialize_get_swift_ide_inspection_instance)(

Sources/Csourcekitd/include/sourcekitd_functions.h

@@ -17,6 +17,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#define SWIFT_SENDABLE __attribute__((__swift_attr__("@Sendable")))
+
 // Avoid including <sourcekitd/sourcekitd.h> to make sure we don't call the
 // functions directly. But we need the types to form the function pointers.
 // These are supposed to stay stable across toolchains.
@@ -315,17 +317,17 @@ typedef struct {
   void (*_Nonnull send_request)(
     sourcekitd_api_object_t _Nonnull req,
     _Nullable sourcekitd_api_request_handle_t *_Nullable out_handle,
-    _Nullable sourcekitd_api_response_receiver_t receiver
+    _Nullable SWIFT_SENDABLE sourcekitd_api_response_receiver_t receiver
   );
   void (*_Nonnull cancel_request)(
     _Nullable sourcekitd_api_request_handle_t handle
   );
   void (*_Nonnull set_notification_handler)(
-    _Nullable sourcekitd_api_response_receiver_t receiver
+    _Nullable SWIFT_SENDABLE sourcekitd_api_response_receiver_t receiver
   );
   void (*_Nonnull set_uid_handlers)(
-    _Nullable sourcekitd_api_uid_from_str_handler_t uid_from_str,
-    _Nullable sourcekitd_api_str_from_uid_handler_t str_from_uid
+    _Nullable SWIFT_SENDABLE sourcekitd_api_uid_from_str_handler_t uid_from_str,
+    _Nullable SWIFT_SENDABLE sourcekitd_api_str_from_uid_handler_t str_from_uid
   );
 } sourcekitd_api_functions_t;
 

Sources/Diagnose/RunSourcekitdRequestCommand.swift

@@ -54,7 +54,7 @@ package struct RunSourceKitdRequestCommand: AsyncParsableCommand {
         print("Did not find sourcekitd in the toolchain. Specify path to sourcekitd manually by passing --sourcekitd")
         throw ExitCode(1)
       }
-    let sourcekitd = try await DynamicallyLoadedSourceKitD.getOrCreate(
+    let sourcekitd = try await SourceKitD.getOrCreate(
       dylibPath: sourcekitdPath,
       pluginPaths: nil
     )

Sources/SKTestSupport/SkipUnless.swift

@@ -253,7 +253,7 @@ package actor SkipUnless {
       guard let sourcekitdPath = await ToolchainRegistry.forTesting.default?.sourcekitd else {
         throw GenericError("Could not find SourceKitD")
       }
-      let sourcekitd = try await DynamicallyLoadedSourceKitD.getOrCreate(
+      let sourcekitd = try await SourceKitD.getOrCreate(
         dylibPath: sourcekitdPath,
         pluginPaths: try sourceKitPluginPaths
       )

Sources/SourceKitD/CMakeLists.txt

@@ -6,7 +6,6 @@ set(sources
   SKDResponseArray.swift
   SKDResponseDictionary.swift
   SourceKitD.swift
-  DynamicallyLoadedSourceKitD.swift
   SourceKitDRegistry.swift
   sourcekitd_functions.swift
   sourcekitd_uids.swift)