diff options
Diffstat (limited to 'clang/lib/Format/ContinuationIndenter.cpp')
-rw-r--r-- | clang/lib/Format/ContinuationIndenter.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index 0dc65ba28ef..ce6ebd84b6a 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -867,10 +867,9 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State, getColumnLimit(State)) BreakBeforeParameter = true; } - bool NoLineBreak = - State.Stack.back().NoLineBreak || - ((Current.NestingLevel != 0 || Current.Type == TT_TemplateOpener) && - State.Stack.back().ContainsUnwrappedBuilder); + bool NoLineBreak = State.Stack.back().NoLineBreak || + (Current.Type == TT_TemplateOpener && + State.Stack.back().ContainsUnwrappedBuilder); State.Stack.push_back(ParenState(NewIndent, NewIndentLevel, State.Stack.back().LastSpace, AvoidBinPacking, NoLineBreak)); |