diff options
| author | Daniel Jasper <djasper@google.com> | 2015-05-26 07:26:26 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-05-26 07:26:26 +0000 |
| commit | 0843434e742e1a7b48f9307b175af42c6840295d (patch) | |
| tree | aae6e0dddfac03d5d3063328ea0f7cd1132c03ab /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | 0805199185ef27e3ebd87acb95bbf5a794ee7efe (diff) | |
| download | bcm5719-llvm-0843434e742e1a7b48f9307b175af42c6840295d.tar.gz bcm5719-llvm-0843434e742e1a7b48f9307b175af42c6840295d.zip | |
clang-format: Guard the bin-packing in braced lists on BinPackArguments
instead of BinPackParameters. Braced lists are used as constructor
calls in many places and so the bin-packing should follow what is done
for other calls and not what is done for function declarations.
llvm-svn: 238184
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 623e0869926..3234e084f2f 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -856,7 +856,7 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State, const FormatToken *NextNoComment = Current.getNextNonComment(); AvoidBinPacking = Current.isOneOf(TT_ArrayInitializerLSquare, TT_DictLiteral) || - Style.Language == FormatStyle::LK_Proto || !Style.BinPackParameters || + Style.Language == FormatStyle::LK_Proto || !Style.BinPackArguments || (NextNoComment && NextNoComment->is(TT_DesignatedInitializerPeriod)); } else { NewIndent = Style.ContinuationIndentWidth + |
