Merge LSPTestSupport and SKTestSupport

Author: ahoppen

Documentation/Modules.md

@@ -94,7 +94,6 @@ let package = Package(
       name: "DiagnoseTests",
       dependencies: [
         "Diagnose",
-        "LSPTestSupport",
         "SKCore",
         "SKLogging",
         "SKTestSupport",
@@ -128,7 +127,7 @@ let package = Package(
       name: "LanguageServerProtocolTests",
       dependencies: [
         "LanguageServerProtocol",
-        "LSPTestSupport",
+        "SKTestSupport",
       ]
     ),
 
@@ -147,20 +146,7 @@ let package = Package(
       name: "LanguageServerProtocolJSONRPCTests",
       dependencies: [
         "LanguageServerProtocolJSONRPC",
-        "LSPTestSupport",
-      ]
-    ),
-
-    // MARK: LSPTestSupport
-
-    .target(
-      name: "LSPTestSupport",
-      dependencies: [
-        "InProcessClient",
-        "LanguageServerProtocol",
-        "LanguageServerProtocolJSONRPC",
-        "SKSupport",
-        "SwiftExtensions",
+        "SKTestSupport",
       ]
     ),
 
@@ -250,7 +236,6 @@ let package = Package(
     .testTarget(
       name: "SKSupportTests",
       dependencies: [
-        "LSPTestSupport",
         "SKSupport",
         "SKTestSupport",
         "SwiftExtensions",
@@ -276,7 +261,6 @@ let package = Package(
     .testTarget(
       name: "SKSwiftPMWorkspaceTests",
       dependencies: [
-        "LSPTestSupport",
         "LanguageServerProtocol",
         "SKCore",
         "SKSwiftPMWorkspace",
@@ -295,9 +279,10 @@ let package = Package(
         "CSKTestSupport",
         "InProcessClient",
         "LanguageServerProtocol",
-        "LSPTestSupport",
+        "LanguageServerProtocolJSONRPC",
         "SKCore",
         "SKLogging",
+        "SKSupport",
         "SourceKitLSP",
         "SwiftExtensions",
         .product(name: "ISDBTestSupport", package: "indexstore-db"),
@@ -364,7 +349,6 @@ let package = Package(
       dependencies: [
         "BuildServerProtocol",
         "LanguageServerProtocol",
-        "LSPTestSupport",
         "SemanticIndex",
         "SKCore",
         "SKLogging",

Package.swift

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import LSPTestSupport
+import SKTestSupport
 import XCTest
 
 /// Runs the body repeatedly once per second until it returns `true`, giving up after `timeout`.

Sources/LSPTestSupport/Assertions.swift renamed to Sources/SKTestSupport/Assertions.swift

@@ -11,11 +11,11 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import LSPTestSupport
 import LanguageServerProtocol
 import RegexBuilder
 @_spi(Testing) import SKCore
 import SKLogging
+import SKTestSupport
 import SourceKitLSP
 import XCTest
 

Sources/LSPTestSupport/CheckCoding.swift renamed to Sources/SKTestSupport/CheckCoding.swift

@@ -12,11 +12,11 @@
 
 import Foundation
 import InProcessClient
-import LSPTestSupport
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 @_spi(Testing) import SKCore
 import SKSupport
+import SKTestSupport
 import SourceKitLSP
 import SwiftExtensions
 import SwiftSyntax