================ Comment at: lib/Format/Format.cpp:210 @@ -222,1 +209,3 @@ + if (Current >= TokEnd || *Current != ' ') + return; } else { ---------------- Is "giving up" entirely really the right option? Why not outdent as much as we can? http://llvm-reviews.chandlerc.com/D544