[CS] Improve diagnostics when buildPartialBlock is unavailable
#60803
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
Previously we would cache the result of the first query, with any further query of `ResultBuilder::supports` ignoring the `checkAvailability` parameter. Separate out the availability checking such that we compute the information up front, and adjust the result depending on `checkAvailability`.
If `buildBlock` is also unavailable, or the builder itself is unavailable, continue to solve using `buildPartialBlock` to get better diagnostics. This behavior technically differs from what is specified in SE-0348, but only affects the invalid case where no builder methods are available to use. In particular, this improves diagnostics for RegexComponentBuilder when the deployment target is too low. Previously we would try to solve using `buildBlock` (as `buildPartialBlock` is unavailable), but RegexComponentBuilder only defines `buildBlock` for the empty body case, leading to unhelpful diagnostics that ultimately preferred not to use the result builder at all. rdar://97533700
|
@swift-ci please test |
|
@swift-ci please test source compatibility |
rxwei
approved these changes
Aug 26, 2022
xedin
approved these changes
Aug 30, 2022
|
@swift-ci please test |
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.
If
buildBlockis also unavailable, or the builder itself is unavailable, continue to solve usingbuildPartialBlockto get better diagnostics.This behavior technically differs from what is specified in SE-0348, but only affects the invalid case where no builder methods are available to use.
In particular, this improves diagnostics for RegexComponentBuilder when the deployment target is too low. Previously we would try to solve using
buildBlock(asbuildPartialBlockis unavailable), but RegexComponentBuilder only definesbuildBlockfor the empty body case, leading to unhelpful diagnostics that ultimately preferred not to use the result builder at all.rdar://97533700