[clang-format] Fix aligning with linebreaks #2

[HazardyKnusperkeks]

Summary

This amends c5243c63cda3c740d6e9c7e501f6518c21688da3 to fix formatting continued function calls with BinPacking = false.

[curdeius]

LGTM! That was quick! Thanks.
Please wait for @baramin to validate the fix before landing.

[baramin]

LGTM!
It solves my problem.
Thanks!

[curdeius]

This bug fix should probably be cherry-picked into 13.x branch. WDYT?

[HazardyKnusperkeks]

In D106773#2912732, @curdeius wrote:

This bug fix should probably be cherry-picked into 13.x branch. WDYT?

Yeah, I wrote already an email about it. Or can (and should) I push it myself?

[curdeius]

In D106773#2912925, @HazardyKnusperkeks wrote:

In D106773#2912732, @curdeius wrote:

This bug fix should probably be cherry-picked into 13.x branch. WDYT?

Yeah, I wrote already an email about it. Or can (and should) I push it myself?

I think we should ask @tstellar for permission before cherry-picking.

[HazardyKnusperkeks]

It's picked: 0e3777bb0ad94ecd1429dc96409177cdccf39bdd

clang/lib/Format/WhitespaceManager.cpp

if (InsideNestedScope && Changes[i].NewlinesBefore > 0) {
         if (ScopeStart > Start + 1 &&
             Changes[ScopeStart - 2].Tok->is(TT_FunctionDeclarationName))
           return true;
 
         // Continued function call
         if (ScopeStart > Start + 1 &&
             Changes[ScopeStart - 2].Tok->is(tok::identifier) &&
             Changes[ScopeStart - 1].Tok->is(tok::l_paren))
-          return true;
+          return Style.BinPackArguments;
 
         // Ternary operator
         if (Changes[i].Tok->is(TT_ConditionalExpr))
           return true;
 
         // Period Initializer .XXX = 1.
         if (Changes[i].Tok->is(TT_DesignatedInitializerPeriod))
           return true;

clang/unittests/Format/FormatTest.cpp

verifyFormat("void foo() {\n"
                "  const int  capacityBefore = Entries.capacity();\n"
                "  const auto newEntry       = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
                "                                                  std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
                "  const X    newEntry2      = Entries.emplaceHint(std::piecewise_construct, std::forward_as_tuple(uniqueId),\n"
                "                                                  std::forward_as_tuple(id, uniqueId, name, threadCreation));\n"
                "}",
                Style);
   // clang-format on
+
+  Style = getLLVMStyleWithColumns(120);
+  Style.AlignConsecutiveAssignments = FormatStyle::ACS_Consecutive;
+  Style.ContinuationIndentWidth = 4;
+  Style.IndentWidth = 4;
+
+  // clang-format off
+  verifyFormat("void SomeFunc() {\n"
+               "    newWatcher.maxAgeUsec = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec),\n"
+               "                                                        seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
+               "    newWatcher.maxAge     = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec),\n"
+               "                                                        seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
+               "    newWatcher.max        = ToLegacyTimestamp(GetMaxAge(FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec),\n"
+               "                                                        seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
+               "}",
+               Style);
+  // clang-format on
+
+  Style.BinPackArguments = false;
+
+  // clang-format off
+  verifyFormat("void SomeFunc() {\n"
+               "    newWatcher.maxAgeUsec = ToLegacyTimestamp(GetMaxAge(\n"
+               "        FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
+               "    newWatcher.maxAge     = ToLegacyTimestamp(GetMaxAge(\n"
+               "        FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
+               "    newWatcher.max        = ToLegacyTimestamp(GetMaxAge(\n"
+               "        FromLegacyTimestamp<milliseconds>(monitorFrequencyUsec), seconds(std::uint64_t(maxSampleAge)), maxKeepSamples));\n"
+               "}",
+               Style);
+  // clang-format on
 }
 
 TEST_F(FormatTest, AlignWithInitializerPeriods) {
   auto Style = getLLVMStyleWithColumns(60);
 
   verifyFormat("void foo1(void) {\n"
                "  BYTE p[1] = 1;\n"
                "  A B = {.one_foooooooooooooooo = 2,\n"