summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/TokenAnnotator.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-11-05 17:43:16 +0000
committerDaniel Jasper <djasper@google.com>2016-11-05 17:43:16 +0000
commita432208bcab544c6d604766cf9efa088f53a64a3 (patch)
tree051641580b6c5a79a922165d6933c38978050861 /clang/lib/Format/TokenAnnotator.cpp
parent64a592d0a24d7ee7837ddff83d84b5fc13d8cd2c (diff)
downloadbcm5719-llvm-a432208bcab544c6d604766cf9efa088f53a64a3.tar.gz
bcm5719-llvm-a432208bcab544c6d604766cf9efa088f53a64a3.zip
clang-format: Better support for CUDA's triple brackets.
Before: aaaaaaaaaaaaaaa< aaaaaaaaa, aaaaaaaaaa, aaaaaaaaaaaaaa><<<aaaaaaaaa, aaaaaaaaaa, aaaaaaaaaaaaaaaaaa>>>(); After: aaaaaaaaaaaaaaa<aaaaaaaaa, aaaaaaaaaa, aaaaaaaaaaaaaa> <<<aaaaaaaaa, aaaaaaaaaa, aaaaaaaaaaaaaaaaaa>>>(); llvm-svn: 286041
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 0b6e71d3d9a..cba9a03b3e0 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2488,6 +2488,8 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line,
return true;
if (Right.is(TT_RangeBasedForLoopColon))
return false;
+ if (Left.is(TT_TemplateCloser) && Right.is(TT_TemplateOpener))
+ return true;
if (Left.isOneOf(TT_TemplateCloser, TT_UnaryOperator) ||
Left.is(tok::kw_operator))
return false;
OpenPOWER on IntegriCloud