]> granicus.if.org Git - clang/commitdiff
Don't break after pointer or reference specifier.
authorDaniel Jasper <djasper@google.com>
Wed, 2 Jan 2013 08:44:14 +0000 (08:44 +0000)
committerDaniel Jasper <djasper@google.com>
Wed, 2 Jan 2013 08:44:14 +0000 (08:44 +0000)
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

lib/Format/Format.cpp
unittests/Format/FormatTest.cpp

index 93126613ec5465adbd9b74956e25337abaa6f46d..a6c11dcd7adba22e0ebdb0a4ad3df664188e808a 100644 (file)
@@ -660,8 +660,7 @@ public:
     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 @@ private:
     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;
index b719acfabc6d98b14405140d8eea1abeb2c740b6..99204f56f581ad08dcd8169eb8cc5d844ec6fd63 100644 (file)
@@ -682,6 +682,16 @@ TEST_F(FormatTest, UnderstandsUsesOfStar) {
   verifyGoogleFormat("A<int**, int**> a;");
 }
 
+TEST_F(FormatTest, DoesNotBreakBeforePointerOrReference) {
+  verifyFormat(
+      "int *someFunction(int LoooooooooooooooongParam1,\n"
+      "                  int LoooooooooooooooongParam2) {\n}");
+  verifyFormat(
+      "TypeSpecDecl *TypeSpecDecl::Create(ASTContext &C, DeclContext *DC,\n"
+      "                                   SourceLocation L, IdentifierIn *II,\n"
+      "                                   Type *T) {\n}");
+}
+
 TEST_F(FormatTest, LineStartsWithSpecialCharacter) {
   verifyFormat("(a)->b();");
   verifyFormat("--a;");