[clang-format] Correctly annotate overloaded operator function name

[owenpan]

Summary

The operator keyword preceded by a template closer should be annotated as TT_FunctionDeclarationName.

Fixes https://github.com/llvm/llvm-project/issues/63879.

[rymiel]

Was caused by 3f3620e5c9ee0f7b64afc39e5a26c6f4cc5e7b37, thank you for fixing it up!

clang/lib/Format/TokenAnnotator.cpp

static bool isFunctionDeclarationName(bool IsCpp, const FormatToken &Current,
   // Find parentheses of parameter list.
   const FormatToken *Next = Current.Next;
   if (Current.is(tok::kw_operator)) {
     const auto *Previous = Current.Previous;
     if (Previous->Tok.getIdentifierInfo() &&
         !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 {
     if (!Current.is(TT_StartOfName) || Current.NestingLevel != 0)
       return false;
     for (; Next; Next = Next->Next) {
       if (Next->is(TT_TemplateOpener) && Next->MatchingParen) {
         Next = Next->MatchingParen;

clang/unittests/Format/TokenAnnotatorTest.cpp

Tokens = annotate("class Foo {\n"
                     "    operator+(a * b);\n"
                     "  }\n"
                     "}");
   ASSERT_EQ(Tokens.size(), 19u) << Tokens;
   EXPECT_TOKEN(Tokens[8], tok::kw_operator, TT_Unknown);
   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) {
   struct {
     const char *Text;
     tok::TokenKind Kind;
   } Operators[] = {{"+", tok::plus},
                    {"-", tok::minus},