Skip to content

Log when absolute compilation DB search paths are skipped #2309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2025
Merged

Log when absolute compilation DB search paths are skipped #2309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Sources/BuildServerIntegration/DetermineBuildServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ private func searchForCompilationDatabaseConfig(
options: SourceKitLSPOptions
) -> BuildServerSpec? {
let searchPaths =
(options.compilationDatabaseOrDefault.searchPaths ?? []).compactMap {
try? RelativePath(validating: $0)
(options.compilationDatabaseOrDefault.searchPaths ?? []).compactMap { searchPath in
orLog("Compilation DB search path") {
try RelativePath(validating: searchPath)
}
} + [
// These default search paths match the behavior of `clangd`
try! RelativePath(validating: "."),
Expand Down
8 changes: 1 addition & 7 deletions Sources/SourceKitLSP/SourceKitLSPServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,13 +912,7 @@ extension SourceKitLSPServer {
logger.log("Cannot open workspace before server is initialized")
throw NoCapabilityRegistryError()
}
let options = SourceKitLSPOptions.merging(
base: self.options,
override: SourceKitLSPOptions(
path: workspaceFolder.fileURL?
.appending(components: ".sourcekit-lsp", "config.json")
)
)

logger.log("Creating workspace at \(workspaceFolder.forLogging)")
logger.logFullObjectInMultipleLogMessages(header: "Workspace options", options.loggingProxy)

Expand Down