Author: owenpan Date: Fri Aug 16 14:49:17 2019 New Revision: 369157 URL: http://llvm.org/viewvc/llvm-project?rev=369157&view=rev Log: [clang-format] Fix the bug that joins template closer and > or >>
Also fixes a buggy test case. See PR42404 Differential Revision: https://reviews.llvm.org/D66332 Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp cfe/trunk/unittests/Format/FormatTest.cpp Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/TokenAnnotator.cpp?rev=369157&r1=369156&r2=369157&view=diff ============================================================================== --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Fri Aug 16 14:49:17 2019 @@ -919,6 +919,8 @@ private: case tok::greater: if (Style.Language != FormatStyle::LK_TextProto) Tok->Type = TT_BinaryOperator; + if (Tok->Previous && Tok->Previous->is(TT_TemplateCloser)) + Tok->SpacesRequiredBefore = 1; break; case tok::kw_operator: if (Style.Language == FormatStyle::LK_TextProto || Modified: cfe/trunk/unittests/Format/FormatTest.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=369157&r1=369156&r2=369157&view=diff ============================================================================== --- cfe/trunk/unittests/Format/FormatTest.cpp (original) +++ cfe/trunk/unittests/Format/FormatTest.cpp Fri Aug 16 14:49:17 2019 @@ -6618,7 +6618,10 @@ TEST_F(FormatTest, UnderstandsTemplatePa EXPECT_EQ("auto x = [] { A<A<A<A>>> a; };", format("auto x=[]{A<A<A<A> >> a;};", getGoogleStyle())); - verifyFormat("A<A>> a;", getChromiumStyle(FormatStyle::LK_Cpp)); + verifyFormat("A<A<int>> a;", getChromiumStyle(FormatStyle::LK_Cpp)); + + verifyFormat("int i = a<1> >> 1;"); + verifyFormat("bool b = a<1> > 1;"); 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