Merge SKSwiftPMWorkspace into BuildSystemIntegration

The SwiftPM build system integration was the only one in its own modules. Merge it into the `BuildSystemIntegration` modules next to eg. the compilation database build system.

Author: ahoppen

Documentation/Modules.md

@@ -10,7 +10,7 @@ FIXME: Add link for BSP and version
 
 ### BuildSystemIntegration
 
-Defines the queries SourceKit-LSP can ask of a a build system, like getting compiler arguments for a file. Finding a target’s dependencies or preparing a target.
+Defines the queries SourceKit-LSP can ask of a build system, like getting compiler arguments for a file, finding a target’s dependencies or preparing a target.
 
 ### CAtomics
 
@@ -48,7 +48,7 @@ Contains the interface with which SourceKit-LSP queries the semantic index, addi
 
 ### SKLogging
 
-Types that are API-compatible with OSLog to allow logging to OSLog when building for Darwin platforms and logging to stderr or files on non-Darwin platforms. This should not be dependent on any LSP specific types and be portable to other packages.
+Types that are API-compatible with OSLog that allow logging to OSLog when building for Apple platforms and logging to stderr or files on non-Apple platforms. This should not be dependent on any LSP specific types and be portable to other packages.
 
 ### SKOptions
 
@@ -61,12 +61,6 @@ Contains SourceKit-LSP-specific helper functions. These fall into three differen
 - Functionality that can only be implemented by combining two lower-level modules that don't have a shared dependency, like `SKLogging` + `LanguageServerProtocol`
 - Types that should be sharable by the different modules that implement SourceKit-LSP but that are not generic enough to fit into `SwiftExtensions`, like `ExperimentalFeatures`.
 
-### SKSwiftPMWorkspace
-
-Implements the `BuildSystem` protocol for Swift packages.
-
-FIXME: Merge this into the BuildSystem module once BuildSystemIntegration is split.
-
 ### SKTestSupport
 
 A collection of utilities useful for writing tests for SourceKit-LSP and which are not specific to a single test module.

Package.swift

@@ -63,6 +63,7 @@ let package = Package(
         "SourceKitD",
         "SwiftExtensions",
         "ToolchainRegistry",
+        .product(name: "SwiftPM-auto", package: "swift-package-manager"),
         .product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
         .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
       ],
@@ -73,8 +74,10 @@ let package = Package(
       name: "BuildSystemIntegrationTests",
       dependencies: [
         "BuildSystemIntegration",
+        "LanguageServerProtocol",
         "SKOptions",
         "SKTestSupport",
+        "SourceKitLSP",
         "ToolchainRegistry",
       ]
     ),
@@ -267,39 +270,6 @@ let package = Package(
       ]
     ),
 
-    // MARK: SKSwiftPMWorkspace
-
-    .target(
-      name: "SKSwiftPMWorkspace",
-      dependencies: [
-        "BuildServerProtocol",
-        "BuildSystemIntegration",
-        "LanguageServerProtocol",
-        "SKLogging",
-        "SKOptions",
-        "SwiftExtensions",
-        "ToolchainRegistry",
-        .product(name: "SwiftPM-auto", package: "swift-package-manager"),
-        .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
-      ],
-      exclude: ["CMakeLists.txt"]
-    ),
-
-    .testTarget(
-      name: "SKSwiftPMWorkspaceTests",
-      dependencies: [
-        "BuildSystemIntegration",
-        "LanguageServerProtocol",
-        "SKOptions",
-        "SKSwiftPMWorkspace",
-        "SKTestSupport",
-        "SourceKitLSP",
-        "ToolchainRegistry",
-        .product(name: "SwiftPM-auto", package: "swift-package-manager"),
-        .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
-      ]
-    ),
-
     // MARK: SKTestSupport
 
     .target(
@@ -359,7 +329,6 @@ let package = Package(
         "SKLogging",
         "SKOptions",
         "SKSupport",
-        "SKSwiftPMWorkspace",
         "SourceKitD",
         "SwiftExtensions",
         "ToolchainRegistry",

Sources/BuildSystemIntegration/CMakeLists.txt

@@ -11,7 +11,8 @@ add_library(BuildSystemIntegration STATIC
   IndexTaskID.swift
   MainFilesProvider.swift
   PathPrefixMapping.swift
-  SplitShellCommand.swift)
+  SplitShellCommand.swift
+  SwiftPMBuildSystem.swift)
 set_target_properties(BuildSystemIntegration PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 target_link_libraries(BuildSystemIntegration PUBLIC
@@ -25,4 +26,6 @@ target_link_libraries(BuildSystemIntegration PUBLIC
   SwiftExtensions
   ToolchainRegistry
   PackageModel
-  TSCBasic)
+  TSCBasic
+  Build
+  SourceKitLSPAPI)

Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift renamed to Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -13,7 +13,6 @@
 import Basics
 import Build
 import BuildServerProtocol
-import BuildSystemIntegration
 import Dispatch
 import Foundation
 import LanguageServerProtocol
@@ -40,7 +39,7 @@ import var TSCBasic.localFileSystem
 import func TSCBasic.resolveSymlinks
 import class ToolchainRegistry.Toolchain
 
-typealias AbsolutePath = Basics.AbsolutePath
+fileprivate typealias AbsolutePath = Basics.AbsolutePath
 
 #if canImport(SPMBuildCore)
 import SPMBuildCore

Sources/CMakeLists.txt

@@ -11,7 +11,6 @@ add_subdirectory(SemanticIndex)
 add_subdirectory(SKLogging)
 add_subdirectory(SKOptions)
 add_subdirectory(SKSupport)
-add_subdirectory(SKSwiftPMWorkspace)
 add_subdirectory(SourceKitLSP)
 add_subdirectory(SourceKitD)
 add_subdirectory(sourcekit-lsp)

Sources/SKSwiftPMWorkspace/CMakeLists.txt

@@ -82,7 +82,6 @@ target_link_libraries(SourceKitLSP PUBLIC
   SKLogging
   SKOptions
   SKSupport
-  SKSwiftPMWorkspace
   SourceKitD
   SwiftExtensions
   ToolchainRegistry

Sources/SourceKitLSP/CMakeLists.txt

@@ -14,7 +14,6 @@ import BuildSystemIntegration
 import LanguageServerProtocol
 import SKLogging
 import SKOptions
-import SKSwiftPMWorkspace
 import ToolchainRegistry
 
 import struct TSCBasic.AbsolutePath

Sources/SourceKitLSP/CreateBuildSystem.swift

@@ -20,7 +20,6 @@ import PackageLoading
 import SKLogging
 import SKOptions
 import SKSupport
-import SKSwiftPMWorkspace
 import SemanticIndex
 import SourceKitD
 import SwiftExtensions

Sources/SourceKitLSP/SourceKitLSPServer.swift

@@ -10,10 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+import BuildSystemIntegration
 import Foundation
 import LanguageServerProtocol
 import SKSupport
-import SKSwiftPMWorkspace
 import SemanticIndex
 
 import struct TSCBasic.AbsolutePath

Sources/SourceKitLSP/TestHooks.swift

@@ -15,7 +15,6 @@ import Build
 import LanguageServerProtocol
 import PackageModel
 import SKOptions
-@_spi(Testing) import SKSwiftPMWorkspace
 import SKTestSupport
 import SourceKitLSP
 import TSCBasic

Tests/SKSwiftPMWorkspaceTests/SwiftPMBuildSystemTests.swift renamed to Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift

@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import LSPTestSupport
 import LanguageServerProtocol
 import SKTestSupport
 import XCTest