diff options
| author | Daniel Jasper <djasper@google.com> | 2014-05-13 08:01:47 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-05-13 08:01:47 +0000 |
| commit | 0a1e5ace26552fb0b1ef64fe43709ee21db2119d (patch) | |
| tree | 1fd3ecebc3b805171000e03c94d2b4f53405a5f2 /clang/lib/Format | |
| parent | b7a7e55dc58affd8c52d9b0e4c6d15b021e3f278 (diff) | |
| download | bcm5719-llvm-0a1e5ace26552fb0b1ef64fe43709ee21db2119d.tar.gz bcm5719-llvm-0a1e5ace26552fb0b1ef64fe43709ee21db2119d.zip | |
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
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 |
1 files changed, 2 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) && |
