<div dir="ltr">Sorry about the tests. I have increasingly changed towards testing a single formatting option at a time, but never rewrote the rest. I am slightly worried that this change might render some tests useless that are actually important. What do you think of alternatively setting up a "test style" that has LLVM style's old defaults (and keeps them indefinitely)? That way, we can always change production flags without affecting the tests and can be sure that the tests accurately reflect the cases we created them for.</div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Sun, Mar 2, 2014 at 1:37 PM, Chandler Carruth <span dir="ltr"><<a href="mailto:chandlerc@gmail.com" target="_blank">chandlerc@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chandlerc<br>
Date: Sun Mar 2 06:37:31 2014<br>
New Revision: 202637<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=202637&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=202637&view=rev</a><br>
Log:<br>
[C++11] Switch the clang-format LLVM style to use C++11 style braced<br>
init list formatting. This suggestion has now gone into the LLVM coding<br>
standards, and is particularly relevant now that we're using C++11.<br>
<br>
Updated a really ridiculous number of tests to reflect this change.<br>
<br>
Modified:<br>
cfe/trunk/lib/Format/Format.cpp<br>
cfe/trunk/unittests/Format/FormatTest.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/Format.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=202637&r1=202636&r2=202637&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=202637&r1=202636&r2=202637&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/Format.cpp (original)<br>
+++ cfe/trunk/lib/Format/Format.cpp Sun Mar 2 06:37:31 2014<br>
@@ -259,7 +259,7 @@ FormatStyle getLLVMStyle() {<br>
LLVMStyle.ColumnLimit = 80;<br>
LLVMStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = false;<br>
LLVMStyle.ConstructorInitializerIndentWidth = 4;<br>
- LLVMStyle.Cpp11BracedListStyle = false;<br>
+ LLVMStyle.Cpp11BracedListStyle = true;<br>
LLVMStyle.DerivePointerBinding = false;<br>
LLVMStyle.ExperimentalAutoDetectBinPacking = false;<br>
LLVMStyle.IndentCaseLabels = false;<br>
@@ -272,7 +272,7 @@ FormatStyle getLLVMStyle() {<br>
LLVMStyle.ObjCSpaceBeforeProtocolList = true;<br>
LLVMStyle.PointerBindsToType = false;<br>
LLVMStyle.SpacesBeforeTrailingComments = 1;<br>
- LLVMStyle.Standard = FormatStyle::LS_Cpp03;<br>
+ LLVMStyle.Standard = FormatStyle::LS_Cpp11;<br>
LLVMStyle.UseTab = FormatStyle::UT_Never;<br>
LLVMStyle.SpacesInParentheses = false;<br>
LLVMStyle.SpaceInEmptyParentheses = false;<br>
@@ -305,7 +305,6 @@ FormatStyle getGoogleStyle(FormatStyle::<br>
GoogleStyle.AlwaysBreakBeforeMultilineStrings = true;<br>
GoogleStyle.AlwaysBreakTemplateDeclarations = true;<br>
GoogleStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = true;<br>
- GoogleStyle.Cpp11BracedListStyle = true;<br>
GoogleStyle.DerivePointerBinding = true;<br>
GoogleStyle.IndentCaseLabels = true;<br>
GoogleStyle.IndentFunctionDeclarationAfterType = true;<br>
@@ -343,6 +342,7 @@ FormatStyle getChromiumStyle(FormatStyle<br>
FormatStyle getMozillaStyle() {<br>
FormatStyle MozillaStyle = getLLVMStyle();<br>
MozillaStyle.AllowAllParametersOfDeclarationOnNextLine = false;<br>
+ MozillaStyle.Cpp11BracedListStyle = false;<br>
MozillaStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = true;<br>
MozillaStyle.DerivePointerBinding = true;<br>
MozillaStyle.IndentCaseLabels = true;<br>
@@ -350,6 +350,7 @@ FormatStyle getMozillaStyle() {<br>
MozillaStyle.ObjCSpaceBeforeProtocolList = false;<br>
MozillaStyle.PenaltyReturnTypeOnItsOwnLine = 200;<br>
MozillaStyle.PointerBindsToType = true;<br>
+ MozillaStyle.Standard = FormatStyle::LS_Cpp03;<br>
return MozillaStyle;<br>
}<br>
<br>
@@ -360,11 +361,13 @@ FormatStyle getWebKitStyle() {<br>
Style.BreakBeforeBinaryOperators = true;<br>
Style.BreakBeforeBraces = FormatStyle::BS_Stroustrup;<br>
Style.BreakConstructorInitializersBeforeComma = true;<br>
+ Style.Cpp11BracedListStyle = false;<br>
Style.ColumnLimit = 0;<br>
Style.IndentWidth = 4;<br>
Style.NamespaceIndentation = FormatStyle::NI_Inner;<br>
Style.ObjCSpaceAfterProperty = true;<br>
Style.PointerBindsToType = true;<br>
+ Style.Standard = FormatStyle::LS_Cpp03;<br>
return Style;<br>
}<br>
<br>
@@ -373,8 +376,10 @@ FormatStyle getGNUStyle() {<br>
Style.BreakBeforeBinaryOperators = true;<br>
Style.BreakBeforeBraces = FormatStyle::BS_GNU;<br>
Style.BreakBeforeTernaryOperators = true;<br>
+ Style.Cpp11BracedListStyle = false;<br>
Style.ColumnLimit = 79;<br>
Style.SpaceBeforeParens = FormatStyle::SBPO_Always;<br>
+ Style.Standard = FormatStyle::LS_Cpp03;<br>
return Style;<br>
}<br>
<br>
<br>
Modified: cfe/trunk/unittests/Format/FormatTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=202637&r1=202636&r2=202637&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=202637&r1=202636&r2=202637&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)<br>
+++ cfe/trunk/unittests/Format/FormatTest.cpp Sun Mar 2 06:37:31 2014<br>
@@ -108,7 +108,7 @@ TEST_F(FormatTest, FormatsNestedCall) {<br>
}<br>
<br>
TEST_F(FormatTest, NestedNameSpecifiers) {<br>
- verifyFormat("vector< ::Type> v;");<br>
+ verifyFormat("vector<::Type> v;");<br>
verifyFormat("::ns::SomeFunction(::ns::SomeOtherFunction())");<br>
verifyFormat("static constexpr bool Bar = decltype(bar())::value;");<br>
}<br>
@@ -257,7 +257,7 @@ TEST_F(FormatTest, FormatIfWithoutCompou<br>
" f();\n"<br>
"}",<br>
AllowsMergedIf);<br>
- verifyFormat("if (a) { /* Never merge this */\n"<br>
+ verifyFormat("if (a) {/* Never merge this */\n"<br>
" f();\n"<br>
"}",<br>
AllowsMergedIf);<br>
@@ -700,11 +700,10 @@ TEST_F(FormatTest, UnderstandsSingleLine<br>
verifyGoogleFormat("#endif // HEADER_GUARD");<br>
<br>
verifyFormat("const char *test[] = {\n"<br>
- " // A\n"<br>
- " \"aaaa\",\n"<br>
- " // B\n"<br>
- " \"aaaaa\",\n"<br>
- "};");<br>
+ " // A\n"<br>
+ " \"aaaa\",\n"<br>
+ " // B\n"<br>
+ " \"aaaaa\"};");<br>
verifyGoogleFormat(<br>
"aaaaaaaaaaaaaaaaaaaaaaaaaa(\n"<br>
" aaaaaaaaaaaaaaaaaaaaaa); // 81_cols_with_this_comment");<br>
@@ -1327,21 +1326,21 @@ TEST_F(FormatTest, SplitsLongLinesInComm<br>
<br>
TEST_F(FormatTest, CommentsInStaticInitializers) {<br>
EXPECT_EQ(<br>
- "static SomeType type = { aaaaaaaaaaaaaaaaaaaa, /* comment */\n"<br>
- " aaaaaaaaaaaaaaaaaaaa /* comment */,\n"<br>
- " /* comment */ aaaaaaaaaaaaaaaaaaaa,\n"<br>
- " aaaaaaaaaaaaaaaaaaaa, // comment\n"<br>
- " aaaaaaaaaaaaaaaaaaaa };",<br>
+ "static SomeType type = {aaaaaaaaaaaaaaaaaaaa, /* comment */\n"<br>
+ " aaaaaaaaaaaaaaaaaaaa /* comment */,\n"<br>
+ " /* comment */ aaaaaaaaaaaaaaaaaaaa,\n"<br>
+ " aaaaaaaaaaaaaaaaaaaa, // comment\n"<br>
+ " aaaaaaaaaaaaaaaaaaaa};",<br>
format("static SomeType type = { aaaaaaaaaaaaaaaaaaaa , /* comment */\n"<br>
" aaaaaaaaaaaaaaaaaaaa /* comment */ ,\n"<br>
" /* comment */ aaaaaaaaaaaaaaaaaaaa ,\n"<br>
" aaaaaaaaaaaaaaaaaaaa , // comment\n"<br>
" aaaaaaaaaaaaaaaaaaaa };"));<br>
- verifyFormat("static SomeType type = { aaaaaaaaaaa, // comment for aa...\n"<br>
- " bbbbbbbbbbb, ccccccccccc };");<br>
- verifyFormat("static SomeType type = { aaaaaaaaaaa,\n"<br>
- " // comment for bb....\n"<br>
- " bbbbbbbbbbb, ccccccccccc };");<br>
+ verifyFormat("static SomeType type = {aaaaaaaaaaa, // comment for aa...\n"<br>
+ " bbbbbbbbbbb, ccccccccccc};");<br>
+ verifyFormat("static SomeType type = {aaaaaaaaaaa,\n"<br>
+ " // comment for bb....\n"<br>
+ " bbbbbbbbbbb, ccccccccccc};");<br>
verifyGoogleFormat(<br>
"static SomeType type = {aaaaaaaaaaa, // comment for aa...\n"<br>
" bbbbbbbbbbb, ccccccccccc};");<br>
@@ -1349,23 +1348,22 @@ TEST_F(FormatTest, CommentsInStaticIniti<br>
" // comment for bb....\n"<br>
" bbbbbbbbbbb, ccccccccccc};");<br>
<br>
- verifyFormat("S s = { { a, b, c }, // Group #1\n"<br>
- " { d, e, f }, // Group #2\n"<br>
- " { g, h, i } }; // Group #3");<br>
- verifyFormat("S s = { { // Group #1\n"<br>
- " a, b, c },\n"<br>
- " { // Group #2\n"<br>
- " d, e, f },\n"<br>
- " { // Group #3\n"<br>
- " g, h, i } };");<br>
+ verifyFormat("S s = {{a, b, c}, // Group #1\n"<br>
+ " {d, e, f}, // Group #2\n"<br>
+ " {g, h, i}}; // Group #3");<br>
+ verifyFormat("S s = {{// Group #1\n"<br>
+ " a, b, c},\n"<br>
+ " {// Group #2\n"<br>
+ " d, e, f},\n"<br>
+ " {// Group #3\n"<br>
+ " g, h, i}};");<br>
<br>
EXPECT_EQ("S s = {\n"<br>
- " // Some comment\n"<br>
- " a,\n"<br>
+ " // Some comment\n"<br>
+ " a,\n"<br>
"\n"<br>
- " // Comment after empty line\n"<br>
- " b\n"<br>
- "}",<br>
+ " // Comment after empty line\n"<br>
+ " b}",<br>
format("S s = {\n"<br>
" // Some comment\n"<br>
" a,\n"<br>
@@ -1374,12 +1372,11 @@ TEST_F(FormatTest, CommentsInStaticIniti<br>
" b\n"<br>
"}"));<br>
EXPECT_EQ("S s = {\n"<br>
- " /* Some comment */\n"<br>
- " a,\n"<br>
+ " /* Some comment */\n"<br>
+ " a,\n"<br>
"\n"<br>
- " /* Comment after empty line */\n"<br>
- " b\n"<br>
- "}",<br>
+ " /* Comment after empty line */\n"<br>
+ " b}",<br>
format("S s = {\n"<br>
" /* Some comment */\n"<br>
" a,\n"<br>
@@ -1388,10 +1385,9 @@ TEST_F(FormatTest, CommentsInStaticIniti<br>
" b\n"<br>
"}"));<br>
verifyFormat("const uint8_t aaaaaaaaaaaaaaaaaaaaaa[0] = {\n"<br>
- " 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"<br>
- " 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"<br>
- " 0x00, 0x00, 0x00, 0x00 // comment\n"<br>
- "};");<br>
+ " 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"<br>
+ " 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // comment\n"<br>
+ " 0x00, 0x00, 0x00, 0x00}; // comment\n");<br>
}<br>
<br>
TEST_F(FormatTest, IgnoresIf0Contents) {<br>
@@ -1873,86 +1869,74 @@ TEST_F(FormatTest, FormatObjCTryCatch) {<br>
}<br>
<br>
TEST_F(FormatTest, StaticInitializers) {<br>
- verifyFormat("static SomeClass SC = { 1, 'a' };");<br>
+ verifyFormat("static SomeClass SC = {1, 'a'};");<br>
<br>
verifyFormat(<br>
"static SomeClass WithALoooooooooooooooooooongName = {\n"<br>
- " 100000000, \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"\n"<br>
- "};");<br>
+ " 100000000, \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"};");<br>
<br>
// Here, everything other than the "}" would fit on a line.<br>
verifyFormat("static int LooooooooooooooooooooooooongVariable[1] = {\n"<br>
- " 100000000000000000000000\n"<br>
- "};");<br>
- EXPECT_EQ("S s = { a, b };", format("S s = {\n"<br>
- " a,\n"<br>
- "\n"<br>
- " b\n"<br>
- "};"));<br>
+ " 10000000000000000000000000};");<br>
+ EXPECT_EQ("S s = {a, b};", format("S s = {\n"<br>
+ " a,\n"<br>
+ "\n"<br>
+ " b\n"<br>
+ "};"));<br>
<br>
// FIXME: This would fit into the column limit if we'd fit "{ {" on the first<br>
// line. However, the formatting looks a bit off and this probably doesn't<br>
// happen often in practice.<br>
verifyFormat("static int Variable[1] = {\n"<br>
- " { 1000000000000000000000000000000000000 }\n"<br>
- "};",<br>
+ " {1000000000000000000000000000000000000}};",<br>
getLLVMStyleWithColumns(40));<br>
}<br>
<br>
TEST_F(FormatTest, DesignatedInitializers) {<br>
- verifyFormat("const struct A a = { .a = 1, .b = 2 };");<br>
- verifyFormat("const struct A a = { .aaaaaaaaaa = 1,\n"<br>
- " .bbbbbbbbbb = 2,\n"<br>
- " .cccccccccc = 3,\n"<br>
- " .dddddddddd = 4,\n"<br>
- " .eeeeeeeeee = 5 };");<br>
+ verifyFormat("const struct A a = {.a = 1, .b = 2};");<br>
+ verifyFormat("const struct A a = {.aaaaaaaaaa = 1,\n"<br>
+ " .bbbbbbbbbb = 2,\n"<br>
+ " .cccccccccc = 3,\n"<br>
+ " .dddddddddd = 4,\n"<br>
+ " .eeeeeeeeee = 5};");<br>
verifyFormat("const struct Aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaa = {\n"<br>
- " .aaaaaaaaaaaaaaaaaaaaaaaaaaa = 1,\n"<br>
- " .bbbbbbbbbbbbbbbbbbbbbbbbbbb = 2,\n"<br>
- " .ccccccccccccccccccccccccccc = 3,\n"<br>
- " .ddddddddddddddddddddddddddd = 4,\n"<br>
- " .eeeeeeeeeeeeeeeeeeeeeeeeeee = 5\n"<br>
- "};");<br>
+ " .aaaaaaaaaaaaaaaaaaaaaaaaaaa = 1,\n"<br>
+ " .bbbbbbbbbbbbbbbbbbbbbbbbbbb = 2,\n"<br>
+ " .ccccccccccccccccccccccccccc = 3,\n"<br>
+ " .ddddddddddddddddddddddddddd = 4,\n"<br>
+ " .eeeeeeeeeeeeeeeeeeeeeeeeeee = 5};");<br>
<br>
verifyGoogleFormat("const struct A a = {.a = 1, .b = 2};");<br>
}<br>
<br>
TEST_F(FormatTest, NestedStaticInitializers) {<br>
- verifyFormat("static A x = { { {} } };\n");<br>
- verifyFormat("static A x = { { { init1, init2, init3, init4 },\n"<br>
- " { init1, init2, init3, init4 } } };");<br>
+ verifyFormat("static A x = {{{}}};\n");<br>
+ verifyFormat("static A x = {{{init1, init2, init3, init4},\n"<br>
+ " {init1, init2, init3, init4}}};",<br>
+ getLLVMStyleWithColumns(50));<br>
<br>
verifyFormat("somes Status::global_reps[3] = {\n"<br>
- " { kGlobalRef, OK_CODE, NULL, NULL, NULL },\n"<br>
- " { kGlobalRef, CANCELLED_CODE, NULL, NULL, NULL },\n"<br>
- " { kGlobalRef, UNKNOWN_CODE, NULL, NULL, NULL }\n"<br>
- "};");<br>
+ " {kGlobalRef, OK_CODE, NULL, NULL, NULL},\n"<br>
+ " {kGlobalRef, CANCELLED_CODE, NULL, NULL, NULL},\n"<br>
+ " {kGlobalRef, UNKNOWN_CODE, NULL, NULL, NULL}};",<br>
+ getLLVMStyleWithColumns(60));<br>
verifyGoogleFormat("SomeType Status::global_reps[3] = {\n"<br>
" {kGlobalRef, OK_CODE, NULL, NULL, NULL},\n"<br>
" {kGlobalRef, CANCELLED_CODE, NULL, NULL, NULL},\n"<br>
" {kGlobalRef, UNKNOWN_CODE, NULL, NULL, NULL}};");<br>
verifyFormat(<br>
- "CGRect cg_rect = { { rect.fLeft, rect.fTop },\n"<br>
- " { rect.fRight - rect.fLeft, rect.fBottom - rect.fTop"<br>
- " } };");<br>
-<br>
- verifyFormat(<br>
- "SomeArrayOfSomeType a = { { { 1, 2, 3 },\n"<br>
- " { 1, 2, 3 },\n"<br>
- " { 111111111111111111111111111111,\n"<br>
- " 222222222222222222222222222222,\n"<br>
- " 333333333333333333333333333333 },\n"<br>
- " { 1, 2, 3 },\n"<br>
- " { 1, 2, 3 } } };");<br>
- verifyFormat(<br>
- "SomeArrayOfSomeType a = { { { 1, 2, 3 } },\n"<br>
- " { { 1, 2, 3 } },\n"<br>
- " { { 111111111111111111111111111111,\n"<br>
- " 222222222222222222222222222222,\n"<br>
- " 333333333333333333333333333333 } },\n"<br>
- " { { 1, 2, 3 } },\n"<br>
- " { { 1, 2, 3 } } };");<br>
- verifyGoogleFormat(<br>
+ "CGRect cg_rect = {{rect.fLeft, rect.fTop},\n"<br>
+ " {rect.fRight - rect.fLeft, rect.fBottom - rect.fTop}};");<br>
+<br>
+ verifyFormat(<br>
+ "SomeArrayOfSomeType a = {\n"<br>
+ " {{1, 2, 3},\n"<br>
+ " {1, 2, 3},\n"<br>
+ " {111111111111111111111111111111, 222222222222222222222222222222,\n"<br>
+ " 333333333333333333333333333333},\n"<br>
+ " {1, 2, 3},\n"<br>
+ " {1, 2, 3}}};");<br>
+ verifyFormat(<br>
"SomeArrayOfSomeType a = {\n"<br>
" {{1, 2, 3}},\n"<br>
" {{1, 2, 3}},\n"<br>
@@ -1965,10 +1949,10 @@ TEST_F(FormatTest, NestedStaticInitializ<br>
"struct {\n"<br>
" unsigned bit;\n"<br>
" const char *const name;\n"<br>
- "} kBitsToOs[] = { { kOsMac, \"Mac\" },\n"<br>
- " { kOsWin, \"Windows\" },\n"<br>
- " { kOsLinux, \"Linux\" },\n"<br>
- " { kOsCrOS, \"Chrome OS\" } };");<br>
+ "} kBitsToOs[] = {{kOsMac, \"Mac\"},\n"<br>
+ " {kOsWin, \"Windows\"},\n"<br>
+ " {kOsLinux, \"Linux\"},\n"<br>
+ " {kOsCrOS, \"Chrome OS\"}};");<br>
}<br>
<br>
TEST_F(FormatTest, FormatsSmallMacroDefinitionsInSingleLine) {<br>
@@ -2514,7 +2498,7 @@ TEST_F(FormatTest, LayoutNestedBlocks) {<br>
" struct s {\n"<br>
" int i;\n"<br>
" };\n"<br>
- " s kBitsToOs[] = { { 10 } };\n"<br>
+ " s kBitsToOs[] = {{10}};\n"<br>
" for (int i = 0; i < 10; ++i)\n"<br>
" return;\n"<br>
"}");<br>
@@ -4131,7 +4115,7 @@ TEST_F(FormatTest, WrapsAtNestedNameSpec<br>
<br>
TEST_F(FormatTest, UnderstandsTemplateParameters) {<br>
verifyFormat("A<int> a;");<br>
- verifyFormat("A<A<A<int> > > a;");<br>
+ verifyFormat("A<A<A<int>>> a;");<br>
verifyFormat("A<A<A<int, 2>, 3>, 4> a;");<br>
verifyFormat("bool x = a < 1 || 2 > a;");<br>
verifyFormat("bool x = 5 < f<int>();");<br>
@@ -4230,8 +4214,8 @@ TEST_F(FormatTest, UnderstandsUnaryOpera<br>
verifyFormat("#define X -1");<br>
verifyFormat("#define X -kConstant");<br>
<br>
- verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = { -5, +3 };");<br>
- verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = { +5, -3 };");<br>
+ verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = {-5, +3};");<br>
+ verifyFormat("const NSPoint kBrowserFrameViewPatternOffset = {+5, -3};");<br>
<br>
verifyFormat("int a = /* confusing comment */ -1;");<br>
// FIXME: The space after 'i' is wrong, but hopefully, this is a rare case.<br>
@@ -4264,7 +4248,7 @@ TEST_F(FormatTest, UnderstandsOverloaded<br>
verifyFormat("operator void *();");<br>
verifyFormat("operator SomeType<int>();");<br>
verifyFormat("operator SomeType<int, int>();");<br>
- verifyFormat("operator SomeType<SomeType<int> >();");<br>
+ verifyFormat("operator SomeType<SomeType<int>>();");<br>
verifyFormat("void *operator new(std::size_t size);");<br>
verifyFormat("void *operator new[](std::size_t size);");<br>
verifyFormat("void operator delete(void *ptr);");<br>
@@ -4389,9 +4373,8 @@ TEST_F(FormatTest, UnderstandsUsesOfStar<br>
<br>
verifyIndependentOfContext("f(b * /* confusing comment */ ++c);");<br>
verifyFormat(<br>
- "int *MyValues = {\n"<br>
- " *A, // Operator detection might be confused by the '{'\n"<br>
- " *BB // Operator detection might be confused by previous comment\n"<br>
+ "int *MyValues = {*A, // Operator detection might be confused by the '{'\n"<br>
+ " *BB // Operator detection might be confused by previous comment\n"<br>
"};");<br>
<br>
verifyIndependentOfContext("if (int *a = &b)");<br>
@@ -4836,168 +4819,167 @@ TEST_F(FormatTest, IncorrectCodeErrorDet<br>
<br>
TEST_F(FormatTest, LayoutCallsInsideBraceInitializers) {<br>
verifyFormat("int x = {\n"<br>
- " avariable,\n"<br>
- " b(alongervariable)\n"<br>
- "};",<br>
+ " avariable,\n"<br>
+ " b(alongervariable)};",<br>
getLLVMStyleWithColumns(25));<br>
}<br>
<br>
TEST_F(FormatTest, LayoutBraceInitializersInReturnStatement) {<br>
- verifyFormat("return (a)(b) { 1, 2, 3 };");<br>
+ verifyFormat("return (a)(b) {1, 2, 3};");<br>
}<br>
<br>
TEST_F(FormatTest, LayoutCxx11ConstructorBraceInitializers) {<br>
- verifyFormat("vector<int> x{ 1, 2, 3, 4 };");<br>
- verifyFormat("vector<T> x{ {}, {}, {}, {} };");<br>
- verifyFormat("f({ 1, 2 });");<br>
- verifyFormat("auto v = Foo{ 1 };");<br>
- verifyFormat("f({ 1, 2 }, { { 2, 3 }, { 4, 5 } }, c, { d });");<br>
- verifyFormat("Class::Class : member{ 1, 2, 3 } {}");<br>
- verifyFormat("new vector<int>{ 1, 2, 3 };");<br>
- verifyFormat("new int[3]{ 1, 2, 3 };");<br>
- verifyFormat("return { arg1, arg2 };");<br>
- verifyFormat("return { arg1, SomeType{ parameter } };");<br>
- verifyFormat("int count = set<int>{ f(), g(), h() }.size();");<br>
- verifyFormat("new T{ arg1, arg2 };");<br>
- verifyFormat("f(MyMap[{ composite, key }]);");<br>
- verifyFormat("class Class {\n"<br>
- " T member = { arg1, arg2 };\n"<br>
- "};");<br>
- verifyFormat(<br>
- "foo = aaaaaaaaaaa ? vector<int>{ aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
- " aaaaaaaaaaaaaaaaaaaa, aaaaa }\n"<br>
- " : vector<int>{ bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"<br>
- " bbbbbbbbbbbbbbbbbbbb, bbbbb };");<br>
- verifyFormat("DoSomethingWithVector({} /* No data */);");<br>
- verifyFormat("DoSomethingWithVector({ {} /* No data */ }, { { 1, 2 } });");<br>
- verifyFormat(<br>
- "someFunction(OtherParam,\n"<br>
- " BracedList{ // comment 1 (Forcing interesting break)\n"<br>
- " param1, param2,\n"<br>
- " // comment 2\n"<br>
- " param3, param4 });",<br>
- getLLVMStyleWithColumns(75));<br>
- verifyFormat(<br>
- "std::this_thread::sleep_for(\n"<br>
- " std::chrono::nanoseconds{ std::chrono::seconds{ 1 } } / 5);");<br>
- verifyFormat("std::vector<MyValues> aaaaaaaaaaaaaaaaaaa{\n"<br>
- " aaaaaaa, aaaaaaaaaa,\n"<br>
- " aaaaa, aaaaaaaaaaaaaaa,\n"<br>
- " aaa, aaaaaaaaaa,\n"<br>
- " a, aaaaaaaaaaaaaaaaaaaaa,\n"<br>
- " aaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaa,\n"<br>
- " aaaaaaa, a\n"<br>
- "};");<br>
- verifyFormat("vector<int> foo = { ::SomeGlobalFunction() };");<br>
-<br>
- FormatStyle NoSpaces = getLLVMStyle();<br>
- NoSpaces.Cpp11BracedListStyle = true;<br>
- verifyFormat("vector<int> x{1, 2, 3, 4};", NoSpaces);<br>
- verifyFormat("vector<T> x{{}, {}, {}, {}};", NoSpaces);<br>
- verifyFormat("f({1, 2});", NoSpaces);<br>
- verifyFormat("auto v = Foo{-1};", NoSpaces);<br>
- verifyFormat("f({1, 2}, {{2, 3}, {4, 5}}, c, {d});", NoSpaces);<br>
- verifyFormat("Class::Class : member{1, 2, 3} {}", NoSpaces);<br>
- verifyFormat("new vector<int>{1, 2, 3};", NoSpaces);<br>
- verifyFormat("new int[3]{1, 2, 3};", NoSpaces);<br>
- verifyFormat("return {arg1, arg2};", NoSpaces);<br>
- verifyFormat("return {arg1, SomeType{parameter}};", NoSpaces);<br>
- verifyFormat("int count = set<int>{f(), g(), h()}.size();", NoSpaces);<br>
- verifyFormat("new T{arg1, arg2};", NoSpaces);<br>
- verifyFormat("f(MyMap[{composite, key}]);", NoSpaces);<br>
- verifyFormat("class Class {\n"<br>
- " T member = {arg1, arg2};\n"<br>
- "};",<br>
- NoSpaces);<br>
- verifyFormat("vector<int> foo = {::SomeGlobalFunction()};", NoSpaces);<br>
-<br>
- // FIXME: The alignment of these trailing comments might be bad. Then again,<br>
- // this might be utterly useless in real code.<br>
- verifyFormat("Constructor::Constructor()\n"<br>
- " : some_value{ //\n"<br>
- " aaaaaaa //\n"<br>
- " } {}",<br>
- NoSpaces);<br>
-<br>
- // In braced lists, the first comment is always assumed to belong to the<br>
- // first element. Thus, it can be moved to the next or previous line as<br>
- // appropriate.<br>
- EXPECT_EQ("function({// First element:\n"<br>
- " 1,\n"<br>
- " // Second element:\n"<br>
- " 2});",<br>
- format("function({\n"<br>
- " // First element:\n"<br>
- " 1,\n"<br>
- " // Second element:\n"<br>
- " 2});",<br>
- NoSpaces));<br>
- NoSpaces.ColumnLimit = 30;<br>
- EXPECT_EQ(<br>
- "std::vector<int> MyNumbers{\n"<br>
- " // First element:\n"<br>
- " 1,\n"<br>
- " // Second element:\n"<br>
- " 2};",<br>
- format("std::vector<int> MyNumbers{// First element:\n"<br>
- " 1,\n"<br>
- " // Second element:\n"<br>
- " 2};", NoSpaces));<br>
+ verifyFormat("vector<int> x{1, 2, 3, 4};");<br>
+ verifyFormat("vector<T> x{{}, {}, {}, {}};");<br>
+ verifyFormat("f({1, 2});");<br>
+ verifyFormat("auto v = Foo{-1};");<br>
+ verifyFormat("f({1, 2}, {{2, 3}, {4, 5}}, c, {d});");<br>
+ verifyFormat("Class::Class : member{1, 2, 3} {}");<br>
+ verifyFormat("new vector<int>{1, 2, 3};");<br>
+ verifyFormat("new int[3]{1, 2, 3};");<br>
+ verifyFormat("return {arg1, arg2};");<br>
+ verifyFormat("return {arg1, SomeType{parameter}};");<br>
+ verifyFormat("int count = set<int>{f(), g(), h()}.size();");<br>
+ verifyFormat("new T{arg1, arg2};");<br>
+ verifyFormat("f(MyMap[{composite, key}]);");<br>
+ verifyFormat("class Class {\n"<br>
+ " T member = {arg1, arg2};\n"<br>
+ "};");<br>
+ verifyFormat("vector<int> foo = {::SomeGlobalFunction()};");<br>
+<br>
+ // FIXME: The alignment of these trailing comments might be bad. Then again,<br>
+ // this might be utterly useless in real code.<br>
+ verifyFormat("Constructor::Constructor()\n"<br>
+ " : some_value{ //\n"<br>
+ " aaaaaaa //\n"<br>
+ " } {}");<br>
+<br>
+ // In braced lists, the first comment is always assumed to belong to the<br>
+ // first element. Thus, it can be moved to the next or previous line as<br>
+ // appropriate.<br>
+ EXPECT_EQ("function({// First element:\n"<br>
+ " 1,\n"<br>
+ " // Second element:\n"<br>
+ " 2});",<br>
+ format("function({\n"<br>
+ " // First element:\n"<br>
+ " 1,\n"<br>
+ " // Second element:\n"<br>
+ " 2});"));<br>
+ EXPECT_EQ("std::vector<int> MyNumbers{\n"<br>
+ " // First element:\n"<br>
+ " 1,\n"<br>
+ " // Second element:\n"<br>
+ " 2};",<br>
+ format("std::vector<int> MyNumbers{// First element:\n"<br>
+ " 1,\n"<br>
+ " // Second element:\n"<br>
+ " 2};",<br>
+ getLLVMStyleWithColumns(30)));<br>
+<br>
+ FormatStyle ExtraSpaces = getLLVMStyle();<br>
+ ExtraSpaces.Cpp11BracedListStyle = false;<br>
+ ExtraSpaces.ColumnLimit = 75;<br>
+ verifyFormat("vector<int> x{ 1, 2, 3, 4 };", ExtraSpaces);<br>
+ verifyFormat("vector<T> x{ {}, {}, {}, {} };", ExtraSpaces);<br>
+ verifyFormat("f({ 1, 2 });", ExtraSpaces);<br>
+ verifyFormat("auto v = Foo{ 1 };", ExtraSpaces);<br>
+ verifyFormat("f({ 1, 2 }, { { 2, 3 }, { 4, 5 } }, c, { d });", ExtraSpaces);<br>
+ verifyFormat("Class::Class : member{ 1, 2, 3 } {}", ExtraSpaces);<br>
+ verifyFormat("new vector<int>{ 1, 2, 3 };", ExtraSpaces);<br>
+ verifyFormat("new int[3]{ 1, 2, 3 };", ExtraSpaces);<br>
+ verifyFormat("return { arg1, arg2 };", ExtraSpaces);<br>
+ verifyFormat("return { arg1, SomeType{ parameter } };", ExtraSpaces);<br>
+ verifyFormat("int count = set<int>{ f(), g(), h() }.size();", ExtraSpaces);<br>
+ verifyFormat("new T{ arg1, arg2 };", ExtraSpaces);<br>
+ verifyFormat("f(MyMap[{ composite, key }]);", ExtraSpaces);<br>
+ verifyFormat("class Class {\n"<br>
+ " T member = { arg1, arg2 };\n"<br>
+ "};",<br>
+ ExtraSpaces);<br>
+ verifyFormat(<br>
+ "foo = aaaaaaaaaaa ? vector<int>{ aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
+ " aaaaaaaaaaaaaaaaaaaa, aaaaa }\n"<br>
+ " : vector<int>{ bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n"<br>
+ " bbbbbbbbbbbbbbbbbbbb, bbbbb };",<br>
+ ExtraSpaces);<br>
+ verifyFormat("DoSomethingWithVector({} /* No data */);", ExtraSpaces);<br>
+ verifyFormat("DoSomethingWithVector({ {} /* No data */ }, { { 1, 2 } });",<br>
+ ExtraSpaces);<br>
+ verifyFormat(<br>
+ "someFunction(OtherParam,\n"<br>
+ " BracedList{ // comment 1 (Forcing interesting break)\n"<br>
+ " param1, param2,\n"<br>
+ " // comment 2\n"<br>
+ " param3, param4 });",<br>
+ ExtraSpaces);<br>
+ verifyFormat(<br>
+ "std::this_thread::sleep_for(\n"<br>
+ " std::chrono::nanoseconds{ std::chrono::seconds{ 1 } } / 5);",<br>
+ ExtraSpaces);<br>
+ verifyFormat("std::vector<MyValues> aaaaaaaaaaaaaaaaaaa{\n"<br>
+ " aaaaaaa, aaaaaaaaaa,\n"<br>
+ " aaaaa, aaaaaaaaaaaaaaa,\n"<br>
+ " aaa, aaaaaaaaaa,\n"<br>
+ " a, aaaaaaaaaaaaaaaaaaaaa,\n"<br>
+ " aaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaa + aaaaaaaaaaaaaaaaaaa,\n"<br>
+ " aaaaaaa, a\n"<br>
+ "};",<br>
+ ExtraSpaces);<br>
+ verifyFormat("vector<int> foo = { ::SomeGlobalFunction() };", ExtraSpaces);<br>
}<br>
<br>
TEST_F(FormatTest, FormatsBracedListsInColumnLayout) {<br>
- verifyFormat("vector<int> x = { 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777 };");<br>
- verifyFormat("vector<int> x = { 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " // line comment\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555,\n"<br>
- " // line comment\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777 };");<br>
- verifyFormat(<br>
- "vector<int> x = { 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
- " 1, 22, 333, 4444, 55555, 666666, // comment\n"<br>
- " 7777777, 1, 22, 333, 4444, 55555, 666666,\n"<br>
- " 7777777, 1, 22, 333, 4444, 55555, 666666,\n"<br>
- " 7777777, 1, 22, 333, 4444, 55555, 666666,\n"<br>
- " 7777777 };");<br>
+ verifyFormat("vector<int> x = {1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777};");<br>
+ verifyFormat("vector<int> x = {1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " // line comment\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555,\n"<br>
+ " // line comment\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777};");<br>
+ verifyFormat(<br>
+ "vector<int> x = {1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, 7777777,\n"<br>
+ " 1, 22, 333, 4444, 55555, 666666, // comment\n"<br>
+ " 7777777, 1, 22, 333, 4444, 55555, 666666,\n"<br>
+ " 7777777, 1, 22, 333, 4444, 55555, 666666,\n"<br>
+ " 7777777, 1, 22, 333, 4444, 55555, 666666,\n"<br>
+ " 7777777};");<br>
verifyFormat("static const uint16_t CallerSavedRegs64Bittttt[] = {\n"<br>
- " X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,\n"<br>
- " X86::R8, X86::R9, X86::R10, X86::R11, 0\n"<br>
- "};");<br>
- verifyFormat("vector<int> x = { 1, 1, 1, 1,\n"<br>
- " 1, 1, 1, 1 };",<br>
+ " X86::RAX, X86::RDX, X86::RCX, X86::RSI, X86::RDI,\n"<br>
+ " X86::R8, X86::R9, X86::R10, X86::R11, 0};");<br>
+ verifyFormat("vector<int> x = {1, 1, 1, 1,\n"<br>
+ " 1, 1, 1, 1};",<br>
getLLVMStyleWithColumns(39));<br>
- verifyFormat("vector<int> x = { 1, 1, 1, 1,\n"<br>
- " 1, 1, 1, 1 };",<br>
+ verifyFormat("vector<int> x = {1, 1, 1, 1,\n"<br>
+ " 1, 1, 1, 1};",<br>
getLLVMStyleWithColumns(38));<br>
verifyFormat("vector<int> aaaaaaaaaaaaaaaaaaaaaa = {\n"<br>
- " 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1\n"<br>
- "};",<br>
- getLLVMStyleWithColumns(40));<br>
+ " 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};",<br>
+ getLLVMStyleWithColumns(43));<br>
<br>
// Trailing commas.<br>
- verifyFormat("vector<int> x = { 1, 1, 1, 1,\n"<br>
- " 1, 1, 1, 1, };",<br>
+ verifyFormat("vector<int> x = {1, 1, 1, 1,\n"<br>
+ " 1, 1, 1, 1, };",<br>
getLLVMStyleWithColumns(39));<br>
- verifyFormat("vector<int> x = { 1, 1, 1, 1,\n"<br>
- " 1, 1, 1, 1, //\n"<br>
+ verifyFormat("vector<int> x = {1, 1, 1, 1,\n"<br>
+ " 1, 1, 1, 1, //\n"<br>
"};",<br>
getLLVMStyleWithColumns(39));<br>
- verifyFormat("vector<int> x = { 1, 1, 1, 1,\n"<br>
- " 1, 1, 1, 1,\n"<br>
- " /**/ /**/ };",<br>
+ verifyFormat("vector<int> x = {1, 1, 1, 1,\n"<br>
+ " 1, 1, 1, 1,\n"<br>
+ " /**/ /**/};",<br>
getLLVMStyleWithColumns(39));<br>
- verifyFormat("return { { aaaaaaaaaaaaaaaaaaaaa },\n"<br>
- " { aaaaaaaaaaaaaaaaaaa },\n"<br>
- " { aaaaaaaaaaaaaaaaaaaaa },\n"<br>
- " { aaaaaaaaaaaaaaaaa } };",<br>
+ verifyFormat("return {{aaaaaaaaaaaaaaaaaaaaa},\n"<br>
+ " {aaaaaaaaaaaaaaaaaaa},\n"<br>
+ " {aaaaaaaaaaaaaaaaaaaaa},\n"<br>
+ " {aaaaaaaaaaaaaaaaa}};",<br>
getLLVMStyleWithColumns(60));<br>
<br>
// With nested lists, we should either format one item per line or all nested<br>
@@ -5005,18 +4987,17 @@ TEST_F(FormatTest, FormatsBracedListsInC<br>
// FIXME: For some nested lists, we can do better.<br>
verifyFormat(<br>
"SomeStruct my_struct_array = {\n"<br>
- " { aaaaaa, aaaaaaaa, aaaaaaaaaa, aaaaaaaaa, aaaaaaaaa, aaaaaaaaaa,\n"<br>
- " aaaaaaaaaaaaa, aaaaaaa, aaa },\n"<br>
- " { aaa, aaa },\n"<br>
- " { aaa, aaa },\n"<br>
- " { aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaa },\n"<br>
- " { aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
- " aaaaaaaaaaaa, a, aaaaaaaaaa, aaaaaaaaa, aaa },\n"<br>
- "};");<br>
+ " {aaaaaa, aaaaaaaa, aaaaaaaaaa, aaaaaaaaa, aaaaaaaaa, aaaaaaaaaa,\n"<br>
+ " aaaaaaaaaaaaa, aaaaaaa, aaa},\n"<br>
+ " {aaa, aaa},\n"<br>
+ " {aaa, aaa},\n"<br>
+ " {aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaa},\n"<br>
+ " {aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
+ " aaaaaaaaaaaa, a, aaaaaaaaaa, aaaaaaaaa, aaa}};");<br>
<br>
// No column layout should be used here.<br>
- verifyFormat("aaaaaaaaaaaaaaa = { aaaaaaaaaaaaaaaaaaaaaaaaaaa, 0, 0,\n"<br>
- " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb };");<br>
+ verifyFormat("aaaaaaaaaaaaaaa = {aaaaaaaaaaaaaaaaaaaaaaaaaaa, 0, 0,\n"<br>
+ " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb};");<br>
}<br>
<br>
TEST_F(FormatTest, PullTrivialFunctionDefinitionsIntoSingleLine) {<br>
@@ -5110,9 +5091,9 @@ TEST_F(FormatTest, PullTrivialFunctionDe<br>
<br>
TEST_F(FormatTest, UnderstandContextOfRecordTypeKeywords) {<br>
// Elaborate type variable declarations.<br>
- verifyFormat("struct foo a = { bar };\nint n;");<br>
- verifyFormat("class foo a = { bar };\nint n;");<br>
- verifyFormat("union foo a = { bar };\nint n;");<br>
+ verifyFormat("struct foo a = {bar};\nint n;");<br>
+ verifyFormat("class foo a = {bar};\nint n;");<br>
+ verifyFormat("union foo a = {bar};\nint n;");<br>
<br>
// Elaborate types inside function definitions.<br>
verifyFormat("struct foo f() {}\nint n;");<br>
@@ -5378,13 +5359,13 @@ TEST_F(FormatTest, BlockCommentsInMacros<br>
<br>
TEST_F(FormatTest, BlockCommentsAtEndOfLine) {<br>
EXPECT_EQ("a = {\n"<br>
- " 1111 /* */\n"<br>
+ " 1111 /* */\n"<br>
"};",<br>
format("a = {1111 /* */\n"<br>
"};",<br>
getLLVMStyleWithColumns(15)));<br>
EXPECT_EQ("a = {\n"<br>
- " 1111 /* */\n"<br>
+ " 1111 /* */\n"<br>
"};",<br>
format("a = {1111 /* */\n"<br>
"};",<br>
@@ -5392,8 +5373,8 @@ TEST_F(FormatTest, BlockCommentsAtEndOfL<br>
<br>
// FIXME: The formatting is still wrong here.<br>
EXPECT_EQ("a = {\n"<br>
- " 1111 /* a\n"<br>
- " */\n"<br>
+ " 1111 /* a\n"<br>
+ " */\n"<br>
"};",<br>
format("a = {1111 /* a */\n"<br>
"};",<br>
@@ -5974,21 +5955,21 @@ TEST_F(FormatTest, ObjCLiterals) {<br>
TEST_F(FormatTest, ObjCDictLiterals) {<br>
verifyFormat("@{");<br>
verifyFormat("@{}");<br>
- verifyFormat("@{ @\"one\" : @1 }");<br>
- verifyFormat("return @{ @\"one\" : @1 };");<br>
- verifyFormat("@{ @\"one\" : @1, }");<br>
+ verifyFormat("@{@\"one\" : @1}");<br>
+ verifyFormat("return @{@\"one\" : @1;");<br>
+ verifyFormat("@{@\"one\" : @1, }");<br>
<br>
- verifyFormat("@{ @\"one\" : @{ @2 : @1 } }");<br>
- verifyFormat("@{ @\"one\" : @{ @2 : @1 }, }");<br>
+ verifyFormat("@{@\"one\" : @{@2 : @1}}");<br>
+ verifyFormat("@{@\"one\" : @{@2 : @1}, }");<br>
<br>
- verifyFormat("@{ 1 > 2 ? @\"one\" : @\"two\" : 1 > 2 ? @1 : @2 }");<br>
+ verifyFormat("@{1 > 2 ? @\"one\" : @\"two\" : 1 > 2 ? @1 : @2}");<br>
verifyFormat("[self setDict:@{}");<br>
- verifyFormat("[self setDict:@{ @1 : @2 }");<br>
- verifyFormat("NSLog(@\"%@\", @{ @1 : @2, @2 : @3 }[@1]);");<br>
+ verifyFormat("[self setDict:@{@1 : @2}");<br>
+ verifyFormat("NSLog(@\"%@\", @{@1 : @2, @2 : @3}[@1]);");<br>
verifyFormat(<br>
- "NSDictionary *masses = @{ @\"H\" : @1.0078, @\"He\" : @4.0026 };");<br>
+ "NSDictionary *masses = @{@\"H\" : @1.0078, @\"He\" : @4.0026};");<br>
verifyFormat(<br>
- "NSDictionary *settings = @{ AVEncoderKey : @(AVAudioQualityMax) };");<br>
+ "NSDictionary *settings = @{AVEncoderKey : @(AVAudioQualityMax)};");<br>
<br>
verifyFormat(<br>
"NSDictionary *d = @{\n"<br>
@@ -6461,8 +6442,10 @@ TEST_F(FormatTest, SkipsUnknownStringLit<br>
}<br>
<br>
TEST_F(FormatTest, DoesNotTryToParseUDLiteralsInPreCpp11Code) {<br>
+ FormatStyle Style = getLLVMStyle();<br>
+ Style.Standard = FormatStyle::LS_Cpp03;<br>
EXPECT_EQ("#define x(_a) printf(\"foo\" _a);",<br>
- format("#define x(_a) printf(\"foo\"_a);", getLLVMStyle()));<br>
+ format("#define x(_a) printf(\"foo\"_a);", Style));<br>
}<br>
<br>
TEST_F(FormatTest, BreakStringLiteralsBeforeUnbreakableTokenSequence) {<br>
@@ -6560,7 +6543,7 @@ TEST_F(FormatTest, DoNotCreateUnreasonab<br>
verifyFormat("void f() {\n"<br>
" return g() {}\n"<br>
" void h() {}");<br>
- verifyFormat("int a[] = { void forgot_closing_brace() { f();\n"<br>
+ verifyFormat("int a[] = {void forgot_closing_brace() {f();\n"<br>
"g();\n"<br>
"}");<br>
}<br>
@@ -6568,7 +6551,7 @@ TEST_F(FormatTest, DoNotCreateUnreasonab<br>
TEST_F(FormatTest, DoNotPrematurelyEndUnwrappedLineForReturnStatements) {<br>
verifyFormat(<br>
"void f() {\n"<br>
- " return C{ param1, param2 }.SomeCall(param1, param2);\n"<br>
+ " return C{param1, param2}.SomeCall(param1, param2);\n"<br>
"}\n");<br>
}<br>
<br>
@@ -6583,6 +6566,7 @@ TEST_F(FormatTest, FormatsClosingBracesI<br>
TEST_F(FormatTest, ConfigurableIndentWidth) {<br>
FormatStyle EightIndent = getLLVMStyleWithColumns(18);<br>
EightIndent.IndentWidth = 8;<br>
+ EightIndent.ContinuationIndentWidth = 8;<br>
verifyFormat("void f() {\n"<br>
" someFunction();\n"<br>
" if (true) {\n"<br>
@@ -6597,8 +6581,7 @@ TEST_F(FormatTest, ConfigurableIndentWid<br>
EightIndent);<br>
verifyFormat("int x[] = {\n"<br>
" call(),\n"<br>
- " call(),\n"<br>
- "};",<br>
+ " call()};",<br>
EightIndent);<br>
}<br>
<br>
@@ -6712,13 +6695,13 @@ TEST_F(FormatTest, ConfigurableUseOfTab)<br>
Tab));<br>
<br>
Tab.UseTab = FormatStyle::UT_ForIndentation;<br>
- verifyFormat("T t[] = {\n"<br>
- "\taaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
- "\taaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
- "\taaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
- "\taaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
- "\taaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,\n"<br>
- "\taaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"<br>
+ verifyFormat("{\n"<br>
+ "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"<br>
+ "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"<br>
+ "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"<br>
+ "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"<br>
+ "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"<br>
+ "\taaaaaaaaaaaaaaaaaaaaaaaaaaaa();\n"<br>
"};",<br>
Tab);<br>
verifyFormat("enum A {\n"<br>
@@ -7954,10 +7937,10 @@ TEST_F(FormatTest, FormatsLambdas) {<br>
verifyFormat("int c = [&a, &a, a] {\n"<br>
" [=, a, b, &c] { return b++; }();\n"<br>
"}();\n");<br>
- verifyFormat("auto c = { [&a, &a, a] {\n"<br>
+ verifyFormat("auto c = {[&a, &a, a] {\n"<br>
" [=, a, b, &c] { return b++; }();\n"<br>
- "} }\n");<br>
- verifyFormat("auto c = { [&a, &a, a] { [=, a, b, &c] {}(); } }\n");<br>
+ "}}\n");<br>
+ verifyFormat("auto c = {[&a, &a, a] { [=, a, b, &c] {}(); }}\n");<br>
verifyFormat("void f() {\n"<br>
" other(x.begin(), x.end(), [&](int, int) { return 1; });\n"<br>
"}\n");<br>
@@ -7969,11 +7952,11 @@ TEST_F(FormatTest, FormatsLambdas) {<br>
<br>
// Lambdas with return types.<br>
verifyFormat("int c = []()->int { return 2; }();\n");<br>
- verifyFormat("int c = []()->vector<int> { return { 2 }; }();\n");<br>
- verifyFormat("Foo([]()->std::vector<int> { return { 2 }; }());");<br>
+ verifyFormat("int c = []()->vector<int> { return {2}; }();\n");<br>
+ verifyFormat("Foo([]()->std::vector<int> { return {2}; }());");<br>
<br>
// Not lambdas.<br>
- verifyFormat("constexpr char hello[]{ \"hello\" };");<br>
+ verifyFormat("constexpr char hello[]{\"hello\"};");<br>
verifyFormat("double &operator[](int i) { return 0; }\n"<br>
"int i;");<br>
verifyFormat("std::unique_ptr<int[]> foo() {}");<br>
@@ -7990,7 +7973,7 @@ TEST_F(FormatTest, FormatsBlocks) {<br>
// it would ideally look.<br>
verifyFormat("[operation setCompletionBlock:^{ [self onOperationDone]; }];");<br>
verifyFormat("int i = {[operation setCompletionBlock : ^{ [self "<br>
- "onOperationDone]; }] };");<br>
+ "onOperationDone]; }]};");<br>
verifyFormat("[operation setCompletionBlock:^(int *i) { f(); }];");<br>
verifyFormat("int a = [operation block:^int(int *i) { return 1; }];");<br>
verifyFormat("[myObject doSomethingWith:arg1\n"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>