commit 5ef8aacd5f25767fc7bd1ec47c2b5f5fd1ac38eb
author Daniel Jasper <djasper@google.com> Mon Jun 03 08:42:05 2013 +0000
committer Daniel Jasper <djasper@google.com> Mon Jun 03 08:42:05 2013 +0000
tree 5cac63a97262f12b96e38e144c54547659937129
parent d1b55dcf6bd61d4350b01e15590bde9bb5a334bb

Fix line-breaking problem caused by comment.

Before, clang-format would not find a solution for formatting:
if ((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||
     bbbbbbbbbbbbbbbbbb) && // aaaaaaaaaaaaaaaa
    cccccc) {
}

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@183096 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Format/Format.cpp

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 3ae2792..e0142db 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -1040,6 +1040,7 @@
     // should also break after the operator.
     if (Previous.Type == TT_BinaryOperator &&
         Current.Type != TT_BinaryOperator && // Special case for ">>".
+        !Current.isTrailingComment() &&
         !Previous.isOneOf(tok::lessless, tok::question) &&
         Previous.getPrecedence() != prec::Assignment &&
         State.Stack.back().BreakBeforeParameter)

unittests/Format/FormatTest.cpp

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 24e4769..98a6e07 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1991,6 +1991,10 @@
                "        TheLine.Last->FormatTok.Tok.getLocation()) -\n"
                "    1);");
 
+  verifyFormat("if ((aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ||\n"
+               "     bbbbbbbbbbbbbbbbbb) && // aaaaaaaaaaaaaaaa\n"
+               "    cccccc) {\n}");
+
   FormatStyle OnePerLine = getLLVMStyle();
   OnePerLine.BinPackParameters = false;
   verifyFormat(