averello/sourcekit-lsp
1
0
Fork 0
mirror of https://github.com/apple/sourcekit-lsp.git synced 2026-03-02 18:23:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split build systems for JSON compilation database and fixed compilation database

Browse Source 
I feel like the implementations are actually simpler if we split them. This will also allow us to add more advanced logic to the JSON compilation database build system in the future, such as inferring the toolchain from the compile command.
This commit is contained in:
Alex Hoppen
2025-01-17 14:36:44 -08:00
parent bb699c9a5e
commit 15b9670888
15 changed files with 333 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Sources/BuildSystemIntegration/DetermineBuildSystem.swift
View File

@@ -11,25 +11,56 @@
//===----------------------------------------------------------------------===//
import Foundation
import SKLogging
import SwiftExtensions
import TSCExtensions
import ToolchainRegistry
import struct TSCBasic.AbsolutePath
import struct TSCBasic.RelativePath
#if compiler(>=6)
package import LanguageServerProtocol
import SKLogging
package import SKOptions
import SwiftExtensions
import ToolchainRegistry
import struct TSCBasic.AbsolutePath
#else
import LanguageServerProtocol
import SKLogging
import SKOptions
import SwiftExtensions
import ToolchainRegistry
import struct TSCBasic.AbsolutePath
#endif
private func searchForCompilationDatabaseConfig(
in workspaceFolder: URL,
options: SourceKitLSPOptions
) -> BuildSystemSpec? {
let searchPaths =
(options.compilationDatabaseOrDefault.searchPaths ?? []).compactMap {
try? RelativePath(validating: $0)
} + [
// These default search paths match the behavior of `clangd`
try! RelativePath(validating: "."),
try! RelativePath(validating: "build"),
]
return
searchPaths
.lazy
.compactMap { searchPath in
let path = workspaceFolder.appending(searchPath)
let jsonPath = path.appendingPathComponent(JSONCompilationDatabaseBuildSystem.dbName)
if FileManager.default.isFile(at: jsonPath) {
return BuildSystemSpec(kind: .jsonCompilationDatabase, projectRoot: workspaceFolder, configPath: jsonPath)
}
let fixedPath = path.appendingPathComponent(FixedCompilationDatabaseBuildSystem.dbName)
if FileManager.default.isFile(at: fixedPath) {
return BuildSystemSpec(kind: .fixedCompilationDatabase, projectRoot: workspaceFolder, configPath: fixedPath)
}
return nil
}
.first
}
/// Determine which build system should be started to handle the given workspace folder and at which folder that build
/// system's project root is (see `BuiltInBuildSystem.projectRoot(for:options:)`). `onlyConsiderRoot` controls whether
/// paths outside the root should be considered (eg. configuration files in the user's home directory).
@@ -66,7 +97,7 @@ package func determineBuildSystem(
options: options
)
case .compilationDatabase:
spec = CompilationDatabaseBuildSystem.searchForConfig(in: workspaceFolderUrl, options: options)
spec = searchForCompilationDatabaseConfig(in: workspaceFolderUrl, options: options)
case .swiftPM:
#if canImport(PackageModel)
spec = SwiftPMBuildSystem.searchForConfig(in: workspaceFolderUrl, options: options)