[clang-format] Fix another bug in AlignConsecutiveAssignments

[owenpan]

Summary

Similar to D124868.

The ShouldShiftBeAdded lambda checks if extra space should be
added before the wrapped part of a braced list. If the first
element of the list is wrapped, no extra space should be added.

Fixes https://github.com/llvm/llvm-project/issues/55161.

[curdeius]

LGTM!

[curdeius]

Just one last thought, shouldn't we have a test case close to what was reported in the issue? I.e. with PP directives.

[owenpan]

No, because the first part of that test case would cause non-consecutive assignments to be aligned. (See https://github.com/llvm/llvm-project/issues/55265.) Only then would the if block be treated as a braced list and get misindented. We should definitely use test cases with PP directives when fixing #55265 though.

clang/lib/Format/WhitespaceManager.cpp

if (InsideNestedScope && Changes[i].NewlinesBefore > 0) {
             Changes[ScopeStart - 1].Tok->is(tok::l_brace) &&
             Changes[i].Tok->isNot(tok::r_brace)) {
           for (unsigned OuterScopeStart : llvm::reverse(ScopeStack)) {
             // Lambda.
             if (OuterScopeStart > Start &&
                 Changes[OuterScopeStart - 1].Tok->is(TT_LambdaLBrace))
               return false;
           }
+          if (Changes[ScopeStart].NewlinesBefore > 0)
+            return false;
           return true;
         }
 
         return false;
       };
 
       if (ShouldShiftBeAdded())
         Changes[i].Spaces += Shift;

clang/unittests/Format/FormatTest.cpp

verifyFormat("void foo() {\n"
                "    int i1 = 1;\n"
                "    int j  = 0;\n"
                "    int k  = bar(\n"
                "        argument1,\n"
                "        argument2);\n"
                "}",
                Style);
 
+  verifyFormat("unsigned i = 0;\n"
+               "int a[]    = {\n"
+               "    1234567890,\n"
+               "    -1234567890};",
+               Style);
+
   Style.ColumnLimit = 120;
 
   // 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"