Fix enum member lookup fixits (3.0) #4118
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
Suggest a fix-it for unqualified references to all static members from instance context, not just enum elements. Also, fix a small problem with the fix-it for replacing protocol names with 'Self' inside extension bodies -- we didn't handle nested functions properly.
The problem here is that we would just emit 'invalid pattern' instead of digging deeper, which meant that the fix-it for qualified enum element access wasn't getting inserted for more complex patterns, such as 'case X(let x)'. Unfortunately, in the matching_patterns.swift test, we emit too many diagnostics that are not really useful to figuring out the problem, and the old 'invalid pattern' made more sense. I'll work on some CSDiag tweaks to address this -- I think it makes more sense to dig there than just emit a general 'invalid pattern' diagnostic anyway. Fixes <rdar://problem/27684266>.
Contributor
Author
|
@jrose-apple You already reviewed a larger PR containing these changes on master -- mind doing a quick spot-check on the targeted fix? |
Contributor
Author
|
@swift-ci Please smoke test |
| () | ||
| case (_, var e, 3) +++ (1, 2, 3): // expected-error{{invalid pattern}} | ||
| case (_, var e, 3) +++ (1, 2, 3): | ||
| // expected-error@-1{{binary operator '+++' cannot be applied to operands of type '(_, <<error type>>, Int)' and '(Int, Int, Int)'}} |
Contributor
There was a problem hiding this comment.
My only concern is leaking <<error type>> into user diagnostics.
Contributor
|
Seems all right, save the one comment. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
case foo(let x).