clang-format: Re-add code path deleted in r253873 and add missing test.

llvm-svn: 253900
2 files changed