incorrect indentation with clang-format's AlignConsecutiveAssignments: true

[zmodem]

Consider:

$ cat /tmp/a.cc
#if A
bool thisisalongvariablename = true;
#else
bool thisisalongvariablename = false;
#endif

#if B
bool shortervarname = true;
#else
bool shortervarname = false;
#endif

void foo() {
#if C
#else
  if (bar) {
    baz();
  }
#endif
}

$ build.release/bin/clang-format -style="{AlignConsecutiveAssignments: true}" /tmp/a.cc 
#if A
bool thisisalongvariablename = true;
#else
bool thisisalongvariablename = false;
#endif

#if B
bool shortervarname = true;
#else
bool shortervarname          = false;
#endif

void foo() {
#if C
#else
  if (bar) {
             baz();
  }
#endif
}

Note that the second assignment to shortervarname gets aligned, but not the first one.
And the indentation for baz() is wrong.
The issues seem to be connected.

[llvmbot]

@llvm/issue-subscribers-clang-format

[zmodem]

The indentation of baz() regressed in 5109737

The missing alignment of the first assignment to "shortervarname" seems to go way back. I couldn't find a version where that worked.

[owenca]

Can you create a separate issue for the misindentation of baz()?

[llvmbot]

@llvm/issue-subscribers-bug

[zmodem]

Can you create a separate issue for the misindentation of baz()?

I split out the bad alignment instead, to #55265

Here's a slightly shorter repro for the misindentation problem:

$ cat /tmp/a.cc
#if A
#else
bool thisisalongvariablename = false;
#endif

#if B
#else
bool shortervarname = false;
#endif

void foo() {
#if C
#else
  if (bar) {
    baz();
  }
#endif
}

$ build.release/bin/clang-format -style="{AlignConsecutiveAssignments: true}" /tmp/a.cc
#if A
#else
bool thisisalongvariablename = false;
#endif

#if B
#else
bool shortervarname          = false;
#endif

void foo() {
#if C
#else
  if (bar) {
             baz();
  }
#endif
}

[owenca]

Thanks for splitting the bugs!

[owenca]

https://reviews.llvm.org/D124956