commit 20e15563fff92cb1568770dc2170a61a06a74018
author Daniel Jasper <djasper@google.com> Thu Apr 16 07:02:19 2015 +0000
committer Daniel Jasper <djasper@google.com> Thu Apr 16 07:02:19 2015 +0000
tree a2eb3e127e8f13d1e27ac3f41fd6ea57959a506d
parent f56f98c925521f4ed0f3b5adeb27e78477d96407

clang-format: Undo r214508. It was essentially always removing the
space where we already had the flag ObjCSpaceBeforeProtocolList to
control it. I don't know what I was thinking.

llvm-svn: 235076

clang/lib/Format/TokenAnnotator.cpp

diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index ff674e9..5b148ea 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1664,7 +1664,7 @@
   if (Right.isOneOf(tok::semi, tok::comma))
     return false;
   if (Right.is(tok::less) &&
-      (Left.isOneOf(tok::kw_template, tok::r_paren) ||
+      (Left.is(tok::kw_template) ||
        (Line.Type == LT_ObjCDecl && Style.ObjCSpaceBeforeProtocolList)))
     return true;
   if (Left.isOneOf(tok::exclaim, tok::tilde))