diff options
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestObjC.cpp | 30 |
2 files changed, 34 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 768c0a6ceae..24494b69826 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -2480,6 +2480,10 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, return false; if (Left.is(TT_TemplateCloser) && Right.is(tok::l_square)) return false; + if (Right.is(tok::r_brace) && Right.MatchingParen && + Right.MatchingParen->endsSequence(TT_DictLiteral, tok::at)) + // Objective-C dictionary literal -> no space before closing brace. + return false; return true; } diff --git a/clang/unittests/Format/FormatTestObjC.cpp b/clang/unittests/Format/FormatTestObjC.cpp index 51443c0f393..2eeaa6947b2 100644 --- a/clang/unittests/Format/FormatTestObjC.cpp +++ b/clang/unittests/Format/FormatTestObjC.cpp @@ -1000,6 +1000,21 @@ TEST_F(FormatTestObjC, ObjCDictLiterals) { " (aaaaaaaa id)aaaaaaaaa : (aaaaaaaa id)aaaaaaaaaaaaaaaaaaaaaaaa,\n" " (aaaaaaaa id)aaaaaaaaaaaaaa : (aaaaaaaa id)aaaaaaaaaaaaaa,\n" "};"); + Style.ColumnLimit = 40; + verifyFormat("int Foo() {\n" + " a12345 = @{a12345 : a12345};\n" + "}"); + verifyFormat("int Foo() {\n" + " a12345 = @{(Foo *)a12345 : @(a12345)};\n" + "}"); + Style.SpacesInContainerLiterals = false; + verifyFormat("int Foo() {\n" + " b12345 = @{b12345: b12345};\n" + "}"); + verifyFormat("int Foo() {\n" + " b12345 = @{(Foo *)b12345: @(b12345)};\n" + "}"); + Style.SpacesInContainerLiterals = true; Style = getGoogleStyle(FormatStyle::LK_ObjC); verifyFormat( @@ -1055,6 +1070,21 @@ TEST_F(FormatTestObjC, ObjCArrayLiterals) { verifyFormat("[someFunction someLooooooooooooongParameter:@[\n" " NSBundle.mainBundle.infoDictionary[@\"a\"]\n" "]];"); + Style.ColumnLimit = 40; + verifyFormat("int Foo() {\n" + " a12345 = @[ a12345, a12345 ];\n" + "}"); + verifyFormat("int Foo() {\n" + " a123 = @[ (Foo *)a12345, @(a12345) ];\n" + "}"); + Style.SpacesInContainerLiterals = false; + verifyFormat("int Foo() {\n" + " b12345 = @[b12345, b12345];\n" + "}"); + verifyFormat("int Foo() {\n" + " b12345 = @[(Foo *)b12345, @(b12345)];\n" + "}"); + Style.SpacesInContainerLiterals = true; Style.ColumnLimit = 20; // We can't break string literals inside NSArray literals // (that raises -Wobjc-string-concatenation). |
