commit 3eb341c4783bab96c1c2984d917b43edab47719c
author Daniel Jasper <djasper@google.com> Tue Nov 11 23:04:51 2014 +0000
committer Daniel Jasper <djasper@google.com> Tue Nov 11 23:04:51 2014 +0000
tree 8277916c959a4fb5a15c91bed6b55d6ef264bbb5
parent de5e32b5b45381e55272a7991fdc56afa946d7ca

clang-format: Improve handling of comments in binary expressions.

Before:
  b = a &&
      // Comment
      b.c &&
      d;

After:
  b = a &&
      // Comment
      b.c && d;

This fixes llvm.org/PR21535.

llvm-svn: 221727

clang/lib/Format/TokenAnnotator.cpp

diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 715cbf0..8ec8f58 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1149,8 +1149,7 @@
           Current->OperatorIndex = OperatorIndex;
           ++OperatorIndex;
         }
-
-        next(/*SkipPastLeadingComments=*/false);
+        next(/*SkipPastLeadingComments=*/Precedence > 0);
       }
     }
   }