averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Sema] Allow TreatArrayLiteralAsDictionary fix to handle literals with more than one element

Browse Source
This commit is contained in:
Luciano Almeida
2022-06-05 22:30:08 -03:00
parent 9a0978a5a2
commit c6f00fae98
6 changed files with 110 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Sema/CSDiagnostics.cpp
View File

@@ -920,8 +920,21 @@ bool ArrayLiteralToDictionaryConversionFailure::diagnoseAsError() {
CTP == CTP_Initialization);
auto diagnostic = emitDiagnostic(diag::meant_dictionary_lit);
if (AE->getNumElements() == 1)
const auto numElements = AE->getNumElements();
if (numElements == 1) {
diagnostic.fixItInsertAfter(AE->getElement(0)->getEndLoc(), ": <#value#>");
} else {
// If there is an even number of elements in the array, let's produce
// a fix-it which suggests to replace "," with ":" to form a dictionary
// literal.
if ((numElements & 1) == 0) {
const auto commaLocs = AE->getCommaLocs();
if (commaLocs.size() == numElements - 1) {
for (unsigned i = 0, e = numElements / 2; i != e; ++i)
diagnostic.fixItReplace(commaLocs[i * 2], ":");
}
}
}
return true;
}