diff options
| author | Daniel Jasper <djasper@google.com> | 2014-09-19 08:01:25 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-09-19 08:01:25 +0000 |
| commit | a41aa536dc389f95763adfca3cafdf4adbe353b2 (patch) | |
| tree | 06709d5925d6e674f02a3cc71d50d108158cc12f /clang/lib/Format/ContinuationIndenter.cpp | |
| parent | 752c9cb12ff6d6e50042d8178bf42c882ed580c1 (diff) | |
| download | bcm5719-llvm-a41aa536dc389f95763adfca3cafdf4adbe353b2.tar.gz bcm5719-llvm-a41aa536dc389f95763adfca3cafdf4adbe353b2.zip | |
clang-format: Undo r216377.
It has proven to not be a food idea in many case.
llvm-svn: 218107
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)); |
