[QoI] Check before trying to emit fix-it to convert from array to dictionary #9839
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
|
@swift-ci please smoke test |
|
@swift-ci please smoke test Linux platform |
xedin
changed the title
|
@swift-ci please smoke test |
rudkx
approved these changes
May 22, 2017
| return ["a", 0, "one", 1, "two", 2, "three", 3] | ||
| // expected-error@-1 {{contextual type '[String : Any]' cannot be used with array literal}} | ||
| // expected-note@-2 {{did you mean to use a dictionary literal instead?}} {{14-15=:}} {{24-25=:}} {{34-35=:}} {{46-47=:}} | ||
| } |
lib/Sema/CSDiag.cpp
Outdated
| // otherwise it might a structural problem with the expression | ||
| // e.g. ["a""b": 1]. | ||
| const auto commaLocs = E->getCommaLocs(); | ||
| if (numElements % 2 == 0 && commaLocs.size() == numElements - 1) { |
There was a problem hiding this comment.
You're already checking that you have an even number of elements above.
…tionary Before trying to replace every other "," with ":" to help convert from array to dictionary, let's first check if it's appropriate e.g. the number of commas matches the number of elements and number of elements in the array is even which constitutes key/value pairs. Resolves: SR-4952.
|
@rudkx Thanks, fixes both notes! |
|
@swift-ci please smoke test and merge |
|
@swift-ci please smoke test Linux platform |
|
Ok one more hopefully lucky try, there is an unrelated problem going on with Linux. |
|
@swift-ci please clean smoke test and merge |
|
@swift-ci please smoke test Linux platform and merge |
|
@swift-ci please smoke test Linux platform |
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.
Before trying to replace every other "," with ":" to help convert
from array to dictionary, let's first check if it's appropriate e.g.
the number of commas matches the number of elements and number of
elements in the array is even which constitutes key/value pairs.
Resolves SR-4952.