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

clang-format: Don't indent relative to unary operators. 

It seems like most people see unary operators more like part of the
subsequent identifier and find relative indentation odd.

Before:
  aaaaaaaaaa(!aaaaaaaaaa( // break
                  aaaaa));
After:
  aaaaaaaaaa(!aaaaaaaaaa( // break
                 aaaaa));

llvm-svn: 200840
This commit is contained in:
Daniel Jasper 2014-02-05 13:43:04 +00:00
parent 3bb8fbfa3e
commit 0c214fa2e3
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,7 +296,6 @@ void ContinuationIndenter::addTokenOnCurrentLine(LineState &State, bool DryRun,
State.Stack.back().LastSpace = State.Column; State.Stack.back().LastSpace = State.Column;
else if ((Previous.Type == TT_BinaryOperator || else if ((Previous.Type == TT_BinaryOperator ||
Previous.Type == TT_ConditionalExpr || Previous.Type == TT_ConditionalExpr ||
Previous.Type == TT_UnaryOperator ||
Previous.Type == TT_CtorInitializerColon) && Previous.Type == TT_CtorInitializerColon) &&
(Previous.getPrecedence() != prec::Assignment || (Previous.getPrecedence() != prec::Assignment ||
Current.StartsBinaryExpression)) Current.StartsBinaryExpression))

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

@ -4219,14 +4219,12 @@ TEST_F(FormatTest, UnderstandsUnaryOperators) {
verifyFormat("int a = i /* confusing comment */++;"); verifyFormat("int a = i /* confusing comment */++;");
} }
TEST_F(FormatTest, IndentsRelativeToUnaryOperators) { TEST_F(FormatTest, DoesNotIndentRelativeToUnaryOperators) {
verifyFormat("if (!aaaaaaaaaa( // break\n" verifyFormat("if (!aaaaaaaaaa( // break\n"
" aaaaa)) {\n" " aaaaa)) {\n"
"}"); "}");
verifyFormat("aaaaaaaaaa(!aaaaaaaaaa( // break\n" verifyFormat("aaaaaaaaaa(!aaaaaaaaaa( // break\n"
" aaaaa));"); " aaaaa));");
// Only indent relative to unary operators if the expression is nested.
verifyFormat("*aaa = aaaaaaa( // break\n" verifyFormat("*aaa = aaaaaaa( // break\n"
" bbbbbb);"); " bbbbbb);");
} }