diff options
| author | Daniel Jasper <djasper@google.com> | 2017-05-08 15:07:52 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2017-05-08 15:07:52 +0000 |
| commit | 988e7e4fe8b0276ae59ba1a8022f2bca3372b2f2 (patch) | |
| tree | 7309c493fb35959e68c3ca1d52453305b97b3251 /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | 7fa777fb74c6e4c17db42e8bd90183cbba4745fc (diff) | |
| download | bcm5719-llvm-988e7e4fe8b0276ae59ba1a8022f2bca3372b2f2.tar.gz bcm5719-llvm-988e7e4fe8b0276ae59ba1a8022f2bca3372b2f2.zip | |
[clang-format] Don’t propagate AvoidBinPacking into argument
subexpressions
This is an attempt to fix the issue described in a recent email:
http://lists.llvm.org/pipermail/cfe-dev/2017-April/053632.html
Patch by jtbandes. Thank you!
Review: https://reviews.llvm.org/D32475
llvm-svn: 302427
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
| -rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 3adb72c11da..709eeb1539a 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -920,6 +920,10 @@ void ContinuationIndenter::moveStatePastFakeLParens(LineState &State, NewParenState.NoLineBreak = NewParenState.NoLineBreak || State.Stack.back().NoLineBreakInOperand; + // Don't propagate AvoidBinPacking into subexpressions of arg/param lists. + if (*I > prec::Comma) + NewParenState.AvoidBinPacking = false; + // Indent from 'LastSpace' unless these are fake parentheses encapsulating // a builder type call after 'return' or, if the alignment after opening // brackets is disabled. |
