diff --git a/Contributor Documentation/Modules.md b/Contributor Documentation/Modules.md index 933f992e..dfaf54ee 100644 --- a/Contributor Documentation/Modules.md +++ b/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. diff --git a/Package.swift b/Package.swift index 066ae462..af3560da 100644 --- a/Package.swift +++ b/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", diff --git a/Sources/BuildSystemIntegration/BuildSystemManager.swift b/Sources/BuildSystemIntegration/BuildSystemManager.swift index 229baf95..e72b03fd 100644 --- a/Sources/BuildSystemIntegration/BuildSystemManager.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/BuildSystemMessageDependencyTracker.swift b/Sources/BuildSystemIntegration/BuildSystemMessageDependencyTracker.swift index 8ee498d9..49565321 100644 --- a/Sources/BuildSystemIntegration/BuildSystemMessageDependencyTracker.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/BuiltInBuildSystemAdapter.swift b/Sources/BuildSystemIntegration/BuiltInBuildSystemAdapter.swift index 002c35ae..5de36767 100644 --- a/Sources/BuildSystemIntegration/BuiltInBuildSystemAdapter.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/CMakeLists.txt b/Sources/BuildSystemIntegration/CMakeLists.txt index b1ce4f7a..d0a9c1af 100644 --- a/Sources/BuildSystemIntegration/CMakeLists.txt +++ b/Sources/BuildSystemIntegration/CMakeLists.txt @@ -29,7 +29,7 @@ target_link_libraries(BuildSystemIntegration PUBLIC LanguageServerProtocolJSONRPC SKLogging SKOptions - SKSupport + LanguageServerProtocolExtensions SourceKitD SwiftExtensions ToolchainRegistry diff --git a/Sources/BuildSystemIntegration/CompilationDatabase.swift b/Sources/BuildSystemIntegration/CompilationDatabase.swift index 06dba6f3..a3521ffa 100644 --- a/Sources/BuildSystemIntegration/CompilationDatabase.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift b/Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift index c9a37c08..c84f2be6 100644 --- a/Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/ExternalBuildSystemAdapter.swift b/Sources/BuildSystemIntegration/ExternalBuildSystemAdapter.swift index 604f5a71..bc8b1cca 100644 --- a/Sources/BuildSystemIntegration/ExternalBuildSystemAdapter.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/FallbackBuildSettings.swift b/Sources/BuildSystemIntegration/FallbackBuildSettings.swift index a9876ed6..8e738262 100644 --- a/Sources/BuildSystemIntegration/FallbackBuildSettings.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/FileBuildSettings.swift b/Sources/BuildSystemIntegration/FileBuildSettings.swift index 1f1811d9..e18a8b5f 100644 --- a/Sources/BuildSystemIntegration/FileBuildSettings.swift +++ b/Sources/BuildSystemIntegration/FileBuildSettings.swift @@ -12,7 +12,7 @@ import Foundation import LanguageServerProtocol -import SKSupport +import LanguageServerProtocolExtensions /// Build settings for a single file. /// diff --git a/Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift b/Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift index 139c1a51..fb46c49f 100644 --- a/Sources/BuildSystemIntegration/LegacyBuildServerBuildSystem.swift +++ b/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 diff --git a/Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift b/Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift index 381550da..dd443830 100644 --- a/Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift +++ b/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 diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt index bf270b99..c32f4d8d 100644 --- a/Sources/CMakeLists.txt +++ b/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) diff --git a/Sources/Diagnose/DiagnoseCommand.swift b/Sources/Diagnose/DiagnoseCommand.swift index fc586f72..d5654647 100644 --- a/Sources/Diagnose/DiagnoseCommand.swift +++ b/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 diff --git a/Sources/Diagnose/IndexCommand.swift b/Sources/Diagnose/IndexCommand.swift index 5fa0da94..1c93274d 100644 --- a/Sources/Diagnose/IndexCommand.swift +++ b/Sources/Diagnose/IndexCommand.swift @@ -15,8 +15,8 @@ public import ArgumentParser import Foundation import InProcessClient import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKOptions -import SKSupport import SourceKitLSP import SwiftExtensions import ToolchainRegistry @@ -29,8 +29,8 @@ import ArgumentParser import Foundation import InProcessClient import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKOptions -import SKSupport import SourceKitLSP import SwiftExtensions import ToolchainRegistry diff --git a/Sources/InProcessClient/InProcessSourceKitLSPClient.swift b/Sources/InProcessClient/InProcessSourceKitLSPClient.swift index 9f163839..624a8256 100644 --- a/Sources/InProcessClient/InProcessSourceKitLSPClient.swift +++ b/Sources/InProcessClient/InProcessSourceKitLSPClient.swift @@ -14,8 +14,8 @@ import BuildSystemIntegration public import Foundation public import LanguageServerProtocol +import LanguageServerProtocolExtensions package import SKOptions -import SKSupport import SourceKitLSP import SwiftExtensions import ToolchainRegistry @@ -26,8 +26,8 @@ import struct TSCBasic.AbsolutePath import BuildSystemIntegration import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKOptions -import SKSupport import SourceKitLSP import SwiftExtensions import ToolchainRegistry diff --git a/Sources/SKSupport/CMakeLists.txt b/Sources/LanguageServerProtocolExtensions/CMakeLists.txt similarity index 59% rename from Sources/SKSupport/CMakeLists.txt rename to Sources/LanguageServerProtocolExtensions/CMakeLists.txt index 546c4c44..a0f8efd5 100644 --- a/Sources/SKSupport/CMakeLists.txt +++ b/Sources/LanguageServerProtocolExtensions/CMakeLists.txt @@ -1,28 +1,20 @@ -add_library(SKSupport STATIC - AbsolutePath+Init.swift - ByteString.swift +add_library(LanguageServerProtocolExtensions STATIC Connection+Send.swift - Debouncer.swift - Dictionary+InitWithElementsKeyedBy.swift DocumentURI+CustomLogStringConvertible.swift DocumentURI+symlinkTarget.swift - FileSystem.swift Language+InferredFromFileExtension.swift - LineTable.swift LocalConnection.swift - Process+Run.swift QueueBasedMessageHandler.swift RequestAndReply.swift ResponseError+Init.swift - SwitchableProcessResultExitStatus.swift WorkDoneProgressManager.swift ) -set_target_properties(SKSupport PROPERTIES +set_target_properties(LanguageServerProtocolExtensions PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) -target_link_libraries(SKSupport PUBLIC +target_link_libraries(LanguageServerProtocolExtensions PUBLIC SourceKitD) -target_link_libraries(SKSupport PRIVATE +target_link_libraries(LanguageServerProtocolExtensions PRIVATE LanguageServerProtocol LanguageServerProtocolJSONRPC SKLogging diff --git a/Sources/SKSupport/Connection+Send.swift b/Sources/LanguageServerProtocolExtensions/Connection+Send.swift similarity index 100% rename from Sources/SKSupport/Connection+Send.swift rename to Sources/LanguageServerProtocolExtensions/Connection+Send.swift diff --git a/Sources/SKSupport/DocumentURI+CustomLogStringConvertible.swift b/Sources/LanguageServerProtocolExtensions/DocumentURI+CustomLogStringConvertible.swift similarity index 100% rename from Sources/SKSupport/DocumentURI+CustomLogStringConvertible.swift rename to Sources/LanguageServerProtocolExtensions/DocumentURI+CustomLogStringConvertible.swift diff --git a/Sources/SKSupport/DocumentURI+symlinkTarget.swift b/Sources/LanguageServerProtocolExtensions/DocumentURI+symlinkTarget.swift similarity index 100% rename from Sources/SKSupport/DocumentURI+symlinkTarget.swift rename to Sources/LanguageServerProtocolExtensions/DocumentURI+symlinkTarget.swift diff --git a/Sources/SKSupport/Language+InferredFromFileExtension.swift b/Sources/LanguageServerProtocolExtensions/Language+InferredFromFileExtension.swift similarity index 100% rename from Sources/SKSupport/Language+InferredFromFileExtension.swift rename to Sources/LanguageServerProtocolExtensions/Language+InferredFromFileExtension.swift diff --git a/Sources/SKSupport/LocalConnection.swift b/Sources/LanguageServerProtocolExtensions/LocalConnection.swift similarity index 100% rename from Sources/SKSupport/LocalConnection.swift rename to Sources/LanguageServerProtocolExtensions/LocalConnection.swift diff --git a/Sources/SKSupport/QueueBasedMessageHandler.swift b/Sources/LanguageServerProtocolExtensions/QueueBasedMessageHandler.swift similarity index 100% rename from Sources/SKSupport/QueueBasedMessageHandler.swift rename to Sources/LanguageServerProtocolExtensions/QueueBasedMessageHandler.swift diff --git a/Sources/SKSupport/RequestAndReply.swift b/Sources/LanguageServerProtocolExtensions/RequestAndReply.swift similarity index 100% rename from Sources/SKSupport/RequestAndReply.swift rename to Sources/LanguageServerProtocolExtensions/RequestAndReply.swift diff --git a/Sources/SKSupport/ResponseError+Init.swift b/Sources/LanguageServerProtocolExtensions/ResponseError+Init.swift similarity index 100% rename from Sources/SKSupport/ResponseError+Init.swift rename to Sources/LanguageServerProtocolExtensions/ResponseError+Init.swift diff --git a/Sources/SKSupport/WorkDoneProgressManager.swift b/Sources/LanguageServerProtocolExtensions/WorkDoneProgressManager.swift similarity index 100% rename from Sources/SKSupport/WorkDoneProgressManager.swift rename to Sources/LanguageServerProtocolExtensions/WorkDoneProgressManager.swift diff --git a/Sources/SKOptions/CMakeLists.txt b/Sources/SKOptions/CMakeLists.txt index 4aa88f05..1679c3e6 100644 --- a/Sources/SKOptions/CMakeLists.txt +++ b/Sources/SKOptions/CMakeLists.txt @@ -8,6 +8,6 @@ set_target_properties(SKOptions PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) target_link_libraries(SKOptions PUBLIC LanguageServerProtocol + LanguageServerProtocolExtensions SKLogging - SKSupport TSCBasic) diff --git a/Sources/SKOptions/SourceKitLSPOptions.swift b/Sources/SKOptions/SourceKitLSPOptions.swift index 8915dc74..a2a60ec6 100644 --- a/Sources/SKOptions/SourceKitLSPOptions.swift +++ b/Sources/SKOptions/SourceKitLSPOptions.swift @@ -13,15 +13,15 @@ #if compiler(>=6) public import Foundation public import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import struct TSCBasic.AbsolutePath #else import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import struct TSCBasic.AbsolutePath #endif diff --git a/Sources/SKTestSupport/FindTool.swift b/Sources/SKTestSupport/FindTool.swift index 8b93f28f..f20a06f9 100644 --- a/Sources/SKTestSupport/FindTool.swift +++ b/Sources/SKTestSupport/FindTool.swift @@ -12,13 +12,13 @@ #if compiler(>=6) package import Foundation -import SKSupport +import LanguageServerProtocolExtensions import TSCExtensions import class TSCBasic.Process #else import Foundation -import SKSupport +import LanguageServerProtocolExtensions import TSCExtensions import class TSCBasic.Process diff --git a/Sources/SKTestSupport/SkipUnless.swift b/Sources/SKTestSupport/SkipUnless.swift index 00a4b630..b2f1bea9 100644 --- a/Sources/SKTestSupport/SkipUnless.swift +++ b/Sources/SKTestSupport/SkipUnless.swift @@ -12,9 +12,9 @@ import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import RegexBuilder import SKLogging -import SKSupport import SourceKitLSP import SwiftExtensions import TSCExtensions diff --git a/Sources/SKTestSupport/SwiftPMDependencyProject.swift b/Sources/SKTestSupport/SwiftPMDependencyProject.swift index fc882a09..a8f89cf0 100644 --- a/Sources/SKTestSupport/SwiftPMDependencyProject.swift +++ b/Sources/SKTestSupport/SwiftPMDependencyProject.swift @@ -12,7 +12,7 @@ #if compiler(>=6) package import Foundation -import SKSupport +import LanguageServerProtocolExtensions import SwiftExtensions import XCTest @@ -22,7 +22,7 @@ import enum TSCBasic.ProcessEnv import struct TSCBasic.ProcessResult #else import Foundation -import SKSupport +import LanguageServerProtocolExtensions import SwiftExtensions import XCTest diff --git a/Sources/SKTestSupport/TestJSONRPCConnection.swift b/Sources/SKTestSupport/TestJSONRPCConnection.swift index dd86f780..e76486dd 100644 --- a/Sources/SKTestSupport/TestJSONRPCConnection.swift +++ b/Sources/SKTestSupport/TestJSONRPCConnection.swift @@ -14,7 +14,7 @@ import InProcessClient public import LanguageServerProtocol package import LanguageServerProtocolJSONRPC -package import SKSupport +package import LanguageServerProtocolExtensions import SwiftExtensions import XCTest @@ -23,7 +23,7 @@ package import class Foundation.Pipe import InProcessClient import LanguageServerProtocol import LanguageServerProtocolJSONRPC -import SKSupport +import LanguageServerProtocolExtensions import SwiftExtensions import XCTest diff --git a/Sources/SKTestSupport/TestSourceKitLSPClient.swift b/Sources/SKTestSupport/TestSourceKitLSPClient.swift index 3a15ef72..63883c6a 100644 --- a/Sources/SKTestSupport/TestSourceKitLSPClient.swift +++ b/Sources/SKTestSupport/TestSourceKitLSPClient.swift @@ -15,8 +15,8 @@ import Foundation import InProcessClient package import LanguageServerProtocol import LanguageServerProtocolJSONRPC +import LanguageServerProtocolExtensions package import SKOptions -import SKSupport import SKUtilities package import SourceKitLSP import SwiftExtensions @@ -28,8 +28,8 @@ import Foundation import InProcessClient import LanguageServerProtocol import LanguageServerProtocolJSONRPC +import LanguageServerProtocolExtensions import SKOptions -import SKSupport import SKUtilities import SourceKitLSP import SwiftExtensions diff --git a/Sources/SKUtilities/CMakeLists.txt b/Sources/SKUtilities/CMakeLists.txt index 4a21fb58..791eb887 100644 --- a/Sources/SKUtilities/CMakeLists.txt +++ b/Sources/SKUtilities/CMakeLists.txt @@ -2,12 +2,11 @@ add_library(SKUtilities STATIC Debouncer.swift Dictionary+InitWithElementsKeyedBy.swift - FileSystem.swift LineTable.swift ) set_target_properties(SKUtilities PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) -target_link_libraries(SKSupport PRIVATE +target_link_libraries(SKUtilities PRIVATE SKLogging SwiftExtensions TSCBasic diff --git a/Sources/SemanticIndex/PreparationTaskDescription.swift b/Sources/SemanticIndex/PreparationTaskDescription.swift index 198b9504..41dcebeb 100644 --- a/Sources/SemanticIndex/PreparationTaskDescription.swift +++ b/Sources/SemanticIndex/PreparationTaskDescription.swift @@ -15,8 +15,8 @@ package import BuildServerProtocol import BuildSystemIntegration import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions import struct TSCBasic.AbsolutePath @@ -26,8 +26,8 @@ import BuildServerProtocol import BuildSystemIntegration import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions import struct TSCBasic.AbsolutePath diff --git a/Sources/SemanticIndex/TaskScheduler.swift b/Sources/SemanticIndex/TaskScheduler.swift index a478a165..33e269ae 100644 --- a/Sources/SemanticIndex/TaskScheduler.swift +++ b/Sources/SemanticIndex/TaskScheduler.swift @@ -12,13 +12,13 @@ #if compiler(>=6) import Foundation +import LanguageServerProtocolExtensions package import SKLogging -import SKSupport import SwiftExtensions #else import Foundation +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions #endif diff --git a/Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift b/Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift index 64897981..f5f0a21a 100644 --- a/Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift +++ b/Sources/SemanticIndex/UpdateIndexStoreTaskDescription.swift @@ -15,8 +15,8 @@ package import BuildServerProtocol import BuildSystemIntegration import Foundation package import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions import ToolchainRegistry import TSCExtensions @@ -29,8 +29,8 @@ import BuildServerProtocol import BuildSystemIntegration import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions import ToolchainRegistry import TSCExtensions diff --git a/Sources/SourceKitLSP/CMakeLists.txt b/Sources/SourceKitLSP/CMakeLists.txt index 5473165b..fdca6b33 100644 --- a/Sources/SourceKitLSP/CMakeLists.txt +++ b/Sources/SourceKitLSP/CMakeLists.txt @@ -74,11 +74,11 @@ target_link_libraries(SourceKitLSP PUBLIC BuildServerProtocol BuildSystemIntegration LanguageServerProtocol + LanguageServerProtocolExtensions LanguageServerProtocolJSONRPC SemanticIndex SKLogging SKOptions - SKSupport SKUtilities SourceKitD SwiftExtensions diff --git a/Sources/SourceKitLSP/CapabilityRegistry.swift b/Sources/SourceKitLSP/CapabilityRegistry.swift index 9bc9dcf7..aad23a63 100644 --- a/Sources/SourceKitLSP/CapabilityRegistry.swift +++ b/Sources/SourceKitLSP/CapabilityRegistry.swift @@ -12,13 +12,13 @@ #if compiler(>=6) package import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions #else import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions #endif diff --git a/Sources/SourceKitLSP/Clang/ClangLanguageService.swift b/Sources/SourceKitLSP/Clang/ClangLanguageService.swift index ccc30042..d3465072 100644 --- a/Sources/SourceKitLSP/Clang/ClangLanguageService.swift +++ b/Sources/SourceKitLSP/Clang/ClangLanguageService.swift @@ -13,10 +13,10 @@ import BuildSystemIntegration import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import LanguageServerProtocolJSONRPC import SKLogging import SKOptions -import SKSupport import SwiftExtensions import SwiftSyntax import TSCExtensions diff --git a/Sources/SourceKitLSP/IndexProgressManager.swift b/Sources/SourceKitLSP/IndexProgressManager.swift index 1c34e35b..d283719a 100644 --- a/Sources/SourceKitLSP/IndexProgressManager.swift +++ b/Sources/SourceKitLSP/IndexProgressManager.swift @@ -11,9 +11,9 @@ //===----------------------------------------------------------------------===// import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging import SKOptions -import SKSupport import SemanticIndex import SwiftExtensions diff --git a/Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift b/Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift index 212b808d..483ca1d0 100644 --- a/Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift +++ b/Sources/SourceKitLSP/MessageHandlingDependencyTracker.swift @@ -12,13 +12,13 @@ #if compiler(>=6) package import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions #else import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions #endif diff --git a/Sources/SourceKitLSP/SharedWorkDoneProgressManager.swift b/Sources/SourceKitLSP/SharedWorkDoneProgressManager.swift index 27568631..631ec7c5 100644 --- a/Sources/SourceKitLSP/SharedWorkDoneProgressManager.swift +++ b/Sources/SourceKitLSP/SharedWorkDoneProgressManager.swift @@ -12,9 +12,9 @@ import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging import SKOptions -import SKSupport import SwiftExtensions extension WorkDoneProgressManager { diff --git a/Sources/SourceKitLSP/SourceKitIndexDelegate.swift b/Sources/SourceKitLSP/SourceKitIndexDelegate.swift index e772ef48..c1e57e27 100644 --- a/Sources/SourceKitLSP/SourceKitIndexDelegate.swift +++ b/Sources/SourceKitLSP/SourceKitIndexDelegate.swift @@ -12,8 +12,8 @@ import Dispatch import IndexStoreDB +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions /// `IndexDelegate` for the SourceKit workspace. diff --git a/Sources/SourceKitLSP/SourceKitLSPCommandMetadata.swift b/Sources/SourceKitLSP/SourceKitLSPCommandMetadata.swift index 9bb91086..0ad2f147 100644 --- a/Sources/SourceKitLSP/SourceKitLSPCommandMetadata.swift +++ b/Sources/SourceKitLSP/SourceKitLSPCommandMetadata.swift @@ -13,13 +13,13 @@ #if compiler(>=6) import Foundation package import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport #else import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport #endif /// Represents metadata that SourceKit-LSP injects at every command returned by code actions. diff --git a/Sources/SourceKitLSP/SourceKitLSPServer.swift b/Sources/SourceKitLSP/SourceKitLSPServer.swift index 504d7aad..f54f1ffc 100644 --- a/Sources/SourceKitLSP/SourceKitLSPServer.swift +++ b/Sources/SourceKitLSP/SourceKitLSPServer.swift @@ -17,11 +17,11 @@ import Dispatch import Foundation import IndexStoreDB package import LanguageServerProtocol +package import LanguageServerProtocolExtensions import LanguageServerProtocolJSONRPC import PackageLoading import SKLogging package import SKOptions -package import SKSupport import SemanticIndex import SourceKitD package import SwiftExtensions @@ -38,11 +38,11 @@ import Dispatch import Foundation import IndexStoreDB import LanguageServerProtocol +import LanguageServerProtocolExtensions import LanguageServerProtocolJSONRPC import PackageLoading import SKLogging import SKOptions -import SKSupport import SemanticIndex import SourceKitD import SwiftExtensions diff --git a/Sources/SourceKitLSP/Swift/CommentXML.swift b/Sources/SourceKitLSP/Swift/CommentXML.swift index c0542d97..3aee6218 100644 --- a/Sources/SourceKitLSP/Swift/CommentXML.swift +++ b/Sources/SourceKitLSP/Swift/CommentXML.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -import SKSupport +import LanguageServerProtocolExtensions #if canImport(FoundationXML) import FoundationXML diff --git a/Sources/SourceKitLSP/Swift/Diagnostic.swift b/Sources/SourceKitLSP/Swift/Diagnostic.swift index af4489c9..833f2a85 100644 --- a/Sources/SourceKitLSP/Swift/Diagnostic.swift +++ b/Sources/SourceKitLSP/Swift/Diagnostic.swift @@ -13,8 +13,8 @@ import Csourcekitd import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SourceKitD import SwiftDiagnostics import SwiftSyntax diff --git a/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift b/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift index da59b1f5..2ddb8f0f 100644 --- a/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift +++ b/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift @@ -11,9 +11,9 @@ //===----------------------------------------------------------------------===// import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging import SKOptions -import SKSupport import SourceKitD import SwiftDiagnostics import SwiftExtensions diff --git a/Sources/SourceKitLSP/Swift/DocumentFormatting.swift b/Sources/SourceKitLSP/Swift/DocumentFormatting.swift index cc7bde8a..9f305c1f 100644 --- a/Sources/SourceKitLSP/Swift/DocumentFormatting.swift +++ b/Sources/SourceKitLSP/Swift/DocumentFormatting.swift @@ -13,8 +13,8 @@ #if compiler(>=6) import Foundation package import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftParser import SwiftSyntax import TSCExtensions @@ -25,8 +25,8 @@ import func TSCBasic.withTemporaryFile #else import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftParser import SwiftSyntax import TSCExtensions diff --git a/Sources/SourceKitLSP/Swift/SwiftLanguageService.swift b/Sources/SourceKitLSP/Swift/SwiftLanguageService.swift index f061a268..da1f2bb8 100644 --- a/Sources/SourceKitLSP/Swift/SwiftLanguageService.swift +++ b/Sources/SourceKitLSP/Swift/SwiftLanguageService.swift @@ -17,9 +17,9 @@ import Dispatch import Foundation import IndexStoreDB package import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging package import SKOptions -import SKSupport import SKUtilities import SemanticIndex package import SourceKitD @@ -37,9 +37,9 @@ import Dispatch import Foundation import IndexStoreDB import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging import SKOptions -import SKSupport import SKUtilities import SemanticIndex import SourceKitD diff --git a/Sources/SourceKitLSP/Swift/SyntacticTestIndex.swift b/Sources/SourceKitLSP/Swift/SyntacticTestIndex.swift index 1e25666f..a8c114dc 100644 --- a/Sources/SourceKitLSP/Swift/SyntacticTestIndex.swift +++ b/Sources/SourceKitLSP/Swift/SyntacticTestIndex.swift @@ -12,8 +12,8 @@ import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SwiftExtensions /// Task metadata for `SyntacticTestIndexer.indexingQueue` diff --git a/Sources/SourceKitLSP/TestHooks.swift b/Sources/SourceKitLSP/TestHooks.swift index 33dda31c..15ba6074 100644 --- a/Sources/SourceKitLSP/TestHooks.swift +++ b/Sources/SourceKitLSP/TestHooks.swift @@ -14,7 +14,7 @@ package import BuildSystemIntegration import Foundation package import LanguageServerProtocol -import SKSupport +import LanguageServerProtocolExtensions package import SemanticIndex import struct TSCBasic.AbsolutePath @@ -23,7 +23,7 @@ import struct TSCBasic.RelativePath import BuildSystemIntegration import Foundation import LanguageServerProtocol -import SKSupport +import LanguageServerProtocolExtensions import SemanticIndex import struct TSCBasic.AbsolutePath diff --git a/Sources/SourceKitLSP/Workspace.swift b/Sources/SourceKitLSP/Workspace.swift index 1e222d16..c10b7956 100644 --- a/Sources/SourceKitLSP/Workspace.swift +++ b/Sources/SourceKitLSP/Workspace.swift @@ -16,9 +16,9 @@ package import BuildSystemIntegration import Foundation import IndexStoreDB package import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging package import SKOptions -import SKSupport package import SemanticIndex import SwiftExtensions import ToolchainRegistry @@ -32,9 +32,9 @@ import BuildSystemIntegration import Foundation import IndexStoreDB import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging import SKOptions -import SKSupport import SemanticIndex import SwiftExtensions import ToolchainRegistry diff --git a/Sources/ToolchainRegistry/CMakeLists.txt b/Sources/ToolchainRegistry/CMakeLists.txt index 8ca72f0d..b346b3ac 100644 --- a/Sources/ToolchainRegistry/CMakeLists.txt +++ b/Sources/ToolchainRegistry/CMakeLists.txt @@ -6,8 +6,8 @@ add_library(ToolchainRegistry STATIC set_target_properties(ToolchainRegistry PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY}) target_link_libraries(ToolchainRegistry PUBLIC +LanguageServerProtocolExtensions SKLogging - SKSupport SwiftExtensions PackageModel TSCBasic) diff --git a/Sources/ToolchainRegistry/ToolchainRegistry.swift b/Sources/ToolchainRegistry/ToolchainRegistry.swift index 4b14eb2f..2c55162e 100644 --- a/Sources/ToolchainRegistry/ToolchainRegistry.swift +++ b/Sources/ToolchainRegistry/ToolchainRegistry.swift @@ -12,7 +12,7 @@ import Dispatch import Foundation -import SKSupport +import LanguageServerProtocolExtensions import TSCExtensions #if compiler(>=6) diff --git a/Sources/ToolchainRegistry/XCToolchainPlist.swift b/Sources/ToolchainRegistry/XCToolchainPlist.swift index d133deb2..8d712a74 100644 --- a/Sources/ToolchainRegistry/XCToolchainPlist.swift +++ b/Sources/ToolchainRegistry/XCToolchainPlist.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Foundation -import SKSupport +import LanguageServerProtocolExtensions import TSCExtensions import struct TSCBasic.AbsolutePath diff --git a/Sources/sourcekit-lsp/CMakeLists.txt b/Sources/sourcekit-lsp/CMakeLists.txt index 344104e8..e734e738 100644 --- a/Sources/sourcekit-lsp/CMakeLists.txt +++ b/Sources/sourcekit-lsp/CMakeLists.txt @@ -5,10 +5,10 @@ target_link_libraries(sourcekit-lsp PRIVATE BuildSystemIntegration Diagnose LanguageServerProtocol + LanguageServerProtocolExtensions LanguageServerProtocolJSONRPC SemanticIndex SKOptions - SKSupport SourceKitLSP ToolchainRegistry ArgumentParser diff --git a/Sources/sourcekit-lsp/SourceKitLSP.swift b/Sources/sourcekit-lsp/SourceKitLSP.swift index 9d41a0f3..e3e1d2d9 100644 --- a/Sources/sourcekit-lsp/SourceKitLSP.swift +++ b/Sources/sourcekit-lsp/SourceKitLSP.swift @@ -18,10 +18,10 @@ import Diagnose import Dispatch import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import LanguageServerProtocolJSONRPC import SKLogging import SKOptions -import SKSupport import SourceKitLSP import SwiftExtensions import ToolchainRegistry @@ -41,10 +41,10 @@ import Diagnose import Dispatch import Foundation import LanguageServerProtocol +import LanguageServerProtocolExtensions import LanguageServerProtocolJSONRPC import SKLogging import SKOptions -import SKSupport import SourceKitLSP import SwiftExtensions import ToolchainRegistry diff --git a/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift b/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift index 787b872c..fbc667e9 100644 --- a/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift +++ b/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift @@ -14,7 +14,7 @@ import BuildServerProtocol import BuildSystemIntegration import Foundation import LanguageServerProtocol -import SKSupport +import LanguageServerProtocolExtensions import SKTestSupport import TSCBasic import XCTest diff --git a/Tests/BuildSystemIntegrationTests/BuildSystemManagerTests.swift b/Tests/BuildSystemIntegrationTests/BuildSystemManagerTests.swift index 28e1f7d4..39156dc3 100644 --- a/Tests/BuildSystemIntegrationTests/BuildSystemManagerTests.swift +++ b/Tests/BuildSystemIntegrationTests/BuildSystemManagerTests.swift @@ -13,9 +13,9 @@ import BuildServerProtocol @_spi(Testing) import BuildSystemIntegration import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging import SKOptions -import SKSupport import SKTestSupport import TSCBasic import ToolchainRegistry diff --git a/Tests/BuildSystemIntegrationTests/CompilationDatabaseTests.swift b/Tests/BuildSystemIntegrationTests/CompilationDatabaseTests.swift index 07b587af..8891ab23 100644 --- a/Tests/BuildSystemIntegrationTests/CompilationDatabaseTests.swift +++ b/Tests/BuildSystemIntegrationTests/CompilationDatabaseTests.swift @@ -13,7 +13,7 @@ import BuildServerProtocol import BuildSystemIntegration import LanguageServerProtocol -import SKSupport +import LanguageServerProtocolExtensions import SKTestSupport import SwiftExtensions import TSCBasic diff --git a/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift b/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift index 44567916..0294ee7c 100644 --- a/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift +++ b/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift @@ -14,7 +14,7 @@ import BuildServerProtocol import BuildSystemIntegration import Foundation import LanguageServerProtocol -import SKSupport +import LanguageServerProtocolExtensions import SKTestSupport import TSCBasic import XCTest diff --git a/Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift b/Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift index a6e84e65..d075558c 100644 --- a/Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift +++ b/Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift @@ -14,9 +14,9 @@ import Build import BuildServerProtocol @_spi(Testing) import BuildSystemIntegration import LanguageServerProtocol +import LanguageServerProtocolExtensions import PackageModel import SKOptions -import SKSupport import SKTestSupport import SourceKitLSP import SwiftExtensions diff --git a/Tests/SourceKitDTests/CrashRecoveryTests.swift b/Tests/SourceKitDTests/CrashRecoveryTests.swift index 17d798d5..9916efea 100644 --- a/Tests/SourceKitDTests/CrashRecoveryTests.swift +++ b/Tests/SourceKitDTests/CrashRecoveryTests.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKLogging -import SKSupport import SKTestSupport import SourceKitD @_spi(Testing) import SourceKitLSP diff --git a/Tests/SourceKitDTests/SourceKitDRegistryTests.swift b/Tests/SourceKitDTests/SourceKitDRegistryTests.swift index ec7a6a04..4108a448 100644 --- a/Tests/SourceKitDTests/SourceKitDRegistryTests.swift +++ b/Tests/SourceKitDTests/SourceKitDRegistryTests.swift @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// import Csourcekitd -import SKSupport +import LanguageServerProtocolExtensions import SKTestSupport import SourceKitD import SwiftExtensions diff --git a/Tests/SourceKitDTests/SourceKitDTests.swift b/Tests/SourceKitDTests/SourceKitDTests.swift index 36b045ba..8ab93229 100644 --- a/Tests/SourceKitDTests/SourceKitDTests.swift +++ b/Tests/SourceKitDTests/SourceKitDTests.swift @@ -13,7 +13,7 @@ import Csourcekitd import Foundation import LanguageServerProtocol -import SKSupport +import LanguageServerProtocolExtensions import SKTestSupport import SourceKitD import TSCBasic diff --git a/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift b/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift index 23d851f7..5eea4158 100644 --- a/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift +++ b/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift @@ -12,8 +12,8 @@ import BuildSystemIntegration import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKOptions -import SKSupport import SKTestSupport import SemanticIndex import SourceKitLSP diff --git a/Tests/SourceKitLSPTests/BuildSystemTests.swift b/Tests/SourceKitLSPTests/BuildSystemTests.swift index 8eb8ea52..da8f6dd7 100644 --- a/Tests/SourceKitLSPTests/BuildSystemTests.swift +++ b/Tests/SourceKitLSPTests/BuildSystemTests.swift @@ -13,8 +13,8 @@ import BuildServerProtocol @_spi(Testing) import BuildSystemIntegration import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKOptions -import SKSupport import SKTestSupport @_spi(Testing) import SemanticIndex @_spi(Testing) import SourceKitLSP diff --git a/Tests/SourceKitLSPTests/LifecycleTests.swift b/Tests/SourceKitLSPTests/LifecycleTests.swift index b33c464e..956dfdf6 100644 --- a/Tests/SourceKitLSPTests/LifecycleTests.swift +++ b/Tests/SourceKitLSPTests/LifecycleTests.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import LanguageServerProtocol +import LanguageServerProtocolExtensions import SKOptions -import SKSupport import SKTestSupport import XCTest diff --git a/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift b/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift index 597d90a5..176945de 100644 --- a/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift +++ b/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift @@ -12,9 +12,9 @@ import BuildSystemIntegration import LanguageServerProtocol +import LanguageServerProtocolExtensions import LanguageServerProtocolJSONRPC import SKLogging -import SKSupport import SKTestSupport import SemanticIndex import SourceKitLSP diff --git a/Tests/TSCExtensionsTests/ByteStringTests.swift b/Tests/TSCExtensionsTests/ByteStringTests.swift index b08f3435..14047a50 100644 --- a/Tests/TSCExtensionsTests/ByteStringTests.swift +++ b/Tests/TSCExtensionsTests/ByteStringTests.swift @@ -13,8 +13,6 @@ import TSCExtensions import XCTest -// import SKSupport -// import SwiftExtensions import struct TSCBasic.ByteString final class ByteStringTests: XCTestCase {