Don't break after pointer or reference specifier.
This fixes llvm.org/PR14717.
Buggy format:
TypeSpecDecl *
TypeSpecDecl::Create(ASTContext &C, DeclContext *DC, SourceLocation L,
IdentifierInfo *II, Type *T) {
Now changed to:
TypeSpecDecl *TypeSpecDecl::Create(ASTContext &C, DeclContext *DC,
SourceLocation L, IdentifierInfo *II,
Type *T) {
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171357 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 9312661..a6c11dc 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -660,8 +660,7 @@
for (int i = 1, e = Line.Tokens.size(); i != e; ++i) {
TokenAnnotation &Annotation = Annotations[i];
- Annotation.CanBreakBefore =
- canBreakBetween(Line.Tokens[i - 1], Line.Tokens[i]);
+ Annotation.CanBreakBefore = canBreakBefore(i);
if (Annotation.Type == TokenAnnotation::TT_CtorInitializerColon) {
Annotation.MustBreakBefore = true;
@@ -896,7 +895,13 @@
return true;
}
- bool canBreakBetween(const FormatToken &Left, const FormatToken &Right) {
+ bool canBreakBefore(unsigned i) {
+ if (Annotations[i - 1].Type == TokenAnnotation::TT_PointerOrReference ||
+ Annotations[i].Type == TokenAnnotation::TT_ConditionalExpr) {
+ return false;
+ }
+ const FormatToken &Left = Line.Tokens[i - 1];
+ const FormatToken &Right = Line.Tokens[i];
if (Right.Tok.is(tok::r_paren) || Right.Tok.is(tok::l_brace) ||
Right.Tok.is(tok::comment) || Right.Tok.is(tok::greater))
return false;