[clang] [clang-format] Fix short function merging with macro expansion (PR #204421)

[via cfe-commits]

r4nt wrote:

Thanks, I do understand the problem; what I don't yet understand is what triggers this not being merged when we run over the original tokens.

https://github.com/llvm/llvm-project/pull/204421