================ Comment at: lib/Format/Format.cpp:800 @@ -794,1 +799,3 @@ } + if (Tok.is(tok::unknown)) { + for (unsigned i = 0, e = Tok.TokenText.size(); i < e; ++i) ---------------- I'd merge this with the upper if; they look strongly correlated. http://llvm-reviews.chandlerc.com/D1858