From 0a1e5ace26552fb0b1ef64fe43709ee21db2119d Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 13 May 2014 08:01:47 +0000 Subject: clang-format: Don't break in the middle of ">>". Before: zzzzzzzzzz = bbbbbbbbbbbbbbbbb > > aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa); After: zzzzzzzzzz = bbbbbbbbbbbbbbbbb >> aaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaaaaa); This fixes llvm.org/PR19731. llvm-svn: 208672 --- clang/lib/Format/TokenAnnotator.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/lib/Format') 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) && -- cgit v1.2.3