commit e58775cbf509c2f63d95287cb698276b7c00eff3
author mydeveloperday <mydeveloperday@gmail.com> Thu Nov 25 08:30:31 2021 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Nov 25 00:51:05 2021 -0800
tree 41002a98a3c381e7804698955a4aa7d1a4587fbd
parent b97dcdfcc98b63a8dcd0fbddbc7f3d8978fca47d

[clang-format] [PR47936] AfterControlStatement: MultiLine breaks AllowShortFunctionsOnASingleLine

https://bugs.llvm.org/show_bug.cgi?id=47936

Using the MultiLine setting for BraceWrapping.AfterControlStatement appears to disable AllowShortFunctionsOnASingleLine, even in cases without any control statements

Reviewed By: HazardyKnusperkeks, curdeius

Differential Revision: https://reviews.llvm.org/D114521

GitOrigin-RevId: 72e4f4a2a117f97118692857d91210fc62c066b0

lib/Format/UnwrappedLineFormatter.cpp

diff --git a/lib/Format/UnwrappedLineFormatter.cpp b/lib/Format/UnwrappedLineFormatter.cpp
index 299536c..516b1bc 100644
--- a/lib/Format/UnwrappedLineFormatter.cpp
+++ b/lib/Format/UnwrappedLineFormatter.cpp
@@ -676,7 +676,7 @@
         // { <-- current Line
         //   baz();
         // }
-        if (Line.First == Line.Last &&
+        if (Line.First == Line.Last && Line.First->isNot(TT_FunctionLBrace) &&
             Style.BraceWrapping.AfterControlStatement ==
                 FormatStyle::BWACS_MultiLine)
           return 0;

unittests/Format/FormatTest.cpp

diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 8c8d7a4..096d6a3 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -2860,6 +2860,19 @@
             "  baz();\n"
             "}",
             format("try{foo();}catch(...){baz();}", Style));
+
+  Style.BraceWrapping.AfterFunction = true;
+  Style.BraceWrapping.AfterControlStatement = FormatStyle::BWACS_MultiLine;
+  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_All;
+  Style.ColumnLimit = 80;
+  verifyFormat("void shortfunction() { bar(); }", Style);
+
+  Style.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
+  verifyFormat("void shortfunction()\n"
+               "{\n"
+               "  bar();\n"
+               "}",
+               Style);
 }
 
 TEST_F(FormatTest, BeforeWhile) {