[clang] [clang] Make -dump-tokens option align tokens (PR #164894)

[Aaron Ballman via cfe-commits]

================
@@ -234,14 +235,21 @@ void Preprocessor::FinalizeForModelFile() {
 }
 
 void Preprocessor::DumpToken(const Token &Tok, bool DumpFlags) const {
-  llvm::errs() << tok::getTokenName(Tok.getKind());
+  llvm::errs() << llvm::formatv("{0,-16} ", tok::getTokenName(Tok.getKind()));
 
-  if (!Tok.isAnnotation())
-    llvm::errs() << " '" << getSpelling(Tok) << "'";
+  std::string Spelling;
+  if (!Tok.isAnnotation()) {
+    Spelling = "'" + getSpelling(Tok) + "'";
+  }
+
+  llvm::errs() << llvm::formatv("{0,-32} ", Spelling);
----------------
AaronBallman wrote:

Should this line be included in the `!Tok.isAnnotation()` block? Otherwise, we're intentionally printing an empty string?

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