mirror of
https://github.com/apple/sourcekit-lsp.git
synced 2026-03-02 18:23:24 +01:00
Allow workspace options to affect build system search
There were a few places that options only took place *after* determining
a build system, even though we have multiple that impact the search (eg.
`defaultBuildSystem` and `searchPaths`).
Additionally track project root and configuration paths separately, so
that when searching for implicit workspaces we can make sure to skip
creating duplicates.
(cherry picked from commit 0c896696c9)
This commit is contained in:
@@ -27,8 +27,6 @@ import ToolchainRegistry
|
||||
/// Build system to be used for testing BuildSystem and BuildSystemDelegate functionality with SourceKitLSPServer
|
||||
/// and other components.
|
||||
package actor TestBuildSystem: BuiltInBuildSystem {
|
||||
package let projectRoot: URL
|
||||
|
||||
package let fileWatchers: [FileSystemWatcher] = []
|
||||
|
||||
package let indexStorePath: URL? = nil
|
||||
@@ -46,11 +44,7 @@ package actor TestBuildSystem: BuiltInBuildSystem {
|
||||
|
||||
package nonisolated var supportsPreparation: Bool { false }
|
||||
|
||||
package init(
|
||||
projectRoot: URL,
|
||||
connectionToSourceKitLSP: any Connection
|
||||
) {
|
||||
self.projectRoot = projectRoot
|
||||
package init(connectionToSourceKitLSP: any Connection) {
|
||||
self.connectionToSourceKitLSP = connectionToSourceKitLSP
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user