Merge main into release/6.2 #2149
Open
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
…Paths:initialize:)` gets closed if the initializer fails Just something I noticed while looking through code. I am not aware of any issues caused by this. Also relax the `precondition` in `DLHandle.deinit` to a fault. If we do not close a `DLHandle`, that’s a bug but it’s not so bad that we should crash sourcekit-lsp for it.
SwiftPM has added Crypto related functionality to Workspace to support signing of the swift-syntax prebuilts manifest signing. This breaks sourcekit-lsp builds on Windows complaining about SwiftASN1 being missing. Adding a clause here to match the one in SwiftPM's CMakeLists.txt file.
…minate them and use crash recovery to restore behavior This should be a last stop-gap measure in case sourcekitd or clangd get stuck, don’t respond to any requests anymore and don’t honor cancellation either. In that case we can restore SourceKit-LSP behavior by killing them and using the crash recovery logic to restore functionality. rdar://149492159
Ensure the `DLHandle` passed to `SourceKitD.init(dlhandle:path:pluginPaths:initialize:)` gets closed if the initializer fails
Add SwiftASN1 as dep in CMakeLists file
The SwiftPM smoke test still fails to build. I see the SwiftASN1 modules aren't getting added to the include path. Hopefully an explicit dependency will fix that.
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
… have changed Similar to how we send a `workspace/diagnostic/refresh` request to the client when we get new build settings, we need to send a `workspace/semanticTokens/refresh` to the client to reload semantic tokens when builds settings change. This is particularly important so that we reload semantic tokens from real build setting after a SwiftPM package has finished loading (we previously used fallback settings). Fixes swiftlang#2141 rdar://150934682
Add SwiftASN1 as an explicit dependency on BuildSystemIntegration
Resolve swiftly when referenced in compile commands
…-clangd-sourcekitd If sourcekitd or clangd don’t respond to a request for 5 minutes, terminate them and use crash recovery to restore behavior
Send `workspace/semanticTokens/refresh` to client when build settings have changed
|
@swift-ci please test |
…sponsive-clangd-sourcekitd" This change is too risky for 6.2 at this point.
|
@swift-ci please test |
|
@swift-ci please test Windows platform |
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.
No description provided.