commit b96e7b21f5757f675418734cc3a0de34ea491efa
author Owen Pan <owenpiano@gmail.com> Sat Jan 04 16:24:41 2025 -0800
committer Copybara-Service <copybara-worker@google.com> Sat Jan 04 16:26:29 2025 -0800
tree 4afce42c88db3cdcf7dbb01222c08ae4255bb9df
parent dc32e6d0a1a5bdbddc872cf3d9660d61b3aae79b

[clang-format] Don't break short macro call followed by l_paren (#121626)

Fixes #105658.

GitOrigin-RevId: c1ea05eaf0fbe4b539952689dbf9f0df716c72e7

lib/Format/UnwrappedLineParser.cpp

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 46fd566..39aa37a 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -2044,7 +2044,9 @@
                 ? FormatTok->NewlinesBefore > 0
                 : CommentsBeforeNextToken.front()->NewlinesBefore > 0;
 
-        if (FollowedByNewline && (Text.size() >= 5 || FunctionLike) &&
+        if (FollowedByNewline &&
+            (Text.size() >= 5 ||
+             (FunctionLike && FormatTok->isNot(tok::l_paren))) &&
             tokenCanStartNewLine(*FormatTok) && Text == Text.upper()) {
           if (PreviousToken->isNot(TT_UntouchableMacroFunc))
             PreviousToken->setFinalizedType(TT_FunctionLikeOrFreestandingMacro);

unittests/Format/FormatTest.cpp

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 44b9dba..4d48bca 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -5887,6 +5887,11 @@
   verifyFormat("SOME_WEIRD_LOG_MACRO << SomeThing;", "SOME_WEIRD_LOG_MACRO\n"
                                                      "<< SomeThing;");
 
+  verifyFormat("GGGG(ffff(xxxxxxxxxxxxxxxxxxxx)->yyyyyyyyyyyyyyyyyyyy)(foo);",
+               "GGGG(ffff(xxxxxxxxxxxxxxxxxxxx)->yyyyyyyyyyyyyyyyyyyy)\n"
+               "(foo);",
+               getLLVMStyleWithColumns(60));
+
   verifyFormat("VISIT_GL_CALL(GenBuffers, void, (GLsizei n, GLuint* buffers), "
                "(n, buffers))",
                getChromiumStyle(FormatStyle::LK_Cpp));