Rename SKSupport to LanguageServerProtocolExtensions

Author: ahoppen

Contributor Documentation/Modules.md

@@ -37,6 +37,10 @@ This should be the dedicated entry point for clients that want to run SourceKit-
 
 Swift types to represent the [Language Server Protocol (LSP) specification, version 3.17](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/). These types should also be usable when implementing an LSP client and thus this module should not have any dependencies.
 
+### LanguageServerProtocolExtensions
+
+Extensions on top of `LanguageServerProtocol` and `LanguageServerProtocolJSONRPC` that might require other modules defined in sourcekit-lsp.
+
 ### LanguageServerProtocolJSONRPC
 
 A connection to or from a SourceKit-LSP server. Since message parsing can fail, it needs to handle errors in some way and the design decision here is to use SKLogging, which hardcodes `org.swift.sourcekit-lsp` as the default logging subsystem and thus makes the module unsuitable for generic clients.
@@ -57,11 +61,6 @@ Types that should be sharable by the different modules that implement SourceKit-
 
 Configuration options to change how SourceKit-LSP behaves, based on [Configuration files](../Documentation/Configuration%20File.md).
 
-### SKSupport
-
-Contains SourceKit-LSP-specific helper functions. These fall into two different categories:
-- Functionality that can only be implemented by combining two lower-level modules that don't have a shared dependency, like `SKLogging` + `LanguageServerProtocol`
-
 ### SKTestSupport
 
 A collection of utilities useful for writing tests for SourceKit-LSP and which are not specific to a single test module.

Package.swift

