[clang-format] Annotate ::operator and Foo::operator correctly

[owenca]

This effectively reverts commit b5f6689 and fixes #111011 more narrowly.

Fixes #160513

[llvmbot]

@llvm/pr-subscribers-clang-format

Author: owenca (owenca)

Changes

This effectively reverts commit b5f6689 and fixes #111011 more narrowly.

Fixes #160513

---

Full diff: https://github.com/llvm/llvm-project/pull/164048.diff

2 Files Affected:

• (modified) clang/lib/Format/TokenAnnotator.cpp (+3-7)
• (modified) clang/unittests/Format/TokenAnnotatorTest.cpp (+5)

diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 5b784eded4601..ffbd3839e8eb7 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -3794,18 +3794,12 @@ static bool isFunctionDeclarationName(const LangOptions &LangOpts,
   if (Current.is(TT_FunctionDeclarationName))
     return true;
 
-  if (!Current.Tok.getIdentifierInfo())
+  if (Current.isNoneOf(tok::identifier, tok::kw_operator))
     return false;
 
   const auto *Prev = Current.getPreviousNonComment();
   assert(Prev);
 
-  if (Prev->is(tok::coloncolon))
-    Prev = Prev->Previous;
-
-  if (!Prev)
-    return false;
-
   const auto &Previous = *Prev;
 
   if (const auto *PrevPrev = Previous.getPreviousNonComment();
@@ -3854,6 +3848,8 @@ static bool isFunctionDeclarationName(const LangOptions &LangOpts,
 
   // Find parentheses of parameter list.
   if (Current.is(tok::kw_operator)) {
+    if (Line.startsWith(tok::kw_friend))
+      return true;
     if (Previous.Tok.getIdentifierInfo() &&
         Previous.isNoneOf(tok::kw_return, tok::kw_co_return)) {
       return true;
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp
index 1152466b0179f..100251514a4bd 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -1129,6 +1129,11 @@ TEST_F(TokenAnnotatorTest, UnderstandsOverloadedOperators) {
   ASSERT_EQ(Tokens.size(), 7u) << Tokens;
   // Not TT_FunctionDeclarationName.
   EXPECT_TOKEN(Tokens[3], tok::kw_operator, TT_Unknown);
+
+  Tokens = annotate("SomeAPI::operator()();");
+  ASSERT_EQ(Tokens.size(), 9u) << Tokens;
+  // Not TT_FunctionDeclarationName.
+  EXPECT_TOKEN(Tokens[2], tok::kw_operator, TT_Unknown);
 }
 
 TEST_F(TokenAnnotatorTest, OverloadedOperatorInTemplate) {

[PiJoules]

I believe this introduced a regression in clang-format. Prior to this commit, the following code would remain unchanged

::test_anonymous::FunctionApplication& ::test_anonymous::FunctionApplication::operator=(const ::test_anonymous::FunctionApplication& other) noexcept {
  storage_ = other.CloneStorage_();
  return *this;
}

with clang-format --style='{BasedOnStyle: google, ColumnLimit: 0}' /tmp/test.cc. With this commit it becomes

::test_anonymous::FunctionApplication& ::test_anonymous::FunctionApplication::operator=(const ::test_anonymous::FunctionApplication & other) noexcept {
  storage_ = other.CloneStorage_();                                                                                                                                                                                                                                                       
  return *this;                                                                                                                                                                                                                                                                           
}                       

with a space inserted in the function parameter. Could you send out a fix or revert?

[owenca]

@PiJoules unfortunately, this has been backported to 21.1.4, but I will come up with a fix in the next few days.

@HazardyKnusperkeks we may have to use the space (or the lack of) before ::operator as a hint from the user after all.

[HazardyKnusperkeks]

@PiJoules unfortunately, this has been backported to 21.1.4, but I will come up with a fix in the next few days.

@HazardyKnusperkeks we may have to use the space (or the lack of) before ::operator as a hint from the user after all.

Yeah ok... but at least add a fixme test.