[clang-format] Fix misattributing preprocessor directives to macros

[jacob-abraham]

Summary

This solves the issue I documented at https://github.com/llvm/llvm-project/issues/58214.

Essentially, a case statement inside a macro greedily adds preprocessor lines such as #include to the macro, even if they are not a part of the macro to begin with. Short quick fix. I tried to do it cleanly, but this was my first attempt at patching clang-format so if there is a cleaner/better way to fix this that would be awesome!

[HazardyKnusperkeks]

Please add a regression test.

[jacob-abraham]

Added regression test

[jacob-abraham]

Fix patch, sorry about that

[HazardyKnusperkeks]

The clang-format tests are (mainly) in clang/unittests/Format/FormatTest.cpp, please put it there.
You should have a Format-Tests (or similar) build target.

[jacob-abraham]

fixed unit tests

[owenpan]

clang/unittests/Format/FormatTest.cpp

2986–2990 ↗

(On Diff #466386)

We can move it down to take advantage of the shorter ColumnLimit.

3006 ↗

(On Diff #466386)

We usually don't append a newline at the end of a test case.

[jacob-abraham]

I do not have commit access, can someone make this commit on my behalf? Thank you!

[owenpan]

LGTM.

In D135422#3847053, @jacob-abraham wrote:

I do not have commit access, can someone make this commit on my behalf? Thank you!

We need your name and email address for the authorship.

[jacob-abraham]

We need your name and email address for the authorship.

Name: Jacob Abraham
Email: [e-mail]

[owenpan]

clang/lib/Format/UnwrappedLineFormatter.cpp

654 ↗

(On Diff #466522)

Did you run git-clang-format?

clang/test/Format/macro.cpp

+// RUN: clang-format -style="{AllowShortCaseLabelsOnASingleLine: true}" %s > %t
+// RUN: diff %s %t
+#define X                                                                      \
+  case 0: break;
+#include "f"