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!
Did you run git-clang-format?