Author: Owen Pan Date: 2025-01-27T09:28:29-08:00 New Revision: 1e89355dadce13a162882b58a0e7f181669ba65f
URL: https://github.com/llvm/llvm-project/commit/1e89355dadce13a162882b58a0e7f181669ba65f DIFF: https://github.com/llvm/llvm-project/commit/1e89355dadce13a162882b58a0e7f181669ba65f.diff LOG: [clang-format] Treat `f<N | M>(a)` as template function call (#124438) Fixes #123144. Added: Modified: clang/lib/Format/TokenAnnotator.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 655766178fbb0e..08fda7a2ffa51a 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -252,10 +252,10 @@ class AnnotatingParser { // parameters. // FIXME: This is getting out of hand, write a decent parser. if (MaybeAngles && InExpr && !Line.startsWith(tok::kw_template) && - Prev.is(TT_BinaryOperator)) { - const auto Precedence = Prev.getPrecedence(); - if (Precedence > prec::Conditional && Precedence < prec::Relational) - MaybeAngles = false; + Prev.is(TT_BinaryOperator) && + (Prev.isOneOf(tok::pipepipe, tok::ampamp) || + Prev.getPrecedence() == prec::Equality)) { + MaybeAngles = false; } if (Prev.isOneOf(tok::question, tok::colon) && !Style.isProto()) SeenTernaryOperator = true; diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 585878e0edc5bb..fc77e277947c56 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -692,7 +692,7 @@ TEST_F(TokenAnnotatorTest, UnderstandsNonTemplateAngleBrackets) { EXPECT_TOKEN(Tokens[4], tok::less, TT_BinaryOperator); EXPECT_TOKEN(Tokens[8], tok::greater, TT_BinaryOperator); - Tokens = annotate("return A < B ^ A > B;"); + Tokens = annotate("return A < B != A > B;"); ASSERT_EQ(Tokens.size(), 10u) << Tokens; EXPECT_TOKEN(Tokens[2], tok::less, TT_BinaryOperator); EXPECT_TOKEN(Tokens[6], tok::greater, TT_BinaryOperator); @@ -3678,6 +3678,11 @@ TEST_F(TokenAnnotatorTest, TemplateInstantiation) { EXPECT_TOKEN(Tokens[2], tok::less, TT_TemplateOpener); EXPECT_TOKEN(Tokens[6], tok::greater, TT_TemplateCloser); + Tokens = annotate("return FixedInt<N | M>(foo);"); + ASSERT_EQ(Tokens.size(), 12u) << Tokens; + EXPECT_TOKEN(Tokens[2], tok::less, TT_TemplateOpener); + EXPECT_TOKEN(Tokens[6], tok::greater, TT_TemplateCloser); + Tokens = annotate("return std::conditional_t<T::value == U::value, T, U>{};"); ASSERT_EQ(Tokens.size(), 21u) << Tokens; EXPECT_TOKEN(Tokens[4], tok::less, TT_TemplateOpener); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
