[PATCH] D43906: [clang-format] Improve detection of Objective-C block types
Ben Hamilton via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Mar 5 15:30:46 PST 2018
benhamilton updated this revision to Diff 137095.
benhamilton marked 2 inline comments as done.
benhamilton added a comment.
- Fix comments from @djasper and @krasimir.
Repository:
rC Clang
https://reviews.llvm.org/D43906
Files:
lib/Format/TokenAnnotator.cpp
unittests/Format/FormatTest.cpp
Index: unittests/Format/FormatTest.cpp
===================================================================
--- unittests/Format/FormatTest.cpp
+++ unittests/Format/FormatTest.cpp
@@ -7695,6 +7695,11 @@
verifyGoogleFormat("- foo:(int)foo;");
}
+TEST_F(FormatTest, ObjCBlockTypesAndVariables) {
+ verifyFormat("void DoStuffWithBlockType(int (^)(char));");
+ verifyFormat("int (^foo)(char, float);");
+ verifyFormat("int (^foo[10])(char, float);");
+}
TEST_F(FormatTest, BreaksStringLiterals) {
EXPECT_EQ("\"some text \"\n"
@@ -12159,6 +12164,16 @@
"for (const Foo<Bar>& baz = in.value(); !baz.at_end(); ++baz) {}"));
}
+TEST_F(FormatTest, GuessLanguageWithCaret) {
+ EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", "FOO(^);"));
+ EXPECT_EQ(FormatStyle::LK_ObjC,
+ guessLanguage("foo.h", "int(^)(char, float);"));
+ EXPECT_EQ(FormatStyle::LK_ObjC,
+ guessLanguage("foo.h", "int(^foo)(char, float);"));
+ EXPECT_EQ(FormatStyle::LK_ObjC,
+ guessLanguage("foo.h", "int(^foo[10])(char, float);"));
+}
+
} // end namespace
} // end namespace format
} // end namespace clang
Index: lib/Format/TokenAnnotator.cpp
===================================================================
--- lib/Format/TokenAnnotator.cpp
+++ lib/Format/TokenAnnotator.cpp
@@ -142,8 +142,20 @@
bool StartsObjCMethodExpr = false;
if (CurrentToken->is(tok::caret)) {
- // (^ can start a block type.
- Left->Type = TT_ObjCBlockLParen;
+ const FormatToken *Next = CurrentToken->getNextNonComment();
+ if (Next &&
+ // int (^)(char, float)
+ (Next->startsSequence(tok::r_paren, tok::l_paren) ||
+ // int (^blockReturningIntWithCharAndFloatArguments)(char, float)
+ Next->startsSequence(tok::identifier, tok::r_paren, tok::l_paren) ||
+ // int
+ // (^arrayOfTenBlocksReturningIntWithCharAndFloatArguments[10])(char,
+ // float)
+ Next->startsSequence(tok::identifier, tok::l_square,
+ tok::numeric_constant, tok::r_square,
+ tok::r_paren, tok::l_paren))) {
+ Left->Type = TT_ObjCBlockLParen;
+ }
} else if (FormatToken *MaybeSel = Left->Previous) {
// @selector( starts a selector.
if (MaybeSel->isObjCAtKeyword(tok::objc_selector) && MaybeSel->Previous &&
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D43906.137095.patch
Type: text/x-patch
Size: 2395 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20180305/2c5bb485/attachment.bin>
More information about the cfe-commits
mailing list