diff options
| author | Daniel Jasper <djasper@google.com> | 2014-04-29 15:54:14 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-04-29 15:54:14 +0000 |
| commit | 883ae9d9a3c1056ff9910b639f5538b901dc2ca8 (patch) | |
| tree | 37cbdaea7c2d88ca55a056d4568a92179f43b321 /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | 0f250ed55f40a02f0cf609e41c3eff0b66ac6dc9 (diff) | |
| download | bcm5719-llvm-883ae9d9a3c1056ff9910b639f5538b901dc2ca8.tar.gz bcm5719-llvm-883ae9d9a3c1056ff9910b639f5538b901dc2ca8.zip | |
clang-format: Don't bin-pack text-proto-formatted options.
Before:
repeated double value = 1
[(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA,
bbbbbbb: BBBB, bbbb: BBB}];
After:
repeated double value = 1
[(aaaaaaa.aaaaaaaaa) = {aaaaaaaaaaaaaaaa: AAAAAAAAAA,
bbbbbbb: BBBB,
bbbb: BBB}];
llvm-svn: 207538
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 26eb7e1bd4b..41a42d1e60e 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.Language == FormatStyle::LK_Proto || !Style.BinPackParameters || (NextNoComment && NextNoComment->Type == TT_DesignatedInitializerPeriod); |
