diff options
| author | Daniel Jasper <djasper@google.com> | 2013-02-21 21:33:55 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-02-21 21:33:55 +0000 |
| commit | f11a705c6075b12cbae5632ba4de433bc9bc105f (patch) | |
| tree | fbcca74530fd91184c64014d189901b5c277aeb6 /lib/Format/TokenAnnotator.cpp | |
| parent | fdf6a279c9a75c778eba382d9a156697092982a1 (diff) | |
Consistently put {} onto the same line for empty functions.
This fixes llvm.org/PR15167.
Before:
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL()
: AAAAAAAA(10), BBBBBBBBB(10) {
}
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL() : AAAAAAAA(10) {}
After:
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL()
: AAAAAAAA(10), BBBBBBBBB(10) {}
LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL() : AAAAAAAA(10) {}
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175800 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index dcbdb786fa..af59a18e96 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -517,8 +517,7 @@ private: : BindingStrength(BindingStrength), LongestObjCSelectorName(0), ColonIsForRangeExpr(false), ColonIsObjCMethodExpr(false), FirstObjCSelectorName(NULL), IsExpression(IsExpression), - LookForFunctionName(false) { - } + LookForFunctionName(false) {} unsigned BindingStrength; unsigned LongestObjCSelectorName; @@ -1104,6 +1103,7 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, Right.is(tok::arrow) || Right.is(tok::period) || Right.is(tok::colon) || Left.is(tok::coloncolon) || Left.is(tok::semi) || Left.is(tok::l_brace) || + Right.is(tok::r_brace) || (Left.is(tok::r_paren) && Left.Type != TT_CastRParen && Right.is(tok::identifier)) || (Left.is(tok::l_paren) && !Right.is(tok::r_paren)) || |