[Parse] Improve diagnostic for deprecated protocol<...> syntax #3631
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
|
This looks great, I think maybe the error message should specify that the syntax ‘is deprecated and not needed here’ rather than implying the construct is useless? |
| .fixItRemove({ProtocolLoc, LAngleLoc}) // remove 'protocol<' | ||
| .fixItRemove(RAngleLoc); // remove '>' | ||
| if (Status.isSuccess()) { | ||
| // Only if we have complete prtocol<...> composition, diagnose deprecated. |
There was a problem hiding this comment.
Small nitpick: typo in this comment
|
@joewillsher Thank you for the message suggestion! I'll do that. |
|
No problem at all, thanks doing this! |
rintaro
force-pushed
the
protocolcomposition-diag
branch
2 times, most recently
from
3ff8610 to
fb11d8d
Compare
|
Updated warning message for single protocol composition: |
| @@ -230,7 +230,7 @@ func test_lambda() { | |||
|
|
|||
| func test_lambda2() { | |||
| { () -> protocol<Int> in | |||
| // expected-warning @-1 {{'protocol<...>' composition syntax is deprecated; join the protocols using '&'}} | |||
| // expected-warning @-1 {{'protocol<...>' composition syntax is deprecated and not needed here}} | |||
There was a problem hiding this comment.
Could you please test the fixit is working here?
* Don't emit deprecated warnings for incomplete protocol<...>.
E.g: `func fn(x: protocol<P) {}`
* Different message for single protocol compostion.
E.g: `typealias MyError = protocol<Error>`
rintaro
force-pushed
the
protocolcomposition-diag
branch
from
fb11d8d to
a160f0f
Compare
|
Thanks all! @swift-ci please test and merge. |
|
@swift-ci Please smoke test |
|
@swift-ci Please test |
|
Tests passed, merging. |
|
Looks great, thank you! |
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.
What's in this pull request?
Don't emit deprecated warnings for incomplete protocol<...>.
Because other error diagnostics are already emitted
Moreover, the current fix-it tries to remove
)afterPDifferent message for single protocol compostion.
Because
"join the protocols using '&'"is not relevant in this caseCC: @DougGregor, @joewillsher
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
A smoke test on macOS does the following:
device standard libraries are not built.
version of these tests are not run.
A smoke test on Linux does the following:
tests are not run.
Validation Testing
Lint Testing
Note: Only members of the Apple organization can trigger swift-ci.