maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Undo r216377. 

It has proven to not be a food idea in many case.

llvm-svn: 218107
This commit is contained in:
Daniel Jasper 2014-09-19 08:01:25 +00:00
parent 752c9cb12f
commit a41aa536dc
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Format/ContinuationIndenter.cpp
View File

@ -867,10 +867,9 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State,
getColumnLimit(State)) getColumnLimit(State))
BreakBeforeParameter = true; BreakBeforeParameter = true;
} }
bool NoLineBreak = bool NoLineBreak = State.Stack.back().NoLineBreak ||
State.Stack.back().NoLineBreak || (Current.Type == TT_TemplateOpener &&
((Current.NestingLevel != 0 || Current.Type == TT_TemplateOpener) && State.Stack.back().ContainsUnwrappedBuilder);
State.Stack.back().ContainsUnwrappedBuilder);
State.Stack.push_back(ParenState(NewIndent, NewIndentLevel, State.Stack.push_back(ParenState(NewIndent, NewIndentLevel,
State.Stack.back().LastSpace, State.Stack.back().LastSpace,
AvoidBinPacking, NoLineBreak)); AvoidBinPacking, NoLineBreak));

5
clang/unittests/Format/FormatTest.cpp
View File

@ -3831,12 +3831,9 @@ TEST_F(FormatTest, FormatsBuilderPattern) {
" .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<\n" " .aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa<\n"
" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>();"); " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa>();");
// Prefer not to break after empty parentheses ... // Prefer not to break after empty parentheses.
verifyFormat("FirstToken->WhitespaceRange.getBegin().getLocWithOffset(\n" verifyFormat("FirstToken->WhitespaceRange.getBegin().getLocWithOffset(\n"
" First->LastNewlineOffset);"); " First->LastNewlineOffset);");
// ... unless nested.
verifyFormat("f(FirstToken->WhitespaceRange.getBegin()\n"
" .getLocWithOffset(First->LastNewlineOffset));");
} }
TEST_F(FormatTest, BreaksAccordingToOperatorPrecedence) { TEST_F(FormatTest, BreaksAccordingToOperatorPrecedence) {