https://github.com/owenca created
https://github.com/llvm/llvm-project/pull/124438
Fixes #123144.
>From c401d699b756a54b2e7c9a1c00bcae005c9cae4d Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpi...@gmail.com>
Date: Sat, 25 Jan 2025 15:53:36 -0800
Subject: [PATCH] [clang-format] Treat `f<N | M>(a)` as template function call
Fixes #123144.
---
clang/lib/Format/TokenAnnotator.cpp | 7 +++----
clang/unittests/Format/TokenAnnotatorTest.cpp | 5 +++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index bc41d43d1438c5..a28e51e1d303c2 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -252,10 +252,9 @@ 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::ampamp, tok::pipepipe, tok::caret)) {
+ 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 10587449dcea95..c101290240ec7c 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -3671,6 +3671,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
