summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorOwen Pan <owenpiano@gmail.com>2019-08-18 18:51:39 +0000
committerOwen Pan <owenpiano@gmail.com>2019-08-18 18:51:39 +0000
commit37860d524e86488e683bb04064ec34cebb4c74c3 (patch)
treec64a49fa1e4ec63ac147832f3bc14fa798a617f1 /clang/lib
parent63b3c56fca6d727feeb66ad5796e392ecd314443 (diff)
downloadbcm5719-llvm-37860d524e86488e683bb04064ec34cebb4c74c3.tar.gz
bcm5719-llvm-37860d524e86488e683bb04064ec34cebb4c74c3.zip
[clang-format] Fix a bug that joins template closer and =
Also fixes the documentation for SpaceBeforeAssignmentOperators. See discussions at https://reviews.llvm.org/D66332 Differential Revision: https://reviews.llvm.org/D66384 llvm-svn: 369214
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 62f7130dc89..c391c489dc2 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2870,7 +2870,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
Left.isOneOf(tok::arrow, tok::period, tok::arrowstar, tok::periodstar) ||
(Right.is(tok::period) && Right.isNot(TT_DesignatedInitializerPeriod)))
return false;
- if (!Style.SpaceBeforeAssignmentOperators &&
+ if (!Style.SpaceBeforeAssignmentOperators && Left.isNot(TT_TemplateCloser) &&
Right.getPrecedence() == prec::Assignment)
return false;
if (Style.Language == FormatStyle::LK_Java && Right.is(tok::coloncolon) &&
OpenPOWER on IntegriCloud