[clang-format] handle trailing comments in function definition detection

[krasimir]

Summary

A follow-up to
https://github.com/llvm/llvm-project/commit/f6bc614546e169bb1b17a29c422ebace038e6c62
where we handle the case where the semicolon is followed by a trailing
comment.

[MyDeveloperDay]

LGTM

[owenpan]

I thought of it last time but didn't try hard to come up with a test case that would make a difference. :( Thanks for finding the hole!

[owenpan]

clang/lib/Format/TokenAnnotator.cpp

2486–2487

if (Next->Next && Next->Next->is(tok::identifier) &&
    !Line.endsWith(tok::semi))
  return true;

[krasimir]

• apply reviewer suggestion

clang/lib/Format/TokenAnnotator.cpp

if (Next->MatchingParen->Next &&
       Next->MatchingParen->Next->is(TT_PointerOrReference))
     return true;
   // Check for K&R C function definitions, e.g.:
   //   int f(i)
   //   {
   //     return i + 1;
   //   }
   if (Next->Next && Next->Next->is(tok::identifier) &&
-      Line.Last->isNot(tok::semi))
+      !Line.endsWith(tok::semi))
     return true;
   for (const FormatToken *Tok = Next->Next; Tok && Tok != Next->MatchingParen;
        Tok = Tok->Next) {
     if (Tok->is(TT_TypeDeclarationParen))
       return true;
     if (Tok->isOneOf(tok::l_paren, TT_TemplateOpener) && Tok->MatchingParen) {
       Tok = Tok->MatchingParen;
       continue;
     }
     if (Tok->is(tok::kw_const) || Tok->isSimpleTypeSpecifier() ||

clang/unittests/Format/FormatTest.cpp

verifyFormat("int f(a, b, c);\n" // No break here.
                "  return a + b < c;\n"
                "};",
                Style);
   // The return breaking style doesn't affect object definitions with
   // attribute-like macros.
   verifyFormat("Tttttttttttttttttttttttt ppppppppppppppp\n"
                "    ABSL_GUARDED_BY(mutex) = {};",
                getGoogleStyleWithColumns(40));
+  verifyFormat("Tttttttttttttttttttttttt ppppppppppppppp\n"
+               "    ABSL_GUARDED_BY(mutex);  // comment",
+               getGoogleStyleWithColumns(40));
 
   Style = getGNUStyle();
 
   // Test for comments at the end of function declarations.
   verifyFormat("void\n"
                "foo (int a, /*abc*/ int b) // def\n"
                "{\n"
                "}\n",