This revision was automatically updated to reflect the committed changes. Closed by commit rL329069: [clang-format/ObjC] Do not insert space after opening brace of ObjC dict literal (authored by benhamilton, committed by ). Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D45168?vs=140634&id=140781#toc Repository: rL LLVM https://reviews.llvm.org/D45168 Files: cfe/trunk/lib/Format/TokenAnnotator.cpp cfe/trunk/unittests/Format/FormatTestObjC.cpp Index: cfe/trunk/lib/Format/TokenAnnotator.cpp =================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp +++ cfe/trunk/lib/Format/TokenAnnotator.cpp @@ -2480,6 +2480,9 @@ return false; if (Left.is(TT_TemplateCloser) && Right.is(tok::l_square)) return false; + if (Left.is(tok::l_brace) && Left.endsSequence(TT_DictLiteral, tok::at)) + // Objective-C dictionary literal -> no space after opening brace. + 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. Index: cfe/trunk/unittests/Format/FormatTestObjC.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestObjC.cpp +++ cfe/trunk/unittests/Format/FormatTestObjC.cpp @@ -1021,8 +1021,17 @@ " a12345 = @{a12345 : a12345};\n" "}"); verifyFormat("int Foo() {\n" + " a12345 = @{a12345 : @(a12345)};\n" + "}"); + verifyFormat("int Foo() {\n" " a12345 = @{(Foo *)a12345 : @(a12345)};\n" "}"); + verifyFormat("int Foo() {\n" + " a12345 = @{@(a12345) : a12345};\n" + "}"); + verifyFormat("int Foo() {\n" + " a12345 = @{@(a12345) : @YES};\n" + "}"); Style.SpacesInContainerLiterals = false; verifyFormat("int Foo() {\n" " b12345 = @{b12345: b12345};\n"
Index: cfe/trunk/lib/Format/TokenAnnotator.cpp =================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp +++ cfe/trunk/lib/Format/TokenAnnotator.cpp @@ -2480,6 +2480,9 @@ return false; if (Left.is(TT_TemplateCloser) && Right.is(tok::l_square)) return false; + if (Left.is(tok::l_brace) && Left.endsSequence(TT_DictLiteral, tok::at)) + // Objective-C dictionary literal -> no space after opening brace. + 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. Index: cfe/trunk/unittests/Format/FormatTestObjC.cpp =================================================================== --- cfe/trunk/unittests/Format/FormatTestObjC.cpp +++ cfe/trunk/unittests/Format/FormatTestObjC.cpp @@ -1021,8 +1021,17 @@ " a12345 = @{a12345 : a12345};\n" "}"); verifyFormat("int Foo() {\n" + " a12345 = @{a12345 : @(a12345)};\n" + "}"); + verifyFormat("int Foo() {\n" " a12345 = @{(Foo *)a12345 : @(a12345)};\n" "}"); + verifyFormat("int Foo() {\n" + " a12345 = @{@(a12345) : a12345};\n" + "}"); + verifyFormat("int Foo() {\n" + " a12345 = @{@(a12345) : @YES};\n" + "}"); Style.SpacesInContainerLiterals = false; verifyFormat("int Foo() {\n" " b12345 = @{b12345: b12345};\n"
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits