Skip to content

Interpret the -index-store-path relative to the command’s directory #1888

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
Dec 13, 2024
Merged

Interpret the -index-store-path relative to the command’s directory #1888

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
5 changes: 4 additions & 1 deletion Sources/BuildSystemIntegration/CompilationDatabaseBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ package actor CompilationDatabaseBuildSystem: BuiltInBuildSystem {
let args = command.commandLine
for i in args.indices.reversed() {
if args[i] == "-index-store-path" && i + 1 < args.count {
return URL(fileURLWithPath: args[i + 1])
return URL(
fileURLWithPath: args[i + 1],
relativeTo: URL(fileURLWithPath: command.directory, isDirectory: true)
)
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions Tests/BuildSystemIntegrationTests/CompilationDatabaseTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,25 @@ final class CompilationDatabaseTests: XCTestCase {
)
}
}

func testIndexStorePathRelativeToWorkingDirectory() async throws {
try await checkCompilationDatabaseBuildSystem(
"""
[
{
"file": "a.swift",
"directory": "/a",
"arguments": ["swift", "a.swift", "-index-store-path", "index-store"]
}
]
"""
) { buildSystem in
assertEqual(
try await buildSystem.indexStorePath?.filePath,
"\(pathSeparator)a\(pathSeparator)index-store"
)
}
}
}

fileprivate var pathSeparator: String {
Expand Down