Author: owenpan Date: Sun Aug 18 11:51:39 2019 New Revision: 369214 URL: http://llvm.org/viewvc/llvm-project?rev=369214&view=rev Log: [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 Modified: cfe/trunk/docs/ClangFormatStyleOptions.rst cfe/trunk/include/clang/Format/Format.h cfe/trunk/lib/Format/TokenAnnotator.cpp cfe/trunk/unittests/Format/FormatTest.cpp Modified: cfe/trunk/docs/ClangFormatStyleOptions.rst URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ClangFormatStyleOptions.rst?rev=369214&r1=369213&r2=369214&view=diff ============================================================================== --- cfe/trunk/docs/ClangFormatStyleOptions.rst (original) +++ cfe/trunk/docs/ClangFormatStyleOptions.rst Sun Aug 18 11:51:39 2019 @@ -2050,8 +2050,8 @@ the configuration (without a prefix: ``A .. 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 Modified: cfe/trunk/include/clang/Format/Format.h URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Format/Format.h?rev=369214&r1=369213&r2=369214&view=diff ============================================================================== --- cfe/trunk/include/clang/Format/Format.h (original) +++ cfe/trunk/include/clang/Format/Format.h Sun Aug 18 11:51:39 2019 @@ -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; Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=369214&r1=369213&r2=369214&view=diff ============================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Sun Aug 18 11:51:39 2019 @@ -2870,7 +2870,7 @@ bool TokenAnnotator::spaceRequiredBefore 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) && Modified: cfe/trunk/unittests/Format/FormatTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=369214&r1=369213&r2=369214&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp (original) +++ cfe/trunk/unittests/Format/FormatTest.cpp Sun Aug 18 11:51:39 2019 @@ -6620,8 +6620,15 @@ TEST_F(FormatTest, UnderstandsTemplatePa 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;"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits