Split SourceKitLSPOptions out of SKCore

ahoppen · ahoppen · commit 6d34d708832c · 2024-07-25T09:11:13.000-07:00
This only leaves build system functionality in SKCore, which allows us to rename SKCore.
diff --git a/Documentation/Modules.md b/Documentation/Modules.md
@@ -71,6 +71,10 @@ This includes:
 
 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.
 
+### SKOptions
+
+Configuration options to change how SourceKit-LSP behaves, based on [Configuration files](Configuration%20File.md).
+
 ### SKSupport
 
 Contains SourceKit-LSP-specific helper functions. These fall into three different categories:
diff --git a/Package.swift b/Package.swift
@@ -28,6 +28,7 @@ let package = Package(
         "LanguageServerProtocol",
         "LanguageServerProtocolJSONRPC",
         "SKCore",
+        "SKOptions",
         "SKSupport",
         "SourceKitLSP",
         "ToolchainRegistry",
@@ -78,6 +79,7 @@ let package = Package(
         "InProcessClient",
         "SKCore",
         "SKLogging",
+        "SKOptions",
         "SKSupport",
         "SourceKitD",
         "SourceKitLSP",
@@ -113,6 +115,7 @@ let package = Package(
         "LanguageServerProtocol",
         "SKCore",
         "SKLogging",
+        "SKOptions",
         "SourceKitLSP",
         "ToolchainRegistry",
       ],
@@ -187,6 +190,7 @@ let package = Package(
         "LanguageServerProtocol",
         "LanguageServerProtocolJSONRPC",
         "SKLogging",
+        "SKOptions",
         "SKSupport",
         "SourceKitD",
         "SwiftExtensions",
@@ -201,6 +205,7 @@ let package = Package(
       name: "SKCoreTests",
       dependencies: [
         "SKCore",
+        "SKOptions",
         "SKTestSupport",
         "ToolchainRegistry",
       ]
@@ -226,6 +231,19 @@ let package = Package(
       ]
     ),
 
+    // MARK: SKOptions
+
+    .target(
+      name: "SKOptions",
+      dependencies: [
+        "LanguageServerProtocol",
+        "SKLogging",
+        "SKSupport",
+        .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
+      ],
+      exclude: ["CMakeLists.txt"]
+    ),
+
     // MARK: SKSupport
 
     .target(
@@ -258,6 +276,7 @@ let package = Package(
         "LanguageServerProtocol",
         "SKCore",
         "SKLogging",
+        "SKOptions",
         "SwiftExtensions",
         "ToolchainRegistry",
         .product(name: "SwiftPM-auto", package: "swift-package-manager"),
@@ -271,6 +290,7 @@ let package = Package(
       dependencies: [
         "LanguageServerProtocol",
         "SKCore",
+        "SKOptions",
         "SKSwiftPMWorkspace",
         "SKTestSupport",
         "SourceKitLSP",
@@ -291,6 +311,7 @@ let package = Package(
         "LanguageServerProtocolJSONRPC",
         "SKCore",
         "SKLogging",
+        "SKOptions",
         "SKSupport",
         "SourceKitLSP",
         "SwiftExtensions",
@@ -336,6 +357,7 @@ let package = Package(
         "SemanticIndex",
         "SKCore",
         "SKLogging",
+        "SKOptions",
         "SKSupport",
         "SKSwiftPMWorkspace",
         "SourceKitD",
@@ -364,6 +386,7 @@ let package = Package(
         "SemanticIndex",
         "SKCore",
         "SKLogging",
+        "SKOptions",
         "SKSupport",
         "SKTestSupport",
         "SourceKitD",
diff --git a/Sources/CMakeLists.txt b/Sources/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(LanguageServerProtocolJSONRPC)
 add_subdirectory(SemanticIndex)
 add_subdirectory(SKCore)
 add_subdirectory(SKLogging)
+add_subdirectory(SKOptions)
 add_subdirectory(SKSupport)
 add_subdirectory(SKSwiftPMWorkspace)
 add_subdirectory(SourceKitLSP)
diff --git a/Sources/Diagnose/CMakeLists.txt b/Sources/Diagnose/CMakeLists.txt
@@ -28,6 +28,7 @@ target_link_libraries(Diagnose PUBLIC
   InProcessClient
   SKCore
   SKLogging
+  SKOptions
   SourceKitD
   SwiftExtensions
   ToolchainRegistry
diff --git a/Sources/Diagnose/IndexCommand.swift b/Sources/Diagnose/IndexCommand.swift
@@ -14,7 +14,7 @@ import ArgumentParser
 import Foundation
 import InProcessClient
 import LanguageServerProtocol
-import SKCore
+import SKOptions
 import SKSupport
 import SourceKitLSP
 import SwiftExtensions
diff --git a/Sources/InProcessClient/CMakeLists.txt b/Sources/InProcessClient/CMakeLists.txt
@@ -9,6 +9,7 @@ target_link_libraries(InProcessClient PUBLIC
   LanguageServerProtocol
   SKCore
   SKLogging
+  SKOptions
   SourceKitLSP
   ToolchainRegistry
 )
diff --git a/Sources/InProcessClient/InProcessSourceKitLSPClient.swift b/Sources/InProcessClient/InProcessSourceKitLSPClient.swift
@@ -12,6 +12,7 @@
 
 import LanguageServerProtocol
 import SKCore
+import SKOptions
 import SKSupport
 import SourceKitLSP
 import ToolchainRegistry
diff --git a/Sources/SKCore/CMakeLists.txt b/Sources/SKCore/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 add_library(SKCore STATIC
-  BuildConfiguration.swift
   BuildServerBuildSystem.swift
   BuildSystem.swift
   BuildSystemDelegate.swift
@@ -12,16 +11,15 @@ add_library(SKCore STATIC
   IndexTaskID.swift
   MainFilesProvider.swift
   PathPrefixMapping.swift
-  SourceKitLSPOptions.swift
-  SplitShellCommand.swift
-  WorkspaceType.swift)
+  SplitShellCommand.swift)
 set_target_properties(SKCore PROPERTIES
   INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
 target_link_libraries(SKCore PUBLIC
   BuildServerProtocol
   LanguageServerProtocol
   LanguageServerProtocolJSONRPC
   SKLogging
+  SKOptions
   SKSupport
   SourceKitD
   SwiftExtensions
diff --git a/Sources/SKCore/FallbackBuildSystem.swift b/Sources/SKCore/FallbackBuildSystem.swift
@@ -14,6 +14,7 @@ import BuildServerProtocol
 import Dispatch
 import Foundation
 import LanguageServerProtocol
+import SKOptions
 import SKSupport
 
 import enum PackageLoading.Platform
diff --git a/Sources/SKOptions/BuildConfiguration.swift b/Sources/SKOptions/BuildConfiguration.swift
diff --git a/Sources/SKOptions/CMakeLists.txt b/Sources/SKOptions/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+add_library(SKOptions STATIC
+  BuildConfiguration.swift
+  SourceKitLSPOptions.swift
+  WorkspaceType.swift)
+set_target_properties(SKOptions PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})
+target_link_libraries(SKOptions PUBLIC
+  LanguageServerProtocol
+  SKLogging
+  SKSupport
+  TSCBasic)
diff --git a/Sources/SKOptions/SourceKitLSPOptions.swift b/Sources/SKOptions/SourceKitLSPOptions.swift
@@ -309,7 +309,7 @@ public struct SourceKitLSPOptions: Sendable, Codable {
   }
 
   public init?(path: URL?) {
-    guard let path, let contents = try? String(contentsOf: path, encoding: .utf8) else {
+    guard let path, let contents = try? Data(contentsOf: path) else {
       return nil
     }
     guard
diff --git a/Sources/SKOptions/WorkspaceType.swift b/Sources/SKOptions/WorkspaceType.swift
diff --git a/Sources/SKSwiftPMWorkspace/CMakeLists.txt b/Sources/SKSwiftPMWorkspace/CMakeLists.txt
@@ -8,6 +8,7 @@ target_link_libraries(SKSwiftPMWorkspace PRIVATE
   LanguageServerProtocol
   SKCore
   SKLogging
+  SKOptions
   SwiftExtensions
   ToolchainRegistry
   TSCBasic)
diff --git a/Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift b/Sources/SKSwiftPMWorkspace/SwiftPMBuildSystem.swift
@@ -21,6 +21,7 @@ import PackageLoading
 import PackageModel
 import SKCore
 import SKLogging
+import SKOptions
 import SKSupport
 import SourceControl
 import SourceKitLSPAPI
diff --git a/Sources/SKTestSupport/IndexedSingleSwiftFileTestProject.swift b/Sources/SKTestSupport/IndexedSingleSwiftFileTestProject.swift
@@ -13,6 +13,7 @@
 import Foundation
 import LanguageServerProtocol
 @_spi(Testing) import SKCore
+import SKOptions
 import SourceKitLSP
 import TSCBasic
 import ToolchainRegistry
diff --git a/Sources/SKTestSupport/MultiFileTestProject.swift b/Sources/SKTestSupport/MultiFileTestProject.swift
@@ -12,7 +12,7 @@
 
 import Foundation
 import LanguageServerProtocol
-import SKCore
+import SKOptions
 import SourceKitLSP
 
 /// The location of a test file within test workspace.
diff --git a/Sources/SKTestSupport/SkipUnless.swift b/Sources/SKTestSupport/SkipUnless.swift
@@ -13,9 +13,7 @@
 import Foundation
 import LanguageServerProtocol
 import RegexBuilder
-@_spi(Testing) import SKCore
 import SKLogging
-import SKTestSupport
 import SourceKitLSP
 import ToolchainRegistry
 import XCTest
diff --git a/Sources/SKTestSupport/SwiftPMTestProject.swift b/Sources/SKTestSupport/SwiftPMTestProject.swift
@@ -12,7 +12,7 @@
 
 import Foundation
 import LanguageServerProtocol
-@_spi(Testing) import SKCore
+import SKOptions
 import SourceKitLSP
 import TSCBasic
 import ToolchainRegistry
diff --git a/Sources/SKTestSupport/TestSourceKitLSPClient.swift b/Sources/SKTestSupport/TestSourceKitLSPClient.swift
@@ -14,9 +14,8 @@ import Foundation
 import InProcessClient
 import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
-@_spi(Testing) import SKCore
+import SKOptions
 import SKSupport
-import SKTestSupport
 import SourceKitLSP
 import SwiftExtensions
 import SwiftSyntax
diff --git a/Sources/SKTestSupport/Utils.swift b/Sources/SKTestSupport/Utils.swift
@@ -12,7 +12,6 @@
 
 import Foundation
 import LanguageServerProtocol
-import SKCore
 import TSCBasic
 
 extension Language {
diff --git a/Sources/SemanticIndex/IndexTaskDescription.swift b/Sources/SemanticIndex/IndexTaskDescription.swift
@@ -10,8 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SKCore
-
 /// Protocol of tasks that are executed on the index task scheduler.
 ///
 /// It is assumed that `IndexTaskDescription` of different types are allowed to execute in parallel.
diff --git a/Sources/SourceKitLSP/CMakeLists.txt b/Sources/SourceKitLSP/CMakeLists.txt
@@ -80,6 +80,7 @@ target_link_libraries(SourceKitLSP PUBLIC
   SemanticIndex
   SKCore
   SKLogging
+  SKOptions
   SKSupport
   SKSwiftPMWorkspace
   SourceKitD
diff --git a/Sources/SourceKitLSP/Clang/ClangLanguageService.swift b/Sources/SourceKitLSP/Clang/ClangLanguageService.swift
@@ -14,6 +14,7 @@ import LanguageServerProtocol
 import LanguageServerProtocolJSONRPC
 import SKCore
 import SKLogging
+import SKOptions
 import SKSupport
 import SwiftExtensions
 import SwiftSyntax
diff --git a/Sources/SourceKitLSP/CreateBuildSystem.swift b/Sources/SourceKitLSP/CreateBuildSystem.swift
@@ -13,6 +13,7 @@
 import LanguageServerProtocol
 import SKCore
 import SKLogging
+import SKOptions
 import SKSwiftPMWorkspace
 import ToolchainRegistry
 
diff --git a/Sources/SourceKitLSP/IndexProgressManager.swift b/Sources/SourceKitLSP/IndexProgressManager.swift
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import SKCore
 import SKLogging
 import SKSupport
 import SemanticIndex
diff --git a/Sources/SourceKitLSP/LanguageService.swift b/Sources/SourceKitLSP/LanguageService.swift
@@ -13,6 +13,7 @@
 import Foundation
 import LanguageServerProtocol
 import SKCore
+import SKOptions
 import SwiftSyntax
 import ToolchainRegistry
 
diff --git a/Sources/SourceKitLSP/SourceKitIndexDelegate.swift b/Sources/SourceKitLSP/SourceKitIndexDelegate.swift
@@ -12,7 +12,6 @@
 
 import Dispatch
 import IndexStoreDB
-import SKCore
 import SKLogging
 import SKSupport
 import SwiftExtensions
diff --git a/Sources/SourceKitLSP/SourceKitLSPServer.swift b/Sources/SourceKitLSP/SourceKitLSPServer.swift
@@ -18,6 +18,7 @@ import LanguageServerProtocol
 import PackageLoading
 import SKCore
 import SKLogging
+import SKOptions
 import SKSupport
 import SKSwiftPMWorkspace
 import SemanticIndex
diff --git a/Sources/SourceKitLSP/Swift/CodeCompletionSession.swift b/Sources/SourceKitLSP/Swift/CodeCompletionSession.swift
@@ -12,8 +12,8 @@
 
 import Dispatch
 import LanguageServerProtocol
-import SKCore
 import SKLogging
+import SKOptions
 import SKSupport
 import SourceKitD
 import SwiftExtensions
diff --git a/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift b/Sources/SourceKitLSP/Swift/DiagnosticReportManager.swift
@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import LanguageServerProtocol
-import SKCore
 import SKLogging
+import SKOptions
 import SKSupport
 import SourceKitD
 import SwiftExtensions
diff --git a/Sources/SourceKitLSP/Swift/SwiftLanguageService.swift b/Sources/SourceKitLSP/Swift/SwiftLanguageService.swift
@@ -16,6 +16,7 @@ import IndexStoreDB
 import LanguageServerProtocol
 import SKCore
 import SKLogging
+import SKOptions
 import SKSupport
 import SemanticIndex
 import SourceKitD
diff --git a/Sources/SourceKitLSP/TestHooks.swift b/Sources/SourceKitLSP/TestHooks.swift
@@ -12,7 +12,6 @@
 
 import Foundation
 import LanguageServerProtocol
-import SKCore
 import SKSupport
 import SKSwiftPMWorkspace
 import SemanticIndex
diff --git a/Sources/SourceKitLSP/Workspace.swift b/Sources/SourceKitLSP/Workspace.swift
@@ -14,6 +14,7 @@ import IndexStoreDB
 import LanguageServerProtocol
 import SKCore
 import SKLogging
+import SKOptions
 import SKSupport
 import SemanticIndex
 import SwiftExtensions
diff --git a/Sources/sourcekit-lsp/CMakeLists.txt b/Sources/sourcekit-lsp/CMakeLists.txt
@@ -7,6 +7,7 @@ target_link_libraries(sourcekit-lsp PRIVATE
   LanguageServerProtocolJSONRPC
   SemanticIndex
   SKCore
+  SKOptions
   SKSupport
   SourceKitLSP
   ToolchainRegistry
diff --git a/Sources/sourcekit-lsp/SourceKitLSP.swift b/Sources/sourcekit-lsp/SourceKitLSP.swift
diff --git a/Tests/DiagnoseTests/DiagnoseTests.swift b/Tests/DiagnoseTests/DiagnoseTests.swift
diff --git a/Tests/SKCoreTests/BuildSystemManagerTests.swift b/Tests/SKCoreTests/BuildSystemManagerTests.swift
diff --git a/Tests/SKCoreTests/FallbackBuildSystemTests.swift b/Tests/SKCoreTests/FallbackBuildSystemTests.swift
diff --git a/Tests/SKSwiftPMWorkspaceTests/SwiftPMBuildSystemTests.swift b/Tests/SKSwiftPMWorkspaceTests/SwiftPMBuildSystemTests.swift
diff --git a/Tests/SourceKitDTests/SourceKitDTests.swift b/Tests/SourceKitDTests/SourceKitDTests.swift
diff --git a/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift b/Tests/SourceKitLSPTests/BackgroundIndexingTests.swift
diff --git a/Tests/SourceKitLSPTests/BuildSystemTests.swift b/Tests/SourceKitLSPTests/BuildSystemTests.swift
diff --git a/Tests/SourceKitLSPTests/ExecuteCommandTests.swift b/Tests/SourceKitLSPTests/ExecuteCommandTests.swift
diff --git a/Tests/SourceKitLSPTests/LocalClangTests.swift b/Tests/SourceKitLSPTests/LocalClangTests.swift
diff --git a/Tests/SourceKitLSPTests/LocalSwiftTests.swift b/Tests/SourceKitLSPTests/LocalSwiftTests.swift
diff --git a/Tests/SourceKitLSPTests/MainFilesProviderTests.swift b/Tests/SourceKitLSPTests/MainFilesProviderTests.swift
diff --git a/Tests/SourceKitLSPTests/WorkspaceTests.swift b/Tests/SourceKitLSPTests/WorkspaceTests.swift

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ target_link_libraries(InProcessClient PUBLIC`
`9`	`9`	`LanguageServerProtocol`
`10`	`10`	`SKCore`
`11`	`11`	`SKLogging`
	`12`	`+ SKOptions`
`12`	`13`	`SourceKitLSP`
`13`	`14`	`ToolchainRegistry`
`14`	`15`	`)`