OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Daniel Jasper 2015-04-16 07:02:19 +00:00
parent f56f98c925
commit 20e15563ff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/Format/TokenAnnotator.cpp
View File

@ -1664,7 +1664,7 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
if (Right.isOneOf(tok::semi, tok::comma)) if (Right.isOneOf(tok::semi, tok::comma))
return false; return false;
if (Right.is(tok::less) && if (Right.is(tok::less) &&
(Left.isOneOf(tok::kw_template, tok::r_paren) || (Left.is(tok::kw_template) ||
(Line.Type == LT_ObjCDecl && Style.ObjCSpaceBeforeProtocolList))) (Line.Type == LT_ObjCDecl && Style.ObjCSpaceBeforeProtocolList)))
return true; return true;
if (Left.isOneOf(tok::exclaim, tok::tilde)) if (Left.isOneOf(tok::exclaim, tok::tilde))