diff options
| author | Daniel Jasper <djasper@google.com> | 2014-04-17 11:32:02 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-04-17 11:32:02 +0000 |
| commit | ae8e0d8da9de8eb1cf81fb0e24e9dfda43957aab (patch) | |
| tree | 1753879a942ff6413f244be8c6e2998397bfa38e /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | 057fa3a5a5cab738b4fe14d440df25b0440fa6e8 (diff) | |
| download | bcm5719-llvm-ae8e0d8da9de8eb1cf81fb0e24e9dfda43957aab.tar.gz bcm5719-llvm-ae8e0d8da9de8eb1cf81fb0e24e9dfda43957aab.zip | |
clang-format: Respect BinPackParameters in Cpp11BracedListStyle.
With BinPackParameters=false and Cpp11BracedListStyle=true (i.e. mostly
for Chromium):
Before:
const Aaaaaa aaaaa = {aaaaa, bbbbb, ccccc, ddddd, eeeee, ffffff,
ggggg, hhhhhh, iiiiii, jjjjjj, kkkkkk};
After:
const Aaaaaa aaaaa = {aaaaa,
bbbbb,
ccccc,
ddddd,
eeeee,
ffffff,
ggggg,
hhhhhh,
iiiiii,
jjjjjj,
kkkkkk};
This fixes llvm.org/PR19359. I am not sure we'll want this in all cases
in the long run, but I'll guess we'll get feedback on that.
llvm-svn: 206458
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 52ee47987f1..de2047c458f 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -725,6 +725,7 @@ unsigned ContinuationIndenter::moveStateToNextToken(LineState &State, AvoidBinPacking = Current.BlockKind == BK_Block || Current.Type == TT_ArrayInitializerLSquare || Current.Type == TT_DictLiteral || + !Style.BinPackParameters || (NextNoComment && NextNoComment->Type == TT_DesignatedInitializerPeriod); } else { |
