From 13404dad0d53763b46fda1516fc82565940bb03f Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Thu, 27 Nov 2014 14:40:48 +0000 Subject: [PATCH] clang-format: Don't use column layout with AlignAfterOpenBrackets. This fixes llvm.org/PR21676. llvm-svn: 222886 --- clang/lib/Format/FormatToken.cpp | 4 ++++ clang/unittests/Format/FormatTestJava.cpp | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp index 677f1a0..badb3a3 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 MustBreakBeforeItem; diff --git a/clang/unittests/Format/FormatTestJava.cpp b/clang/unittests/Format/FormatTestJava.cpp index 829ced7..95d1961 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) { -- 2.7.4