diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 85e907d7738..d6a54db74e8 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1702,11 +1702,11 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, if (Right.Type == TT_CtorInitializerComma && Style.BreakConstructorInitializersBeforeComma) return true; - if (Right.Type == TT_BinaryOperator && Style.BreakBeforeBinaryOperators) - return true; if (Left.is(tok::greater) && Right.is(tok::greater) && Left.Type != TT_TemplateCloser) return false; + if (Right.Type == TT_BinaryOperator && Style.BreakBeforeBinaryOperators) + return true; if (Left.Type == TT_ArrayInitializerLSquare) return true; return (Left.isBinaryOperator() && Left.isNot(tok::lessless) && diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 75b5c6b518e..93a0064e7da 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -3083,6 +3083,12 @@ TEST_F(FormatTest, ExpressionIndentationBreakingBeforeOperators) { verifyFormat("return boost::fusion::at_c<0>(iiii).second\n" " == boost::fusion::at_c<1>(iiii).second;", Style); + + Style.ColumnLimit = 60; + verifyFormat("zzzzzzzzzz\n" + " = bbbbbbbbbbbbbbbbb\n" + " >> aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa);", + Style); } TEST_F(FormatTest, ConstructorInitializers) { |
