Merge pull request #2 from owenv/owenv/extensions-pruning

Remove unnecessary SwiftExtensions content

Author: owenv

Package.swift

@@ -20,8 +20,8 @@ var products: [Product] = [
   .library(name: "LanguageServerProtocolTransport", targets: ["LanguageServerProtocolTransport"]),
   .library(name: "SKLogging", targets: ["SKLogging"]),
   .library(name: "_SKLoggingForPlugin", targets: ["_SKLoggingForPlugin"]),
-  .library(name: "SwiftExtensions", targets: ["SwiftExtensions"]),
-  .library(name: "_SwiftExtensionsForPlugin", targets: ["_SwiftExtensionsForPlugin"]),
+  .library(name: "ToolsProtocolsSwiftExtensions", targets: ["ToolsProtocolsSwiftExtensions"]),
+  .library(name: "_ToolsProtocolsSwiftExtensionsForPlugin", targets: ["_ToolsProtocolsSwiftExtensionsForPlugin"]),
 ]
 
 var targets: [Target] = [
@@ -86,7 +86,7 @@ var targets: [Target] = [
       "BuildServerProtocol",
       "LanguageServerProtocol",
       "SKLogging",
-      "SwiftExtensions",
+      "ToolsProtocolsSwiftExtensions",
     ],
     exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings
@@ -107,7 +107,7 @@ var targets: [Target] = [
   .target(
     name: "SKLogging",
     dependencies: [
-      "SwiftExtensions",
+      "ToolsProtocolsSwiftExtensions",
     ],
     exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + lspLoggingSwiftSettings
@@ -117,12 +117,12 @@ var targets: [Target] = [
   .target(
     name: "_SKLoggingForPlugin",
     dependencies: [
-      "_SwiftExtensionsForPlugin"
+      "_ToolsProtocolsSwiftExtensionsForPlugin"
     ],
     exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings + lspLoggingSwiftSettings + [
       .unsafeFlags([
-        "-module-alias", "SwiftExtensions=_SwiftExtensionsForPlugin",
+        "-module-alias", "ToolsProtocolsSwiftExtensions=_ToolsProtocolsSwiftExtensionsForPlugin",
       ]),
     ]
   ),
@@ -144,34 +144,34 @@ var targets: [Target] = [
       "LanguageServerProtocol",
       "LanguageServerProtocolTransport",
       "SKLogging",
-      "SwiftExtensions",
+      "ToolsProtocolsSwiftExtensions",
     ],
     swiftSettings: globalSwiftSettings
   ),
 
-  // MARK: SwiftExtensions
+  // MARK: ToolsProtocolsSwiftExtensions
 
   .target(
-    name: "SwiftExtensions",
+    name: "ToolsProtocolsSwiftExtensions",
     dependencies: ["ToolsProtocolsCAtomics"],
     exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings
   ),
 
-  // SourceKit-LSP SPI target. Builds SwiftExtensions with an alternate module name to avoid runtime type collisions.
+  // SourceKit-LSP SPI target. Builds ToolsProtocolsSwiftExtensions with an alternate module name to avoid runtime type collisions.
   .target(
-    name: "_SwiftExtensionsForPlugin",
+    name: "_ToolsProtocolsSwiftExtensionsForPlugin",
     dependencies: ["ToolsProtocolsCAtomics"],
     exclude: ["CMakeLists.txt"],
     swiftSettings: globalSwiftSettings
   ),
 
   .testTarget(
-    name: "SwiftExtensionsTests",
+    name: "ToolsProtocolsSwiftExtensionsTests",
     dependencies: [
       "SKLogging",
       "ToolsProtocolsTestSupport",
-      "SwiftExtensions",
+      "ToolsProtocolsSwiftExtensions",
     ],
     swiftSettings: globalSwiftSettings
   ),

Sources/CMakeLists.txt

@@ -6,4 +6,4 @@ add_subdirectory(ToolsProtocolsCAtomics)
 add_subdirectory(LanguageServerProtocol)
 add_subdirectory(LanguageServerProtocolTransport)
 add_subdirectory(SKLogging)
-add_subdirectory(SwiftExtensions)
+add_subdirectory(ToolsProtocolsSwiftExtensions)

Sources/LanguageServerProtocolTransport/BuildServerMessageDependencyTracker.swift

@@ -13,7 +13,7 @@
 import BuildServerProtocol
 public import LanguageServerProtocol
 @_spi(SourceKitLSP) import SKLogging
-import SwiftExtensions
+import ToolsProtocolsSwiftExtensions
 
 /// A lightweight way of describing tasks that are created from handling BSP
 /// requests or notifications for the purpose of dependency tracking.

Sources/LanguageServerProtocolTransport/JSONRPCConnection.swift

@@ -14,7 +14,7 @@ public import Dispatch
 public import Foundation
 public import LanguageServerProtocol
 @_spi(SourceKitLSP) import SKLogging
-@_spi(SourceKitLSP) import SwiftExtensions
+@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
 
 #if canImport(Android)
 import Android

Sources/LanguageServerProtocolTransport/LocalConnection.swift

@@ -14,7 +14,7 @@ import Dispatch
 import Foundation
 public import LanguageServerProtocol
 @_spi(SourceKitLSP) import SKLogging
-@_spi(SourceKitLSP) import SwiftExtensions
+@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
 
 /// A connection between two message handlers in the same process.
 ///

Sources/LanguageServerProtocolTransport/QueueBasedMessageHandler.swift

@@ -13,7 +13,7 @@
 import Foundation
 public import LanguageServerProtocol
 @_spi(SourceKitLSP) import SKLogging
-@_spi(SourceKitLSP) public import SwiftExtensions
+@_spi(SourceKitLSP) public import ToolsProtocolsSwiftExtensions
 
 /// Side structure in which `QueueBasedMessageHandler` can keep track of active requests etc.
 ///

Sources/LanguageServerProtocolTransport/RequestAndReply.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 public import LanguageServerProtocol
-@_spi(SourceKitLSP) import SwiftExtensions
+@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
 
 /// A request and a callback that returns the request's reply
 public final class RequestAndReply<Params: RequestType>: Sendable {

Sources/SKLogging/CMakeLists.txt

@@ -14,18 +14,18 @@ set_target_properties(SKLogging PROPERTIES
 target_link_libraries(SKLogging PRIVATE
   $<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
 target_link_libraries(SKLogging PUBLIC
-  SwiftExtensions)
+  ToolsProtocolsSwiftExtensions)
 
 add_library(SKLoggingForPlugin STATIC ${sources})
 set_target_properties(SKLoggingForPlugin PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 target_compile_options(SKLoggingForPlugin PRIVATE
   $<$<COMPILE_LANGUAGE:Swift>:
-    "SHELL:-module-alias SwiftExtensions=SwiftExtensionsForPlugin"
+    "SHELL:-module-alias ToolsProtocolsSwiftExtensions=ToolsProtocolsSwiftExtensionsForPlugin"
   >)
 target_link_libraries(SKLoggingForPlugin PRIVATE
   $<$<NOT:$<PLATFORM_ID:Darwin>>:Foundation>)
 target_link_libraries(SKLoggingForPlugin PUBLIC
-  SwiftExtensionsForPlugin)
+  ToolsProtocolsSwiftExtensionsForPlugin)
 
 set_property(GLOBAL APPEND PROPERTY SWIFTTOOLSPROTOCOLS_EXPORTS SKLogging)

Sources/SKLogging/LoggingScope.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-@_spi(SourceKitLSP) import SwiftExtensions
+@_spi(SourceKitLSP) import ToolsProtocolsSwiftExtensions
 
 public final class LoggingScope {
 

Sources/SKLogging/NonDarwinLogging.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-@_spi(SourceKitLSP) public import SwiftExtensions
+@_spi(SourceKitLSP) public import ToolsProtocolsSwiftExtensions
 
 #if canImport(Darwin)
 import Foundation