This is an archive of the discontinued LLVM Phabricator instance.

Differential D123571

[clang-format] Clean up unit tests for AlignArrayOfStructures
AcceptedPublic

Authored by owenpan on Apr 11 2022, 10:34 PM.

Details

Reviewers
MyDeveloperDay
curdeius
HazardyKnusperkeks
feg208
Summary

As mentioned in D121576#3381295, I'm cleaning up the unit tests in preparation for a redesign of AlignArrayOfStructures to address most of the accumulated issues and to enable alignments of non-rectangular structures.

Diff Detail

Event Timeline

owenpan created this revision.Apr 11 2022, 10:34 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 11 2022, 10:34 PM
owenpan requested review of this revision.Apr 11 2022, 10:34 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 11 2022, 10:34 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B159160: Diff 422124.Apr 11 2022, 11:04 PM
HazardyKnusperkeks accepted this revision.Apr 12 2022, 1:02 PM
This revision is now accepted and ready to land.Apr 12 2022, 1:02 PM
curdeius accepted this revision.Apr 12 2022, 1:16 PM
MyDeveloperDay accepted this revision.Apr 20 2022, 8:47 AM

Thanks for taking this on.

Revision Contents

PathSize
clang/
unittests/
Format/
353 lines

Diff 422124

clang/unittests/Format/FormatTest.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 19,051 Lines • ▼ Show 20 LinesTEST_F(FormatTest, CatchAlignArrayOfStructuresRightAlignment) {
auto Style = getLLVMStyle(); auto Style = getLLVMStyle();
Style.AlignArrayOfStructures = FormatStyle::AIAS_Right; Style.AlignArrayOfStructures = FormatStyle::AIAS_Right;
Style.AlignConsecutiveAssignments.Enabled = true; Style.AlignConsecutiveAssignments.Enabled = true;
Style.AlignConsecutiveDeclarations.Enabled = true; Style.AlignConsecutiveDeclarations.Enabled = true;
verifyFormat("struct test demo[] = {\n" verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"}\n" " { 7, 5, \"!!\"}\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[] = {\n" verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"}, // first line\n" " {56, 23, \"hello\"}, // first line\n"
" {-1, 93463, \"world\"}, // second line\n" " {-1, 93463, \"world\"}, // second line\n"
" { 7, 5, \"!!\"} // third line\n" " { 7, 5, \"!!\"} // third line\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[4] = {\n" verifyFormat("struct test demo[4] = {\n"
" { 56, 23, 21, \"oh\"}, // first line\n" " { 56, 23, 21, \"oh\"}, // first line\n"
" { -1, 93463, 22, \"my\"}, // second line\n" " { -1, 93463, 22, \"my\"}, // second line\n"
" { 7, 5, 1, \"goodness\"} // third line\n" " { 7, 5, 1, \"goodness\"} // third line\n"
" {234, 5, 1, \"gracious\"} // fourth line\n" " {234, 5, 1, \"gracious\"} // fourth line\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[3] = {\n" verifyFormat("struct test demo[3] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"}\n" " { 7, 5, \"!!\"}\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[3] = {\n" verifyFormat("struct test demo[3] = {\n"
" {int{56}, 23, \"hello\"},\n" " {int{56}, 23, \"hello\"},\n"
" {int{-1}, 93463, \"world\"},\n" " {int{-1}, 93463, \"world\"},\n"
" { int{7}, 5, \"!!\"}\n" " { int{7}, 5, \"!!\"}\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[] = {\n" verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"},\n" " { 7, 5, \"!!\"},\n"
"};\n", "};",
Style); Style);
verifyFormat("test demo[] = {\n" verifyFormat("test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"},\n" " { 7, 5, \"!!\"},\n"
"};\n", "};",
Style); Style);
verifyFormat("demo = std::array<struct test, 3>{\n" verifyFormat("demo = std::array<struct test, 3>{\n"
" test{56, 23, \"hello\"},\n" " test{56, 23, \"hello\"},\n"
" test{-1, 93463, \"world\"},\n" " test{-1, 93463, \"world\"},\n"
" test{ 7, 5, \"!!\"},\n" " test{ 7, 5, \"!!\"},\n"
"};\n", "};",
Style); Style);
verifyFormat("test demo[] = {\n" verifyFormat("test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
"#if X\n" "#if X\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
"#endif\n" "#endif\n"
" { 7, 5, \"!!\"}\n" " { 7, 5, \"!!\"}\n"
"};\n", "};",
Style); Style);
// FIXME: Skip AlignArrayOfStructures if any row can't fit on a single line.
#if 0
verifyFormat( verifyFormat(
"test demo[] = {\n" "test demo[] = {{7, 23,\n"
" { 7, 23,\n" " \"hello world i am a long line that really, in any\"\n"
" \"hello world i am a very long line that really, in any\"\n" " \"just world, ought to be split to multiple lines\"},\n"
" \"just world, ought to be split over multiple lines\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" {56, 5, \"!!\"}\n" " {56, 5, \"!!\"}};",
"};\n",
Style); Style);
#endif
verifyFormat("return GradForUnaryCwise(g, {\n" verifyFormat("return f(g, {\n"
" {{\"sign\"}, \"Sign\", " " {{\"sign\"}, \"Sign\", {\"x\", \"dy\"}},\n"
" {\"x\", \"dy\"}},\n" " { {\"dx\"}, \"Mul\", {\"dy\", \"sign\"}},\n"
" { {\"dx\"}, \"Mul\", {\"dy\"" "});",
", \"sign\"}},\n"
"});\n",
Style); Style);
Style.ColumnLimit = 0; Style.ColumnLimit = 0;
EXPECT_EQ( verifyFormat(
"test demo[] = {\n" "test demo[] = {\n"
" {56, 23, \"hello world i am a very long line that really, " " {56, 23, \"hello world i am a very long line that really, "
"in any just world, ought to be split over multiple lines\"},\n" "in any just world, ought to be split over multiple lines\"},\n"
" {-1, 93463, " " {-1, 93463, "
" \"world\"},\n" " \"world\"},\n"
" { 7, 5, " " { 7, 5, "
" \"!!\"},\n" " \"!!\"},\n"
"};", "};",
format("test demo[] = {{56, 23, \"hello world i am a very long line " "test demo[] = {{56, 23, \"hello world i am a very long line "
"that really, in any just world, ought to be split over multiple " "that really, in any just world, ought to be split over multiple "
"lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};", "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
Style)); Style);
Style.ColumnLimit = 80; Style.ColumnLimit = 80;
// FIXME: Skip AlignArrayOfStructures if any row has a non-trailing comment.
#if 0
verifyFormat("test demo[] = {\n" verifyFormat("test demo[] = {\n"
" {56, 23, /* a comment */ \"hello\"},\n" " {56, 23, /* a comment */ \"hello\"}, "
" {-1, 93463, \"world\"},\n" "{-1, 93463, \"world\"}, {7, 5, \"!!\"}};",
" { 7, 5, \"!!\"}\n"
"};\n",
Style); Style);
verifyFormat("test demo[] = {\n" verifyFormat("test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"}, "
" {-1, 93463, \"world\" /* comment here */},\n" "{-1, 93463, \"world\" /* comment here */}, {7, 5, \"!!\"}};",
" { 7, 5, \"!!\"}\n"
"};\n",
Style); Style);
verifyFormat("test demo[] = {\n" verifyFormat("test demo[] = {\n"
" {56, /* a comment */ 23, \"hello\"},\n" " {56, /* a comment */ 23, \"hello\"}, "
" {-1, 93463, \"world\"},\n" "{-1, 93463, \"world\"}, {7, 5, \"!!\"}};",
" { 7, 5, \"!!\"}\n"
"};\n",
Style); Style);
#endif
Style.ColumnLimit = 20; Style.ColumnLimit = 20;
EXPECT_EQ( // FIXME: Skip AlignArrayOfStructures if any row can't fit on a single line.
#if 0
verifyFormat(
"demo = std::array<\n" "demo = std::array<\n"
" struct test, 3>{\n" " struct test, 3>{\n"
" test{\n" " test{\n"
" 56, 23,\n" " 56, 23,\n"
" \"hello \"\n" " \"hello \"\n"
" \"world i \"\n" " \"world i \"\n"
" \"am a very \"\n" " \"am a very \"\n"
" \"long line \"\n" " \"long line \"\n"
" \"that \"\n" " \"that \"\n"
" \"really, \"\n" " \"really, \"\n"
" \"in any \"\n" " \"in any \"\n"
" \"just \"\n" " \"just \"\n"
" \"world, \"\n" " \"world, \"\n"
" \"ought to \"\n" " \"ought to \"\n"
" \"be split \"\n" " \"be split \"\n"
" \"over \"\n" " \"over \"\n"
" \"multiple \"\n" " \"multiple \"\n"
" \"lines\"},\n" " \"lines\"},\n"
" test{-1, 93463,\n" " test{-1, 93463,\n"
" \"world\"},\n" " \"world\"},\n"
" test{ 7, 5,\n" " test{7, 5,\n"
" \"!!\" },\n" " \"!!\"},\n"
"};", "};",
format("demo = std::array<struct test, 3>{test{56, 23, \"hello world " "demo = std::array<struct test, 3>{test{56, 23, \"hello world "
"i am a very long line that really, in any just world, ought " "i am a very long line that really, in any just world, ought "
"to be split over multiple lines\"},test{-1, 93463, \"world\"}," "to be split over multiple lines\"},test{-1, 93463, \"world\"},"
"test{7, 5, \"!!\"},};", "test{7, 5, \"!!\"},};",
Style)); Style);
#endif
// This caused a core dump by enabling Alignment in the LLVMStyle globally // This caused a core dump by enabling Alignment in the LLVMStyle globally
Style = getLLVMStyleWithColumns(50); Style = getLLVMStyleWithColumns(50);
Style.AlignArrayOfStructures = FormatStyle::AIAS_Right; Style.AlignArrayOfStructures = FormatStyle::AIAS_Right;
verifyFormat("static A x = {\n" verifyFormat("static A x = {\n"
" {{init1, init2, init3, init4},\n" " {{init1, init2, init3, init4},\n"
" {init1, init2, init3, init4}}\n" " {init1, init2, init3, init4}}\n"
"};", "};",
Style); Style);
// TODO: Fix the indentations below when this option is fully functional. // TODO: Fix the indentations below when this option is fully functional.
verifyFormat("int a[][] = {\n" verifyFormat("int a[][] = {\n"
" {\n" " {\n"
" {0, 2}, //\n" " {0, 2}, //\n"
" {1, 2} //\n" " {1, 2} //\n"
" }\n" " }\n"
"};", "};",
Style); Style);
verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"}\n"
"};\n"
"static A x = {\n"
" {{init1, init2, init3, init4},\n"
" {init1, init2, init3, init4}}\n"
"};",
Style);
Style.ColumnLimit = 100; Style.ColumnLimit = 100;
EXPECT_EQ( // FIXME: Skip AlignArrayOfStructures if any row can't fit on a single line.
#if 0
verifyFormat(
"test demo[] = {\n" "test demo[] = {\n"
" {56, 23,\n" " {56, 23,\n"
" \"hello world i am a very long line that really, in any just world" " \"hello world i am a very long line that really, in any just world"
", ought to be split over \"\n" ", ought to be split over \"\n"
" \"multiple lines\" },\n" " \"multiple lines\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"},\n" " {7, 5, \"!!\"},\n"
"};", "};",
format("test demo[] = {{56, 23, \"hello world i am a very long line " "test demo[] = {{56, 23, \"hello world i am a very long line "
"that really, in any just world, ought to be split over multiple " "that really, in any just world, ought to be split over multiple "
"lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};", "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
Style));
Style = getLLVMStyleWithColumns(50);
Style.AlignArrayOfStructures = FormatStyle::AIAS_Right;
verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"}\n"
"};\n"
"static A x = {\n"
" {{init1, init2, init3, init4},\n"
" {init1, init2, init3, init4}}\n"
"};",
Style); Style);
Style.ColumnLimit = 100; #endif
Style.AlignConsecutiveAssignments.AcrossComments = true; Style.AlignConsecutiveAssignments.AcrossComments = true;
Style.AlignConsecutiveDeclarations.AcrossComments = true; Style.AlignConsecutiveDeclarations.AcrossComments = true;
verifyFormat("struct test demo[] = {\n" verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" { 7, 5, \"!!\"}\n" " { 7, 5, \"!!\"}\n"
"};\n" "};\n"
"struct test demo[4] = {\n" "struct test demo[4] = {\n"
" { 56, 23, 21, \"oh\"}, // first line\n" " { 56, 23, 21, \"oh\"}, // first line\n"
" { -1, 93463, 22, \"my\"}, // second line\n" " { -1, 93463, 22, \"my\"}, // second line\n"
" { 7, 5, 1, \"goodness\"} // third line\n" " { 7, 5, 1, \"goodness\"} // third line\n"
" {234, 5, 1, \"gracious\"} // fourth line\n" " {234, 5, 1, \"gracious\"} // fourth line\n"
"};\n", "};",
Style); Style);
EXPECT_EQ( // FIXME: Skip AlignArrayOfStructures if any row can't fit on a single line.
#if 0
verifyFormat(
"test demo[] = {\n" "test demo[] = {\n"
" {56,\n" " {56,\n"
" \"hello world i am a very long line that really, in any just world" " \"hello world i am a very long line that really, in any just world"
", ought to be split over \"\n" ", ought to be split over \"\n"
" \"multiple lines\", 23},\n" " \"multiple lines\",\n"
" 23},\n"
" {-1, \"world\", 93463},\n" " {-1, \"world\", 93463},\n"
" { 7, \"!!\", 5},\n" " {7, \"!!\", 5},\n"
"};", "};",
format("test demo[] = {{56, \"hello world i am a very long line " "test demo[] = {{56, \"hello world i am a very long line "
"that really, in any just world, ought to be split over multiple " "that really, in any just world, ought to be split over multiple "
"lines\", 23},{-1, \"world\", 93463},{7, \"!!\", 5},};", "lines\", 23},{-1, \"world\", 93463},{7, \"!!\", 5},};",
Style)); Style);
#endif
} }
TEST_F(FormatTest, CatchAlignArrayOfStructuresLeftAlignment) { TEST_F(FormatTest, CatchAlignArrayOfStructuresLeftAlignment) {
auto Style = getLLVMStyle(); auto Style = getLLVMStyle();
Style.AlignArrayOfStructures = FormatStyle::AIAS_Left; Style.AlignArrayOfStructures = FormatStyle::AIAS_Left;
/* FIXME: This case gets misformatted. /* FIXME: These cases get misformatted.
verifyFormat("auto foo = Items{\n" verifyFormat("auto foo = Items{\n"
" Section{0, bar(), },\n" " Section{0, bar(), },\n"
" Section{1, boo() }\n" " Section{1, boo() }\n"
"};\n", "};",
Style); Style);
*/
verifyFormat("auto foo = Items{\n" verifyFormat("auto foo = Items{\n"
" Section{\n" " Section{0, bar(), }\n"
" 0, bar(),\n" "};",
" }\n"
"};\n",
Style); Style);
*/
verifyFormat("struct test demo[] = {\n" verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" {7, 5, \"!!\" }\n" " {7, 5, \"!!\" }\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[] = {\n" verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"}, // first line\n" " {56, 23, \"hello\"}, // first line\n"
" {-1, 93463, \"world\"}, // second line\n" " {-1, 93463, \"world\"}, // second line\n"
" {7, 5, \"!!\" } // third line\n" " {7, 5, \"!!\" } // third line\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[4] = {\n" verifyFormat("struct test demo[4] = {\n"
" {56, 23, 21, \"oh\" }, // first line\n" " {56, 23, 21, \"oh\" }, // first line\n"
" {-1, 93463, 22, \"my\" }, // second line\n" " {-1, 93463, 22, \"my\" }, // second line\n"
" {7, 5, 1, \"goodness\"} // third line\n" " {7, 5, 1, \"goodness\"} // third line\n"
" {234, 5, 1, \"gracious\"} // fourth line\n" " {234, 5, 1, \"gracious\"} // fourth line\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[3] = {\n" verifyFormat("struct test demo[3] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" {7, 5, \"!!\" }\n" " {7, 5, \"!!\" }\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[3] = {\n" verifyFormat("struct test demo[3] = {\n"
" {int{56}, 23, \"hello\"},\n" " {int{56}, 23, \"hello\"},\n"
" {int{-1}, 93463, \"world\"},\n" " {int{-1}, 93463, \"world\"},\n"
" {int{7}, 5, \"!!\" }\n" " {int{7}, 5, \"!!\" }\n"
"};\n", "};",
Style); Style);
verifyFormat("struct test demo[] = {\n" verifyFormat("struct test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" {7, 5, \"!!\" },\n" " {7, 5, \"!!\" },\n"
"};\n", "};",
Style); Style);
verifyFormat("test demo[] = {\n" verifyFormat("test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" {7, 5, \"!!\" },\n" " {7, 5, \"!!\" },\n"
"};\n", "};",
Style); Style);
verifyFormat("demo = std::array<struct test, 3>{\n" verifyFormat("demo = std::array<struct test, 3>{\n"
" test{56, 23, \"hello\"},\n" " test{56, 23, \"hello\"},\n"
" test{-1, 93463, \"world\"},\n" " test{-1, 93463, \"world\"},\n"
" test{7, 5, \"!!\" },\n" " test{7, 5, \"!!\" },\n"
"};\n", "};",
Style); Style);
verifyFormat("test demo[] = {\n" verifyFormat("test demo[] = {\n"
" {56, 23, \"hello\"},\n" " {56, 23, \"hello\"},\n"
"#if X\n" "#if X\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
"#endif\n" "#endif\n"
" {7, 5, \"!!\" }\n" " {7, 5, \"!!\" }\n"
"};\n", "};",
Style); Style);
// FIXME: Skip AlignArrayOfStructures if any row can't fit on a single line.
#if 0
verifyFormat( verifyFormat(
"test demo[] = {\n" "test demo[] = {{7, 23,\n"
" {7, 23,\n" " \"hello world i am a long line that really, in any\"\n"
" \"hello world i am a very long line that really, in any\"\n" " \"just world, ought to be split to multiple lines\"},\n"
" \"just world, ought to be split over multiple lines\"},\n"
" {-1, 93463, \"world\" },\n" " {-1, 93463, \"world\"},\n"
" {56, 5, \"!!\" }\n" " {56, 5, \"!!\"}};",
"};\n",
Style); Style);
#endif
verifyFormat("return GradForUnaryCwise(g, {\n" verifyFormat("return f(g, {\n"
" {{\"sign\"}, \"Sign\", {\"x\", " " {{\"sign\"}, \"Sign\", {\"x\", \"dy\"} },\n"
"\"dy\"} },\n" " {{\"dx\"}, \"Mul\", {\"dy\", \"sign\"}},\n"
" {{\"dx\"}, \"Mul\", " "});",
"{\"dy\", \"sign\"}},\n" Style);
"});\n",
// FIXME: Skip AlignArrayOfStructures if any row has a non-trailing comment.
#if 0
verifyFormat("test demo[] = {\n"
" {56, 23, /* a comment */ \"hello\"}, "
"{-1, 93463, \"world\"}, {7, 5, \"!!\"}};",
Style);
verifyFormat("test demo[] = {\n"
" {56, 23, \"hello\"}, "
"{-1, 93463, \"world\" /* comment here */}, {7, 5, \"!!\"}};",
Style); Style);
verifyFormat("test demo[] = {\n"
" {56, /* a comment */ 23, \"hello\"}, "
"{-1, 93463, \"world\"}, {7, 5, \"!!\"}};",
Style);
#endif
Style.ColumnLimit = 0; Style.ColumnLimit = 0;
EXPECT_EQ( verifyFormat(
"test demo[] = {\n" "test demo[] = {\n"
" {56, 23, \"hello world i am a very long line that really, in any " " {56, 23, \"hello world i am a very long line that really, in any "
"just world, ought to be split over multiple lines\"},\n" "just world, ought to be split over multiple lines\"},\n"
" {-1, 93463, \"world\" " " {-1, 93463, \"world\" "
" },\n" " },\n"
" {7, 5, \"!!\" " " {7, 5, \"!!\" "
" },\n" " },\n"
"};", "};",
format("test demo[] = {{56, 23, \"hello world i am a very long line " "test demo[] = {{56, 23, \"hello world i am a very long line "
"that really, in any just world, ought to be split over multiple " "that really, in any just world, ought to be split over multiple "
"lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};", "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
Style));
Style.ColumnLimit = 80;
verifyFormat("test demo[] = {\n"
" {56, 23, /* a comment */ \"hello\"},\n"
" {-1, 93463, \"world\" },\n"
" {7, 5, \"!!\" }\n"
"};\n",
Style);
verifyFormat("test demo[] = {\n"
" {56, 23, \"hello\" },\n"
" {-1, 93463, \"world\" /* comment here */},\n"
" {7, 5, \"!!\" }\n"
"};\n",
Style);
verifyFormat("test demo[] = {\n"
" {56, /* a comment */ 23, \"hello\"},\n"
" {-1, 93463, \"world\"},\n"
" {7, 5, \"!!\" }\n"
"};\n",
Style); Style);
Style.ColumnLimit = 20; Style.ColumnLimit = 20;
EXPECT_EQ( // FIXME: Skip AlignArrayOfStructures if any row can't fit on a single line.
#if 0
verifyFormat(
"demo = std::array<\n" "demo = std::array<\n"
" struct test, 3>{\n" " struct test, 3>{\n"
" test{\n" " test{\n"
" 56, 23,\n" " 56, 23,\n"
" \"hello \"\n" " \"hello \"\n"
" \"world i \"\n" " \"world i \"\n"
" \"am a very \"\n" " \"am a very \"\n"
" \"long line \"\n" " \"long line \"\n"
" \"that \"\n" " \"that \"\n"
" \"really, \"\n" " \"really, \"\n"
" \"in any \"\n" " \"in any \"\n"
" \"just \"\n" " \"just \"\n"
" \"world, \"\n" " \"world, \"\n"
" \"ought to \"\n" " \"ought to \"\n"
" \"be split \"\n" " \"be split \"\n"
" \"over \"\n" " \"over \"\n"
" \"multiple \"\n" " \"multiple \"\n"
" \"lines\"},\n" " \"lines\"},\n"
" test{-1, 93463,\n" " test{-1, 93463,\n"
" \"world\"},\n" " \"world\"},\n"
" test{7, 5,\n" " test{7, 5,\n"
" \"!!\" },\n" " \"!!\"},\n"
"};", "};",
format("demo = std::array<struct test, 3>{test{56, 23, \"hello world " "demo = std::array<struct test, 3>{test{56, 23, \"hello world "
"i am a very long line that really, in any just world, ought " "i am a very long line that really, in any just world, ought "
"to be split over multiple lines\"},test{-1, 93463, \"world\"}," "to be split over multiple lines\"},test{-1, 93463, \"world\"},"
"test{7, 5, \"!!\"},};", "test{7, 5, \"!!\"},};",
Style)); Style);
#endif
// This caused a core dump by enabling Alignment in the LLVMStyle globally // This caused a core dump by enabling Alignment in the LLVMStyle globally
Style = getLLVMStyleWithColumns(50); Style.ColumnLimit = 50;
Style.AlignArrayOfStructures = FormatStyle::AIAS_Left;
verifyFormat("static A x = {\n" verifyFormat("static A x = {\n"
" {{init1, init2, init3, init4},\n" " {{init1, init2, init3, init4},\n"
" {init1, init2, init3, init4}}\n" " {init1, init2, init3, init4}}\n"
"};", "};",
Style); Style);
Style.ColumnLimit = 100; Style.ColumnLimit = 100;
EXPECT_EQ( // FIXME: Skip AlignArrayOfStructures if any row can't fit on a single line.
#if 0
verifyFormat(
"test demo[] = {\n" "test demo[] = {\n"
" {56, 23,\n" " {56, 23,\n"
" \"hello world i am a very long line that really, in any just world" " \"hello world i am a very long line that really, in any just world"
", ought to be split over \"\n" ", ought to be split over \"\n"
" \"multiple lines\" },\n" " \"multiple lines\"},\n"
" {-1, 93463, \"world\"},\n" " {-1, 93463, \"world\"},\n"
" {7, 5, \"!!\" },\n" " {7, 5, \"!!\"},\n"
"};", "};",
format("test demo[] = {{56, 23, \"hello world i am a very long line " "test demo[] = {{56, 23, \"hello world i am a very long line "
"that really, in any just world, ought to be split over multiple " "that really, in any just world, ought to be split over multiple "
"lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};", "lines\"},{-1, 93463, \"world\"},{7, 5, \"!!\"},};",
Style)); Style);
#endif
} }
TEST_F(FormatTest, UnderstandsPragmas) { TEST_F(FormatTest, UnderstandsPragmas) {
verifyFormat("#pragma omp reduction(| : var)"); verifyFormat("#pragma omp reduction(| : var)");
verifyFormat("#pragma omp reduction(+ : var)"); verifyFormat("#pragma omp reduction(+ : var)");
EXPECT_EQ("#pragma mark Any non-hyphenated or hyphenated string " EXPECT_EQ("#pragma mark Any non-hyphenated or hyphenated string "
"(including parentheses).", "(including parentheses).",
▲ Show 20 Lines • Show All 6,235 Lines • Show Last 20 Lines