From 49db389dbefa5b37982ae7f1dc370ff2e258700e Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Thu, 12 Jan 2017 20:06:28 +0000 Subject: [PATCH] clang-format: Fix regression introduced by r291801. Uncovered by polly tests. Before: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaa, {}, aaaaaaaaaaaaaaaaaaaaaaa); After: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaa, {}, aaaaaaaaaaaaaaaaaaaaaaa); git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@291807 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Format/ContinuationIndenter.cpp | 12 ++++-------- unittests/Format/FormatTest.cpp | 2 ++ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/lib/Format/ContinuationIndenter.cpp b/lib/Format/ContinuationIndenter.cpp index 5a30370af8..6bb6fb3060 100644 --- a/lib/Format/ContinuationIndenter.cpp +++ b/lib/Format/ContinuationIndenter.cpp @@ -930,13 +930,6 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State, return; } - const FormatToken *Previous = Current.getPreviousNonComment(); - if (Previous && Previous->is(tok::comma) && - !Previous->is(TT_OverloadedOperator)) { - if (!Newline) - State.Stack.back().NoLineBreak = true; - } - unsigned NewIndent; unsigned NewIndentLevel = State.Stack.back().IndentLevel; unsigned LastSpace = State.Stack.back().LastSpace; @@ -1010,12 +1003,15 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State, // Generally inherit NoLineBreak from the current scope to nested scope. // However, don't do this for non-empty nested blocks, dict literals and // array literals as these follow different indentation rules. + const FormatToken *Previous = Current.getPreviousNonComment(); bool NoLineBreak = Current.Children.empty() && !Current.isOneOf(TT_DictLiteral, TT_ArrayInitializerLSquare) && (State.Stack.back().NoLineBreak || (Current.is(TT_TemplateOpener) && - State.Stack.back().ContainsUnwrappedBuilder)); + State.Stack.back().ContainsUnwrappedBuilder) || + (Current.is(tok::l_brace) && !Newline && Previous && + Previous->is(tok::comma))); State.Stack.push_back(ParenState(NewIndent, NewIndentLevel, LastSpace, AvoidBinPacking, NoLineBreak)); State.Stack.back().NestedBlockIndent = NestedBlockIndent; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 640d9bd58b..b402b5c4a5 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -6822,6 +6822,8 @@ TEST_F(FormatTest, FormatsBracedListsInColumnLayout) { " {List1, List2,\n" " List3});", getLLVMStyleWithColumns(35)); + verifyFormat("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaa, {},\n" + " aaaaaaaaaaaaaaaaaaaaaaa);"); } TEST_F(FormatTest, PullTrivialFunctionDefinitionsIntoSingleLine) { -- 2.40.0