Merge main into release/6.2
#2110
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
With upcoming changes to SwiftPM's TraitConfiguration (see #8370), PackageModel needs to be imported using `@preconcurrency`.
…DiagnosticRequestIsCancelled` to fail `testDontReturnEmptyDiagnosticsIfDiagnosticRequestIsCancelled` assumed that cancelling the request cancels the target preparation but that is not true. If we only handle the request cancellation after we started preparing the target, the test would time out. The only reason why we had the target preparation wait in here was to ensure that we cannot finish the request handling before the request cancellation gets handled. We can achieve a similar result by using an example that is hard to typecheck. rdar://148654514
…o not work We were calling `server.handle(notification:)`, which called directly into `SourceKitLSPServer` but request handling is implemented in `QueueBasedMessageHandler.handle(_:)`. Call that to ensure that we actually cancel requests after the test timeout.
Fix a race condition that can cause `testDontReturnEmptyDiagnosticsIfDiagnosticRequestIsCancelled` to fail
Update import on SwiftPM PackageModel for `SwiftPMBuildSystem.swift`
Now that Swift 6.1 has been released, we no longer need to support building SourceKit-LSP using Swift 6.1.
After swiftlang/swift-package-manager#8468, we no longer support wasi-sysroot embedded in the Swift toolchain, so the test no longer makes sense.
…sysroot-test Remove test for default Swift SDK selection for WASI
Require Swift 6.1 to build SourceKit-LSP
Fix issue that caused request cancellation after a timeout in tests to not work
|
@swift-ci Please test |
bnbarham
approved these changes
Apr 11, 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.
No description provided.