Author: Owen Pan Date: 2023-09-27T13:12:55-07:00 New Revision: 67b99fa8ba638edddd5ce38b4d379eab8e339e4a
URL: https://github.com/llvm/llvm-project/commit/67b99fa8ba638edddd5ce38b4d379eab8e339e4a DIFF: https://github.com/llvm/llvm-project/commit/67b99fa8ba638edddd5ce38b4d379eab8e339e4a.diff LOG: [clang-format] Correctly annotate keyword operator function name (#66904) Fixes #66890. 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 95d039b459b43e8..e86e9b89bcde766 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -3302,6 +3302,12 @@ static bool isFunctionDeclarationName(bool IsCpp, const FormatToken &Current, !Previous->isOneOf(tok::kw_return, tok::kw_co_return)) { return true; } + if (Previous->is(tok::r_paren) && Previous->is(TT_TypeDeclarationParen)) { + assert(Previous->MatchingParen); + assert(Previous->MatchingParen->is(tok::l_paren)); + assert(Previous->MatchingParen->is(TT_TypeDeclarationParen)); + return true; + } if (!Previous->isOneOf(tok::star, tok::amp, tok::ampamp, TT_TemplateCloser)) return false; Next = skipOperatorName(Next); diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 204b00dd09f04d1..98b63d44b78c7c9 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -753,6 +753,16 @@ TEST_F(TokenAnnotatorTest, UnderstandsOverloadedOperators) { 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); + + Tokens = annotate("decltype(auto) operator()(T &x);"); + ASSERT_EQ(Tokens.size(), 14u) << Tokens; + EXPECT_TOKEN(Tokens[1], tok::l_paren, TT_TypeDeclarationParen); + EXPECT_TOKEN(Tokens[3], tok::r_paren, TT_TypeDeclarationParen); + EXPECT_TOKEN(Tokens[4], tok::kw_operator, TT_FunctionDeclarationName); + EXPECT_TOKEN(Tokens[5], tok::l_paren, TT_OverloadedOperator); + EXPECT_TOKEN(Tokens[6], tok::r_paren, TT_OverloadedOperator); + EXPECT_TOKEN(Tokens[7], tok::l_paren, TT_OverloadedOperatorLParen); + EXPECT_TOKEN(Tokens[9], 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
