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:
@@ -48,6 +48,8 @@ actor LegacyBuildServerBuildSystem: MessageHandler, BuiltInBuildSystem {
|
||||
|
||||
package let projectRoot: URL
|
||||
|
||||
package let configPath: URL
|
||||
|
||||
var fileWatchers: [FileSystemWatcher] = []
|
||||
|
||||
let indexDatabasePath: URL?
|
||||
@@ -63,10 +65,12 @@ actor LegacyBuildServerBuildSystem: MessageHandler, BuiltInBuildSystem {
|
||||
|
||||
init(
|
||||
projectRoot: URL,
|
||||
configPath: URL,
|
||||
initializationData: InitializeBuildResponse,
|
||||
_ externalBuildSystemAdapter: ExternalBuildSystemAdapter
|
||||
) async {
|
||||
self.projectRoot = projectRoot
|
||||
self.configPath = configPath
|
||||
self.indexDatabasePath = nil
|
||||
self.indexStorePath = nil
|
||||
self.connectionToSourceKitLSP = LocalConnection(receiverName: "BuildSystemManager")
|
||||
|
||||
Reference in New Issue
Block a user