diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Format/FormatToken.cpp | 4 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTestJava.cpp | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp index 677f1a0bb13..badb3a39c82 100644 --- a/clang/lib/Format/FormatToken.cpp +++ b/clang/lib/Format/FormatToken.cpp @@ -138,6 +138,10 @@ void CommaSeparatedList::precomputeFormattingInfos(const FormatToken *Token) { Commas.size() < 19) return; + // Column format doesn't really make sense if we don't align after brackets. + if (!Style.AlignAfterOpenBracket) + return; + FormatToken *ItemBegin = Token->Next; SmallVector<bool, 8> MustBreakBeforeItem; diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index 829ced7b02e..95d19618046 100644 --- a/clang/unittests/Format/FormatTestJava.cpp +++ b/clang/unittests/Format/FormatTestJava.cpp @@ -212,6 +212,13 @@ TEST_F(FormatTestJava, ArrayInitializers) { verifyFormat("new int[] {\n" " 1, 2, 3, 4,\n" "};"); + + FormatStyle Style = getStyleWithColumns(65); + Style.Cpp11BracedListStyle = false; + verifyFormat( + "expected = new int[] { 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,\n" + " 100, 100, 100, 100, 100, 100, 100, 100, 100, 100 };", + Style); } TEST_F(FormatTestJava, ThrowsDeclarations) { |
