[Diagnostics] Refactor diagnoseAmbiguityWithFixes. #29746
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
|
This will conflict with #29734 once merged |
slavapestov
reviewed
Feb 10, 2020
| // TODO(diagnostics): The problem here is that `&` is interpreted as a binary operator, we need to re-think | ||
| // how "missing member" fix is implemented because currently it finds N solutions with multiple fixes. | ||
| takesP1AndP2([Swift.DoesNotExist & P1 & P2]()) // expected-error {{cannot invoke '' with no arguments}} | ||
| takesP1AndP2([Swift.DoesNotExist & P1 & P2]()) // expected-error {{module 'Swift' has no member named 'DoesNotExist'}} |
| @@ -186,7 +186,7 @@ func testMap() { | |||
| } | |||
|
|
|||
| // <rdar://problem/22414757> "UnresolvedDot" "in wrong phase" assertion from verifier | |||
| [].reduce { $0 + $1 } // expected-error {{cannot invoke 'reduce' with an argument list of type '(_)'}} | |||
| [].reduce { $0 + $1 } // expected-error {{missing argument for parameter #1 in call}} | |||
There was a problem hiding this comment.
An argument list of type... what?!
Nice improvement!
…ces between solutions in order to figure out the source of ambiguity.
fixes that appear in all solutions.
the ambiguity diagnostic by combining a few special errors into one.
…all" if the expression is not a function application.
…c parameters
It's done by first retrieving all generic parameters from each solution,
filtering boundings into distrinct set and diagnosing any differences.
For example:
```swift
func foo<T>(_: T, _: T) {}
func bar(x: Int, y: Float) {
foo(x, y)
}
```
xedin
force-pushed
the
ambiguity-with-fixes
branch
from
2278bdc to
4d5c676
Compare
|
@hborla I have left all of your commits intact (expect for changes related to contextual result vs. operator ref), added |
…seConflictingGenericArguments`
|
@swift-ci please smoke test |
| takeTuples((x, y), (x, y)) // expected-error{{cannot convert value of type '(Int, Float)' to expected argument type '(Float, Int)'}} | ||
|
|
||
| takeTuples((x, y), (x, y)) | ||
| // expected-error@-1 {{conflicting arguments to generic parameter 'U' ('Float' vs. 'Int')}} |
|
@swift-ci please smoke 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.
This change refactors
diagnoseAmbiguityWithFixesto have a generalized strategy based on the differences between solutions in order to find the ambiguous overload, or other source of ambiguity. The new strategy will:FixKindand locator.This change also introduces a new method on
CSFixcalleddiagnoseForAmbiguity. This is called when there is no ambiguous overload, but the fix appears in each of the solutions.Resolves: rdar://problem/55605863