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

Improve indentation of assignments. 

Before:
unsigned OriginalStartColumn = SourceMgr.getSpellingColumnNumber(
    Current.FormatTok.getStartOfNonWhitespace()) -
                               1;

After:
unsigned OriginalStartColumn =
    SourceMgr.getSpellingColumnNumber(
        Current.FormatTok.getStartOfNonWhitespace()) -
    1;

llvm-svn: 182733
This commit is contained in:
Daniel Jasper 2013-05-27 12:45:09 +00:00
parent 75081b5cf8
commit 7b27a10b1e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Format/Format.cpp
View File

@ -640,7 +640,10 @@ private:
else if ((Previous.Type == TT_BinaryOperator || else if ((Previous.Type == TT_BinaryOperator ||
Previous.Type == TT_ConditionalExpr || Previous.Type == TT_ConditionalExpr ||
Previous.Type == TT_CtorInitializerColon) && Previous.Type == TT_CtorInitializerColon) &&
getPrecedence(Previous) != prec::Assignment) !(getPrecedence(Previous) == prec::Assignment &&
Current.FakeLParens.empty()))
// Always indent relative to the RHS of the expression unless this is a
// simple assignment without binary expression on the RHS.
State.Stack.back().LastSpace = State.Column; State.Stack.back().LastSpace = State.Column;
else if (Previous.Type == TT_InheritanceColon) else if (Previous.Type == TT_InheritanceColon)
State.Stack.back().Indent = State.Column; State.Stack.back().Indent = State.Column;

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

@ -2336,6 +2336,10 @@ TEST_F(FormatTest, BreaksAfterAssignments) {
verifyFormat( verifyFormat(
"aaaaaaaaaaaaaaaaaaaaaaaaaa aaaa = aaaaaaaaaaaaaa(0).aaaa()\n" "aaaaaaaaaaaaaaaaaaaaaaaaaa aaaa = aaaaaaaaaaaaaa(0).aaaa()\n"
" .aaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaa::aaaaaaaaaaaaaaaaaaaaa);"); " .aaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaa::aaaaaaaaaaaaaaaaaaaaa);");
verifyFormat("unsigned OriginalStartColumn =\n"
" SourceMgr.getSpellingColumnNumber(\n"
" Current.FormatTok.getStartOfNonWhitespace()) -\n"
" 1;");
} }
TEST_F(FormatTest, AlignsAfterAssignments) { TEST_F(FormatTest, AlignsAfterAssignments) {