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

Fix merge conflict

Browse Source 
https://github.com/swiftlang/sourcekit-lsp/pull/1824 and https://github.com/swiftlang/sourcekit-lsp/pull/1832 raced.
This commit is contained in:
Alex Hoppen
2024-11-19 15:47:52 -08:00
parent 8d13afa73d
commit 76304db5e2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift
View File

@@ -315,7 +315,10 @@ package actor SwiftPMBuildSystem: BuiltInBuildSystem {
validating: projectRoot.appendingPathComponent(".build").appendingPathComponent("index-build").filePath
)
} else if let scratchDirectory = options.swiftPMOrDefault.scratchPath,
let scratchDirectoryPath = try? AbsolutePath(validating: scratchDirectory, relativeTo: AbsolutePath(projectRoot))
let scratchDirectoryPath = try? AbsolutePath(
validating: scratchDirectory,
relativeTo: AbsolutePath(validating: projectRoot.filePath)
)
{
location.scratchDirectory = scratchDirectoryPath
}