Author: Owen Pan Date: 2023-07-15T11:02:31-07:00 New Revision: cc2ff02eadede988ab890b2d0f428bd1531a3803
URL: https://github.com/llvm/llvm-project/commit/cc2ff02eadede988ab890b2d0f428bd1531a3803 DIFF: https://github.com/llvm/llvm-project/commit/cc2ff02eadede988ab890b2d0f428bd1531a3803.diff LOG: [clang-format] Correctly annotate overloaded operator function name The operator keyword preceded by a template closer should be annotated as TT_FunctionDeclarationName. Fixes #63879. Differential Revision: https://reviews.llvm.org/D155358 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 52973a3ec95171..fbcc3a03ba56ae 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -3175,7 +3175,7 @@ static bool isFunctionDeclarationName(bool IsCpp, const FormatToken &Current, !Previous->isOneOf(tok::kw_return, tok::kw_co_return)) { return true; } - if (!Previous->isOneOf(tok::star, tok::amp, tok::ampamp)) + if (!Previous->isOneOf(tok::star, tok::amp, tok::ampamp, TT_TemplateCloser)) return false; Next = skipOperatorName(Next); } else { diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 8767b97c94de27..fd42dfded83e5f 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -717,6 +717,16 @@ TEST_F(TokenAnnotatorTest, UnderstandsOverloadedOperators) { EXPECT_TOKEN(Tokens[9], tok::plus, TT_OverloadedOperator); EXPECT_TOKEN(Tokens[10], tok::l_paren, TT_OverloadedOperatorLParen); EXPECT_TOKEN(Tokens[12], tok::star, TT_BinaryOperator); + + Tokens = annotate("std::vector<Foo> operator()(Foo &foo);"); + ASSERT_EQ(Tokens.size(), 16u) << Tokens; + EXPECT_TOKEN(Tokens[3], tok::less, TT_TemplateOpener); + EXPECT_TOKEN(Tokens[5], tok::greater, TT_TemplateCloser); + EXPECT_TOKEN(Tokens[6], tok::kw_operator, TT_FunctionDeclarationName); + EXPECT_TOKEN(Tokens[7], tok::l_paren, TT_OverloadedOperator); + EXPECT_TOKEN(Tokens[8], tok::r_paren, TT_OverloadedOperator); + EXPECT_TOKEN(Tokens[9], tok::l_paren, TT_OverloadedOperatorLParen); + EXPECT_TOKEN(Tokens[11], tok::amp, TT_PointerOrReference); } TEST_F(TokenAnnotatorTest, OverloadedOperatorInTemplate) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
