Address comments.

LGTM. Thanks for addressing my comments.

LGTM with Owen's suggestion.

Does this patch really fix https://github.com/llvm/llvm-project/issues/54703?
If so, please add test for it. Otherwise remove the link from the summary (and if possible handle it in another review).

It seems like a breaking change that may be painful for users of GNU style. @MyDeveloperDay, wdyt?

Good finding!

LGTM.

Still looks good. Was there a particular case where the previous version didn't work?

@Eitot, do you need help landing this?

LGTM. Thanks!

Apart from some missing tests, looks promising!

Great!

Ok, I'm not blocking this patch. I'll take a look to see whether we can add some tests.

LGTM. Good catch for this bug!

LGTM. Thanks a lot!
Do you have commit rights or need some help landing this?

LGTM.

Would it be possible to add a test please?

Could you please add test cases with non-empty enums both with and without comments please like in the bug report?

Closing as it landed in https://github.com/llvm/llvm-project/commit/130a9cc0a5e25e3be8ff3738518e86ae3ae0b5ba.

Ok. So we mainly missed braces on complex conditionals. LGTM.

LGTM. It seems it has landed already.

If you can think of other cases that may misbehave, I'll be happy to test (and fix) these.

Thanks! LGTM.

In D125961#3527452, @thieta wrote:

In D125961#3527447, @curdeius wrote:

Thanks for the patch!
Could you please add a unit test in unittest/Format/FormatTest.cpp instead of in lit-based test/?
Is there a bug report that your patch fixes?

Sure - I didn't know clang-format used unittests instead.

Thanks for the patch!
Could you please add a unit test in unittest/Format/FormatTest.cpp instead of in lit-based test/?
Is there a bug report that your patch fixes?

LGTM

Reverted for now.

In D123676#3515949, @krasimir wrote:

It looks like this regressed the following example by adding an unwanted level of indentation to the #elif B branch:

Sure, I'll have a look.
It seems that even this:

MACRO_BEGIN
#if A
int f();
#else
int f();
#endif

gets misindented:

MACRO_BEGIN
#if A
int f();
#else
    int
    f();
#endif

LGTM. I like it! Thanks!

LGTM. Good finding!

LGTM. Tell us if you need help landing this.
Thanks a lot for your contribution!

LGTM with nits.

Do you need help landing this?

Thanks for creating the bug report. A few more comments.

Address comment: simplify.

FYI, I like to have a bug report because people that encounter the same problem (in an older release) can find it easily, and see if/when it was fixed. It also avoid working on the same thing by different people.

Thanks for working on this!
Is there a bug report somewhere? If not, may you create one please?

Simplify. Address comments.

LGTM

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

LGTM!

Looks ok, but please let someone else have a look too.

LGTM.

Feel free to revert and add a regression test please. I'll take a look.