Author: Backl1ght Date: 2023-01-06T22:50:48+08:00 New Revision: b62906b0d10fb7a6cd2e2ceb0f350cec326540d7
URL: https://github.com/llvm/llvm-project/commit/b62906b0d10fb7a6cd2e2ceb0f350cec326540d7 DIFF: https://github.com/llvm/llvm-project/commit/b62906b0d10fb7a6cd2e2ceb0f350cec326540d7.diff LOG: [clang-format] fix template closer followed by > fix https://github.com/llvm/llvm-project/issues/59785 Reviewed By: HazardyKnusperkeks, MyDeveloperDay, owenpan Differential Revision: https://reviews.llvm.org/D140843 Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/FormatTest.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 9dd92c9b08f14..e37ffbde85a26 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -166,10 +166,9 @@ class AnnotatingParser { // parameter cases, but should not alter program semantics. if (CurrentToken->Next && CurrentToken->Next->is(tok::greater) && Left->ParentBracket != tok::less && - (isKeywordWithCondition(*Line.First) || - CurrentToken->getStartOfNonWhitespace() == - CurrentToken->Next->getStartOfNonWhitespace().getLocWithOffset( - -1))) { + CurrentToken->getStartOfNonWhitespace() == + CurrentToken->Next->getStartOfNonWhitespace().getLocWithOffset( + -1)) { return false; } Left->MatchingParen = CurrentToken; diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index b2a1e2c57f8ca..242e3f85eafea 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -10341,6 +10341,8 @@ TEST_F(FormatTest, UnderstandsTemplateParameters) { verifyFormat("bool_constant<a && noexcept(f())>"); verifyFormat("bool_constant<a || noexcept(f())>"); + verifyFormat("if (std::tuple_size_v<T> > 0)"); + // Not template parameters. verifyFormat("return a < b && c > d;"); verifyFormat("void f() {\n" diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index dba893dfdd50b..66903f1fe8981 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -339,6 +339,14 @@ TEST_F(TokenAnnotatorTest, UnderstandsTemplatesInMacros) { EXPECT_TOKEN(Tokens[19], tok::greater, TT_TemplateCloser); } +TEST_F(TokenAnnotatorTest, UnderstandsGreaterAfterTemplateCloser) { + auto Tokens = annotate("if (std::tuple_size_v<T> > 0)"); + ASSERT_EQ(Tokens.size(), 12u) << Tokens; + EXPECT_TOKEN(Tokens[5], tok::less, TT_TemplateOpener); + EXPECT_TOKEN(Tokens[7], tok::greater, TT_TemplateCloser); + EXPECT_TOKEN(Tokens[8], tok::greater, TT_BinaryOperator); +} + TEST_F(TokenAnnotatorTest, UnderstandsWhitespaceSensitiveMacros) { FormatStyle Style = getLLVMStyle(); Style.WhitespaceSensitiveMacros.push_back("FOO"); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits