Rename SwiftPMWorkspace to SwiftPMBuildSystem

All other types that conform to `BuildSystem` (which in sourcekit-lsp terms is something that can provide compiler arguments) had the `BuildSystem` suffix. `SwiftPMWorkspace` was an oddity here and was easily confused with the `Workspace` term in LSP, which essentially represents a single root folder that is being opened.

Author: ahoppen

Sources/SKSwiftPMWorkspace/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 add_library(SKSwiftPMWorkspace STATIC
-  SwiftPMWorkspace.swift)
+  SwiftPMBuildSystem.swift)
 set_target_properties(SKSwiftPMWorkspace PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 target_link_libraries(SKSwiftPMWorkspace PRIVATE

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

@@ -63,7 +63,7 @@ private func getDefaultToolchain(_ toolchainRegistry: ToolchainRegistry) async -
 /// This class implements the `BuildSystem` interface to provide the build settings for a Swift
 /// Package Manager (SwiftPM) package. The settings are determined by loading the Package.swift
 /// manifest using `libSwiftPM` and constructing a build plan using the default (debug) parameters.
-public actor SwiftPMWorkspace {
+public actor SwiftPMBuildSystem {
 
   public enum Error: Swift.Error {
 
@@ -197,7 +197,7 @@ public actor SwiftPMWorkspace {
   }
 }
 
-extension SwiftPMWorkspace {
+extension SwiftPMBuildSystem {
 
   /// (Re-)load the package settings by parsing the manifest and resolving all the targets and
   /// dependencies.
@@ -270,7 +270,7 @@ extension SwiftPMWorkspace {
   }
 }
 
-extension SwiftPMWorkspace: SKCore.BuildSystem {
+extension SwiftPMBuildSystem: SKCore.BuildSystem {
 
   public var buildPath: TSCAbsolutePath {
     return TSCAbsolutePath(buildParameters.buildPath)
@@ -382,7 +382,7 @@ extension SwiftPMWorkspace: SKCore.BuildSystem {
   }
 }
 
-extension SwiftPMWorkspace {
+extension SwiftPMBuildSystem {
 
   // MARK: Implementation details
 

Sources/SourceKitLSP/Workspace.swift

@@ -111,41 +111,41 @@ public final class Workspace {
   ) async throws {
     var buildSystem: BuildSystem? = nil
 
-    func buildSwiftPMWorkspace(rootUrl: URL) async -> SwiftPMWorkspace? {
-      return await SwiftPMWorkspace(
+    func createSwiftPMBuildSystem(rootUrl: URL) async -> SwiftPMBuildSystem? {
+      return await SwiftPMBuildSystem(
         url: rootUrl,
         toolchainRegistry: toolchainRegistry,
         buildSetup: buildSetup,
         reloadPackageStatusCallback: reloadPackageStatusCallback
       )
     }
 
-    func buildCompDBWorkspace(rootPath: AbsolutePath) -> CompilationDatabaseBuildSystem? {
+    func createCompilationDatabaseBuildSystem(rootPath: AbsolutePath) -> CompilationDatabaseBuildSystem? {
       return CompilationDatabaseBuildSystem(
         projectRoot: rootPath,
         searchPaths: compilationDatabaseSearchPaths
       )
     }
 
-    func buildBuildServerWorkspace(rootPath: AbsolutePath) async -> BuildServerBuildSystem? {
+    func createBuildServerBuildSystem(rootPath: AbsolutePath) async -> BuildServerBuildSystem? {
       return await BuildServerBuildSystem(projectRoot: rootPath, buildSetup: buildSetup)
     }
 
     if let rootUrl = rootUri.fileURL, let rootPath = try? AbsolutePath(validating: rootUrl.path) {
       let defaultBuildSystem: BuildSystem? =
         switch buildSetup.defaultWorkspaceType {
-        case .buildServer: await buildBuildServerWorkspace(rootPath: rootPath)
-        case .compilationDatabase: buildCompDBWorkspace(rootPath: rootPath)
-        case .swiftPM: await buildSwiftPMWorkspace(rootUrl: rootUrl)
+        case .buildServer: await createBuildServerBuildSystem(rootPath: rootPath)
+        case .compilationDatabase: createCompilationDatabaseBuildSystem(rootPath: rootPath)
+        case .swiftPM: await createSwiftPMBuildSystem(rootUrl: rootUrl)
         case nil: nil
         }
       if let defaultBuildSystem {
         buildSystem = defaultBuildSystem
-      } else if let buildServer = await buildBuildServerWorkspace(rootPath: rootPath) {
+      } else if let buildServer = await createBuildServerBuildSystem(rootPath: rootPath) {
         buildSystem = buildServer
-      } else if let swiftpm = await buildSwiftPMWorkspace(rootUrl: rootUrl) {
+      } else if let swiftpm = await createSwiftPMBuildSystem(rootUrl: rootUrl) {
         buildSystem = swiftpm
-      } else if let compdb = buildCompDBWorkspace(rootPath: rootPath) {
+      } else if let compdb = createCompilationDatabaseBuildSystem(rootPath: rootPath) {
         buildSystem = compdb
       } else {
         buildSystem = nil