Resolve swiftly when referenced in compile commands #2143
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When the compiler in `compile_commands.json` references a `swift` executable that’s a symlink to `swiftly`, SourceKit-LSP got confused because the `swift` executable doesn’t reside in a real toolchain, causing us to not provide any semantic functionality. When we discover that the `swift` executable reference in compile commands references a `swiftly` executable, use `swiftly use -p` to resolve the binary in the real toolchain and continue operating based on that. Fixes swiftlang#2128 rdar://150301344
|
@swift-ci Please test |
hamishknight
approved these changes
May 9, 2025
bnbarham
approved these changes
May 9, 2025
Comment on lines
+160
to
+163
| if notification.changes.contains(where: { $0.uri.fileURL?.lastPathComponent == ".swift-version" }) { | ||
| await swiftlyResolver.clearCache() | ||
| connectionToSourceKitLSP.send(OnBuildTargetDidChangeNotification(changes: nil)) | ||
| } |
There was a problem hiding this comment.
There would still be the case that the global version changes 🤔. Maybe that's fine though, ie. the answer there is to restart.
There was a problem hiding this comment.
Yes, that’s what I decided as well. There isn’t really a way to notice the global changes apart from polling swiftly, which doesn’t seem like a great solution.
This was referenced May 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the compiler in
compile_commands.jsonreferences aswiftexecutable that’s a symlink toswiftly, SourceKit-LSP got confused because theswiftexecutable doesn’t reside in a real toolchain, causing us to not provide any semantic functionality.When we discover that the
swiftexecutable reference in compile commands references aswiftlyexecutable, useswiftly use -pto resolve the binary in the real toolchain and continue operating based on that.Fixes #2128
rdar://150301344