[clang-format] Align different categories together (llvm#172242)

How the program figured out which lines to move along the aligned lines
changed in 75c85ba. Aligning the lines caused the information to
be out of date for aligning different categories later on. It caused a
regression.

Fixes llvm#171021.

new, with the options `AlignConsecutiveAssignments` and
`AlignConsecutiveDeclarations` enabled

```C++
const char *const MatHtoolCompressorTypes[] = {"sympartialACA", "fullACA",
                                               "SVD"};
const char        HtoolCitation[]           = "@Article{marchand2020two,\n"
                                              "  "
                                              "  "
                                              "  "
                                              "}\n";
```

old

```C++
const char *const MatHtoolCompressorTypes[] = {"sympartialACA", "fullACA"};
const char        HtoolCitation[]           = "@Article{marchand2020two,\n"
                                    "  "
                                    "  "
                                    "  "
                                    "}\n";
```

Author: sstwcw

clang/lib/Format/WhitespaceManager.cpp

@@ -372,6 +372,7 @@ AlignTokenSequence(const FormatStyle &Style, unsigned Start, unsigned End,
         (ScopeStack.size() == 1u && CurrentChange.NewlinesBefore > 0 &&
          InsideNestedScope)) {
       LineShifted = true;
+      CurrentChange.IndentedFromColumn += Shift;
       CurrentChange.Spaces += Shift;
     }
 

clang/unittests/Format/FormatTest.cpp

@@ -20879,6 +20879,14 @@ TEST_F(FormatTest, AlignWithLineBreaks) {
                "                   };",
                Style);
 
+  verifyFormat("const char *const MatHtool[] = {};\n"
+               "const char        Htool[]    = \"@article{m,\\n\"\n"
+               "                               \" \"\n"
+               "                               \" \"\n"
+               "                               \" \"\n"
+               "                               \"}\\n\";",
+               Style);
+
   Style.ColumnLimit = 15;
   verifyFormat("int i1 = 1;\n"
                "k      = bar(\n"