diff options
| author | Owen Pan <owenpiano@gmail.com> | 2025-01-27 09:28:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-27 09:28:29 -0800 |
| commit | 1e89355dadce13a162882b58a0e7f181669ba65f (patch) | |
| tree | 5fab951fa6f1e6be1f3742187b19a2af3afab4e9 | |
| parent | 44c9e46fce12badae8cd3f5bd53fe1c2b1248940 (diff) | |
| download | llvm-1e89355dadce13a162882b58a0e7f181669ba65f.zip llvm-1e89355dadce13a162882b58a0e7f181669ba65f.tar.gz llvm-1e89355dadce13a162882b58a0e7f181669ba65f.tar.bz2 | |
[clang-format] Treat `f<N | M>(a)` as template function call (#124438)
Fixes #123144.
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 8 | ||||
| -rw-r--r-- | clang/unittests/Format/TokenAnnotatorTest.cpp | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 6557661..08fda7a 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -252,10 +252,10 @@ private: // 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 585878e..fc77e27 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); |