Allow breaking between type and name in for loops.
This fixes llvm.org/PR15033.
Also: Always break before a parameter, if the previous parameter was
split over multiple lines. This was necessary to make the right
decisions in for-loops, almost always makes the code more readable and
also fixes llvm.org/PR14873.
Before:
for (llvm::ArrayRef<NamedDecl *>::iterator I = FD->getDeclsInPrototypeScope()
.begin(), E = FD->getDeclsInPrototypeScope().end();
I != E; ++I) {
}
foo(bar(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
ccccccccccccccccccccccccccccc), d, bar(e, f));
After:
for (llvm::ArrayRef<NamedDecl *>::iterator
I = FD->getDeclsInPrototypeScope().begin(),
E = FD->getDeclsInPrototypeScope().end();
I != E; ++I) {
}
foo(bar(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
ccccccccccccccccccccccccccccc),
d, bar(e, f));
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175741 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 44a91a9..2bd5332 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -258,6 +258,12 @@
tooling::Replacements Replaces;
};
+static bool isVarDeclName(const AnnotatedToken &Tok) {
+ return Tok.Parent != NULL && Tok.is(tok::identifier) &&
+ (Tok.Parent->Type == TT_PointerOrReference ||
+ Tok.Parent->is(tok::identifier));
+}
+
class UnwrappedLineFormatter {
public:
UnwrappedLineFormatter(const FormatStyle &Style, SourceManager &SourceMgr,
@@ -512,7 +518,7 @@
State.Stack.back().ColonPos =
State.Column + Current.FormatTok.TokenLength;
}
- } else if (Previous.Type == TT_ObjCMethodExpr) {
+ } else if (Previous.Type == TT_ObjCMethodExpr || isVarDeclName(Current)) {
State.Column = State.Stack.back().Indent + 4;
} else {
State.Column = State.Stack.back().Indent;
@@ -610,7 +616,9 @@
(!Style.AllowAllParametersOfDeclarationOnNextLine &&
Line.MustBeDeclaration))
State.Stack.back().BreakBeforeParameter = true;
+ }
+ if (Newline) {
// Any break on this level means that the parent level has been broken
// and we need to avoid bin packing there.
for (unsigned i = 0, e = State.Stack.size() - 1; i != e; ++i) {
@@ -634,13 +642,10 @@
State.Stack.back().FirstLessLess = State.Column;
if (Current.is(tok::question))
State.Stack.back().QuestionColumn = State.Column;
- if (Current.Type == TT_CtorInitializerColon &&
- Style.ConstructorInitializerAllOnOneLineOrOnePerLine)
- State.Stack.back().AvoidBinPacking = true;
- if (Current.is(tok::l_brace) && Current.MatchingParen != NULL &&
- !Current.MatchingParen->MustBreakBefore) {
- if (getLengthToMatchingParen(Current) + State.Column > getColumnLimit())
- State.Stack.back().BreakBeforeParameter = true;
+ if (Current.Type == TT_CtorInitializerColon) {
+ if (Style.ConstructorInitializerAllOnOneLineOrOnePerLine)
+ State.Stack.back().AvoidBinPacking = true;
+ State.Stack.back().BreakBeforeParameter = false;
}
// Insert scopes created by fake parenthesis.
@@ -908,7 +913,8 @@
if (State.NextToken->Parent->is(tok::comma) &&
State.Stack.back().BreakBeforeParameter &&
!isTrailingComment(*State.NextToken) &&
- State.NextToken->isNot(tok::r_paren))
+ State.NextToken->isNot(tok::r_paren) &&
+ State.NextToken->isNot(tok::r_brace))
return true;
// FIXME: Comparing LongestObjCSelectorName to 0 is a hacky way of finding
// out whether it is the first parameter. Clean this up.
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 2bce7c0..dcbdb78 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -886,9 +886,8 @@
}
// In for-loops, prefer breaking at ',' and ';'.
- if (Line.First.is(tok::kw_for) &&
- (Left.isNot(tok::comma) && Left.isNot(tok::semi)))
- return 20;
+ if (Line.First.is(tok::kw_for) && Left.is(tok::equal))
+ return 4;
if (Left.is(tok::semi))
return 0;
@@ -1066,6 +1065,8 @@
if (Left.Type == TT_RangeBasedForLoopColon ||
Left.Type == TT_InheritanceColon)
return true;
+ if (Right.Type == TT_RangeBasedForLoopColon)
+ return false;
if (Left.Type == TT_PointerOrReference || Left.Type == TT_TemplateCloser ||
Left.Type == TT_UnaryOperator || Left.Type == TT_ConditionalExpr ||
Left.is(tok::question) || Left.is(tok::kw_operator))
@@ -1078,6 +1079,12 @@
// change the "binding" behavior of a comment.
return false;
+ // FIXME: We can probably remove this special case once we have implemented
+ // breaking after types in general.
+ if (Line.First.is(tok::kw_for) && !Right.Children.empty() &&
+ Right.Children[0].is(tok::equal))
+ return true;
+
// Allow breaking after a trailing 'const', e.g. after a method declaration,
// unless it is follow by ';', '{' or '='.
if (Left.is(tok::kw_const) && Left.Parent != NULL &&