diff options
| author | Daniel Jasper <djasper@google.com> | 2014-01-09 13:42:56 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-01-09 13:42:56 +0000 |
| commit | 0160347b2210ef3cd9b074cbe1ae9ecc5ed8f3fa (patch) | |
| tree | c46d3556267393c4a4c0f0c5c433ea33b8f6b114 /clang/unittests | |
| parent | 3587b32e1cc978d997602d4c0784cdcedda7de3f (diff) | |
| download | bcm5719-llvm-0160347b2210ef3cd9b074cbe1ae9ecc5ed8f3fa.tar.gz bcm5719-llvm-0160347b2210ef3cd9b074cbe1ae9ecc5ed8f3fa.zip | |
clang-format: Some tweaks to braces list formatting:
- Format a braced list with one element per line if it has nested
braced lists.
- Use a column layout only when the list has 6+ elements (instead of the
current 4+ elements).
llvm-svn: 198869
Diffstat (limited to 'clang/unittests')
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index ea215ab7576..432caf47741 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -1913,23 +1913,29 @@ TEST_F(FormatTest, NestedStaticInitializers) { " } };"); verifyFormat( - "SomeArrayOfSomeType a = { { { 1, 2, 3 }, { 1, 2, 3 },\n" + "SomeArrayOfSomeType a = { { { 1, 2, 3 },\n" + " { 1, 2, 3 },\n" " { 111111111111111111111111111111,\n" " 222222222222222222222222222222,\n" " 333333333333333333333333333333 },\n" - " { 1, 2, 3 }, { 1, 2, 3 } } };"); + " { 1, 2, 3 },\n" + " { 1, 2, 3 } } };"); verifyFormat( - "SomeArrayOfSomeType a = { { { 1, 2, 3 } }, { { 1, 2, 3 } },\n" + "SomeArrayOfSomeType a = { { { 1, 2, 3 } },\n" + " { { 1, 2, 3 } },\n" " { { 111111111111111111111111111111,\n" " 222222222222222222222222222222,\n" " 333333333333333333333333333333 } },\n" - " { { 1, 2, 3 } }, { { 1, 2, 3 } } };"); + " { { 1, 2, 3 } },\n" + " { { 1, 2, 3 } } };"); verifyGoogleFormat( "SomeArrayOfSomeType a = {\n" - " {{1, 2, 3}}, {{1, 2, 3}},\n" + " {{1, 2, 3}},\n" + " {{1, 2, 3}},\n" " {{111111111111111111111111111111, 222222222222222222222222222222,\n" " 333333333333333333333333333333}},\n" - " {{1, 2, 3}}, {{1, 2, 3}}};"); + " {{1, 2, 3}},\n" + " {{1, 2, 3}}};"); verifyFormat( "struct {\n" @@ -4938,16 +4944,23 @@ TEST_F(FormatTest, FormatsBracedListsInColumnLayout) { " { aaaaaaaaaaaaaaaaa } };", getLLVMStyleWithColumns(60)); - // No column layout for nested lists. + // With nested lists, we should either format one item per line or all nested + // lists one one line. // FIXME: For some nested lists, we can do better. verifyFormat( "SomeStruct my_struct_array = {\n" " { aaaaaa, aaaaaaaa, aaaaaaaaaa, aaaaaaaaa, aaaaaaaaa, aaaaaaaaaa,\n" " aaaaaaaaaaaaa, aaaaaaa, aaa },\n" + " { aaa, aaa },\n" + " { aaa, aaa },\n" " { aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaaa, aaa },\n" " { aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaa, aaaaaaaaaaaaaaaaaaaaaaaa,\n" " aaaaaaaaaaaa, a, aaaaaaaaaa, aaaaaaaaa, aaa },\n" "};"); + + // No column layout should be used here. + verifyFormat("aaaaaaaaaaaaaaa = { aaaaaaaaaaaaaaaaaaaaaaaaaaa, 0, 0,\n" + " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb };"); } TEST_F(FormatTest, PullTrivialFunctionDefinitionsIntoSingleLine) { |