@@ -30,9 +30,9 @@ var targets: [Target] = [
       "BuildSystemIntegration",
       "Diagnose",
       "LanguageServerProtocol",
+      "LanguageServerProtocolExtensions",
       "LanguageServerProtocolJSONRPC",
       "SKOptions",
-      "SKSupport",
       "SourceKitLSP",
       "ToolchainRegistry",
       .product(name: "ArgumentParser", package: "swift-argument-parser"),
@@ -71,10 +71,10 @@ var targets: [Target] = [
     dependencies: [
       "BuildServerProtocol",
       "LanguageServerProtocol",
+      "LanguageServerProtocolExtensions",
       "LanguageServerProtocolJSONRPC",
       "SKLogging",
       "SKOptions",
-      "SKSupport",
       "SKUtilities",
       "SourceKitD",
       "SwiftExtensions",
@@ -130,9 +130,9 @@ var targets: [Target] = [
     dependencies: [
       "BuildSystemIntegration",
       "InProcessClient",
+      "LanguageServerProtocolExtensions",
       "SKLogging",
       "SKOptions",
-      "SKSupport",
       "SKUtilities",
       "SourceKitD",
       "SourceKitLSP",
@@ -195,6 +195,22 @@ var targets: [Target] = [
     swiftSettings: globalSwiftSettings
   ),
 
+  // MARK: LanguageServerProtocolExtensions
+
+  .target(
+    name: "LanguageServerProtocolExtensions",
+    dependencies: [
+      "LanguageServerProtocol",
+      "LanguageServerProtocolJSONRPC",
+      "SKLogging",
+      "SourceKitD",
+      "SwiftExtensions",
+      .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+    ],
+    exclude: ["CMakeLists.txt"],
+    swiftSettings: globalSwiftSettings
+  ),
+
   // MARK: LanguageServerProtocolJSONRPC
 
   .target(
@@ -271,8 +287,8 @@ var targets: [Target] = [
     name: "SKOptions",
     dependencies: [
       "LanguageServerProtocol",
+      "LanguageServerProtocolExtensions",
       "SKLogging",
-      "SKSupport",
       .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
     ],
     exclude: ["CMakeLists.txt"],
@@ -295,30 +311,11 @@ var targets: [Target] = [
     name: "SKUtilitiesTests",
     dependencies: [
       "SKUtilities",
-      // "SKLogging",
-      // "SKSupport",
       "SKTestSupport",
-      // "SwiftExtensions",
     ],
     swiftSettings: globalSwiftSettings
   ),
 
-  // MARK: SKSupport
-
-  .target(
-    name: "SKSupport",
-    dependencies: [
-      "LanguageServerProtocol",
-      "LanguageServerProtocolJSONRPC",
-      "SKLogging",
-      "SourceKitD",
-      "SwiftExtensions",
-      .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
-    ],
-    exclude: ["CMakeLists.txt"],
-    swiftSettings: globalSwiftSettings
-  ),
-
   // MARK: SKTestSupport
 
   .target(
@@ -328,10 +325,10 @@ var targets: [Target] = [
       "CSKTestSupport",
       "InProcessClient",
       "LanguageServerProtocol",
+      "LanguageServerProtocolExtensions",
       "LanguageServerProtocolJSONRPC",
       "SKLogging",
       "SKOptions",
-      "SKSupport",
       "SKUtilities",
       "SourceKitLSP",
       "SwiftExtensions",
@@ -377,11 +374,11 @@ var targets: [Target] = [
       "BuildServerProtocol",
       "BuildSystemIntegration",
       "LanguageServerProtocol",
+      "LanguageServerProtocolExtensions",
       "LanguageServerProtocolJSONRPC",
       "SemanticIndex",
       "SKLogging",
       "SKOptions",
-      "SKSupport",
       "SKUtilities",
       "SourceKitD",
       "SwiftExtensions",
@@ -406,10 +403,10 @@ var targets: [Target] = [
       "BuildServerProtocol",
       "BuildSystemIntegration",
       "LanguageServerProtocol",
+      "LanguageServerProtocolExtensions",
       "SemanticIndex",
       "SKLogging",
       "SKOptions",
-      "SKSupport",
       "SKTestSupport",
       "SKUtilities",
       "SourceKitD",
@@ -447,8 +444,8 @@ var targets: [Target] = [
   .target(
     name: "ToolchainRegistry",
     dependencies: [
+      "LanguageServerProtocolExtensions",
       "SKLogging",
-      "SKSupport",
       "SKUtilities",
       "SwiftExtensions",
       "TSCExtensions",

Sources/BuildSystemIntegration/BuildSystemManager.swift

@@ -15,9 +15,9 @@ package import BuildServerProtocol
 import Dispatch
 import Foundation
 package import LanguageServerProtocol
+package import LanguageServerProtocolExtensions
 import SKLogging
 package import SKOptions
-package import SKSupport
 import SKUtilities
 package import SwiftExtensions
 package import ToolchainRegistry
@@ -30,9 +30,9 @@ import BuildServerProtocol
 import Dispatch
 import Foundation
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
 import SKOptions
-import SKSupport
 import SKUtilities
 import SwiftExtensions
 import ToolchainRegistry

Sources/BuildSystemIntegration/BuildSystemMessageDependencyTracker.swift

@@ -13,14 +13,14 @@
 #if compiler(>=6)
 import BuildServerProtocol
 package import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
-import SKSupport
 import SwiftExtensions
 #else
 import BuildServerProtocol
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
-import SKSupport
 import SwiftExtensions
 #endif
 

Sources/BuildSystemIntegration/BuiltInBuildSystemAdapter.swift

@@ -13,9 +13,9 @@
 import BuildServerProtocol
 import Foundation
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
 import SKOptions
-import SKSupport
 import SwiftExtensions
 import ToolchainRegistry
 

Sources/BuildSystemIntegration/CMakeLists.txt

@@ -29,7 +29,7 @@ target_link_libraries(BuildSystemIntegration PUBLIC
   LanguageServerProtocolJSONRPC
   SKLogging
   SKOptions
-  SKSupport
+  LanguageServerProtocolExtensions
   SourceKitD
   SwiftExtensions
   ToolchainRegistry

Sources/BuildSystemIntegration/CompilationDatabase.swift

@@ -14,8 +14,8 @@
 package import BuildServerProtocol
 import Foundation
 package import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
-import SKSupport
 import SwiftExtensions
 import TSCExtensions
 
@@ -27,8 +27,8 @@ package import var TSCBasic.localFileSystem
 import BuildServerProtocol
 import Foundation
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
-import SKSupport
 import SwiftExtensions
 import TSCExtensions
 

Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift

@@ -14,9 +14,9 @@
 package import BuildServerProtocol
 import Dispatch
 package import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
 package import SKOptions
-import SKSupport
 import ToolchainRegistry
 import TSCExtensions
 
@@ -29,9 +29,9 @@ package import var TSCBasic.localFileSystem
 import BuildServerProtocol
 import Dispatch
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKLogging
 import SKOptions
-import SKSupport
 import ToolchainRegistry
 import TSCExtensions
 

Sources/BuildSystemIntegration/ExternalBuildSystemAdapter.swift

@@ -13,10 +13,10 @@
 import BuildServerProtocol
 import Foundation
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import LanguageServerProtocolJSONRPC
 import SKLogging
 import SKOptions
-import SKSupport
 import SwiftExtensions
 import TSCExtensions
 

Sources/BuildSystemIntegration/FallbackBuildSettings.swift

@@ -13,8 +13,8 @@
 #if compiler(>=6)
 import Foundation
 package import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 package import SKOptions
-import SKSupport
 import TSCExtensions
 
 import enum PackageLoading.Platform
@@ -23,8 +23,8 @@ import class TSCBasic.Process
 #else
 import Foundation
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import SKOptions
-import SKSupport
 import TSCExtensions
 
 import enum PackageLoading.Platform

Sources/BuildSystemIntegration/FileBuildSettings.swift

@@ -12,7 +12,7 @@
 
 import Foundation
 import LanguageServerProtocol
-import SKSupport
+import LanguageServerProtocolExtensions
 
 /// Build settings for a single file.
 ///

Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift

@@ -13,10 +13,10 @@
 import BuildServerProtocol
 import Foundation
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 import LanguageServerProtocolJSONRPC
 import SKLogging
 import SKOptions
-import SKSupport
 import SwiftExtensions
 import ToolchainRegistry
 

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -17,12 +17,12 @@ package import BuildServerProtocol
 import Dispatch
 package import Foundation
 package import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 @preconcurrency import PackageGraph
 import PackageLoading
 import PackageModel
 import SKLogging
 package import SKOptions
-import SKSupport
 @preconcurrency package import SPMBuildCore
 import SourceControl
 package import SourceKitLSPAPI
@@ -46,12 +46,12 @@ import BuildServerProtocol
 import Dispatch
 import Foundation
 import LanguageServerProtocol
+import LanguageServerProtocolExtensions
 @preconcurrency import PackageGraph
 import PackageLoading
 import PackageModel
 import SKLogging
 import SKOptions
-import SKSupport
 @preconcurrency import SPMBuildCore
 import SourceControl
 import SourceKitLSPAPI

Sources/CMakeLists.txt

@@ -8,13 +8,15 @@ add_subdirectory(Csourcekitd)
 add_subdirectory(Diagnose)
 add_subdirectory(InProcessClient)
 add_subdirectory(LanguageServerProtocol)
+add_subdirectory(LanguageServerProtocolExtensions)
 add_subdirectory(LanguageServerProtocolJSONRPC)
 add_subdirectory(SemanticIndex)
 add_subdirectory(SKLogging)
 add_subdirectory(SKOptions)
-add_subdirectory(SKSupport)
+add_subdirectory(SKUtilities)
 add_subdirectory(SourceKitLSP)
 add_subdirectory(SourceKitD)
 add_subdirectory(sourcekit-lsp)
 add_subdirectory(SwiftExtensions)
 add_subdirectory(ToolchainRegistry)
+add_subdirectory(TSCExtensions)

Sources/Diagnose/DiagnoseCommand.swift

@@ -13,8 +13,8 @@
 #if compiler(>=6)
 package import ArgumentParser
 import Foundation
+import LanguageServerProtocolExtensions
 import ToolchainRegistry
-import SKSupport
 import SwiftExtensions
 import TSCExtensions
 
@@ -24,8 +24,8 @@ import class TSCUtility.PercentProgressAnimation
 #else
 import ArgumentParser
 import Foundation
+import LanguageServerProtocolExtensions
 import ToolchainRegistry
-import SKSupport
 import SwiftExtensions
 import TSCExtensions