maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

clang-format: Recognize more ObjC blocks with parameters/return type. 

llvm-svn: 204990
This commit is contained in:
Daniel Jasper 2014-03-28 07:48:59 +00:00
parent ba539d8dc8
commit 395193c7a0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/Format/UnwrappedLineParser.cpp
View File

@ -694,9 +694,13 @@ void UnwrappedLineParser::parseStructuralElement() {
break; break;
case tok::caret: case tok::caret:
nextToken(); nextToken();
if (FormatTok->is(tok::l_brace)) { if (FormatTok->Tok.isAnyIdentifier() ||
FormatTok->isSimpleTypeSpecifier())
nextToken();
if (FormatTok->is(tok::l_paren))
parseParens();
if (FormatTok->is(tok::l_brace))
parseChildBlock(); parseChildBlock();
}
break; break;
case tok::l_brace: case tok::l_brace:
if (!tryToParseBracedList()) { if (!tryToParseBracedList()) {

4
clang/unittests/Format/FormatTest.cpp
View File

@ -8125,6 +8125,10 @@ TEST_F(FormatTest, FormatsLambdas) {
TEST_F(FormatTest, FormatsBlocks) { TEST_F(FormatTest, FormatsBlocks) {
verifyFormat("int (^Block)(int, int);"); verifyFormat("int (^Block)(int, int);");
verifyFormat("int (^Block1)(int, int) = ^(int i, int j)"); verifyFormat("int (^Block1)(int, int) = ^(int i, int j)");
verifyFormat("void (^block)(int) = ^(id test) { int i; };");
verifyFormat("void (^block)(int) = ^(int test) { int i; };");
verifyFormat("void (^block)(int) = ^id(int test) { int i; };");
verifyFormat("void (^block)(int) = ^int(int test) { int i; };");
verifyFormat("foo(^{ bar(); });"); verifyFormat("foo(^{ bar(); });");
verifyFormat("foo(a, ^{ bar(); });"); verifyFormat("foo(a, ^{ bar(); });");