Commit a6cbdae9 authored by Owen Pan's avatar Owen Pan Committed by Tobias Hieta
Browse files

[clang-format] Correctly annotate keyword operator function name (#66904) 

Fixes #66890.

(cherry picked from commit 67b99fa8)
parent 094cfd14

clang/lib/Format/TokenAnnotator.cpp

+6 −0
Original line number Diff line number Diff line
@@ -3178,6 +3178,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);

clang/unittests/Format/TokenAnnotatorTest.cpp

+10 −0
Original line number Diff line number Diff line
@@ -740,6 +740,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) {