diff options
| -rw-r--r-- | clang/docs/ClangFormatStyleOptions.rst | 4 | ||||
| -rw-r--r-- | clang/include/clang/Format/Format.h | 4 | ||||
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 2 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 9 |
4 files changed, 13 insertions, 6 deletions
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 50d8b365e5b..5662ad4a44f 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -2050,8 +2050,8 @@ the configuration (without a prefix: ``Auto``). .. code-block:: c++ true: false: - int a = 5; vs. int a=5; - a += 42 a+=42; + int a = 5; vs. int a= 5; + a += 42; a+= 42; **SpaceBeforeCpp11BracedList** (``bool``) If ``true``, a space will be inserted before a C++11 braced list diff --git a/clang/include/clang/Format/Format.h b/clang/include/clang/Format/Format.h index 7a6688bbdbf..d1db5055de3 100644 --- a/clang/include/clang/Format/Format.h +++ b/clang/include/clang/Format/Format.h @@ -1738,8 +1738,8 @@ struct FormatStyle { /// If ``false``, spaces will be removed before assignment operators. /// \code /// true: false: - /// int a = 5; vs. int a=5; - /// a += 42 a+=42; + /// int a = 5; vs. int a= 5; + /// a += 42; a+= 42; /// \endcode bool SpaceBeforeAssignmentOperators; 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) && diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 0aeecc0e122..d7859eb86ec 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -6620,8 +6620,15 @@ TEST_F(FormatTest, UnderstandsTemplateParameters) { verifyFormat("A<A<int>> a;", getChromiumStyle(FormatStyle::LK_Cpp)); - verifyFormat("int i = a<1> >> 1;"); + // template closer followed by a token that starts with > or = verifyFormat("bool b = a<1> > 1;"); + verifyFormat("bool b = a<1> >= 1;"); + verifyFormat("int i = a<1> >> 1;"); + FormatStyle Style = getLLVMStyle(); + Style.SpaceBeforeAssignmentOperators = false; + verifyFormat("bool b= a<1> == 1;", Style); + verifyFormat("a<int> = 1;", Style); + verifyFormat("a<int> >>= 1;", Style); verifyFormat("test >> a >> b;"); verifyFormat("test << a >> b;"); |
