diff options
| author | Ben Hamilton <benhamilton@google.com> | 2018-04-12 15:11:53 +0000 |
|---|---|---|
| committer | Ben Hamilton <benhamilton@google.com> | 2018-04-12 15:11:53 +0000 |
| commit | b1a7919e4cd0175ec08a3efb3c183913e21628ba (patch) | |
| tree | ab97db7fdf2e944b8d15c8088a4d7b1690058fe5 | |
| parent | df72e9851a33d137de1d323c06feea3faf16deb3 (diff) | |
| download | bcm5719-llvm-b1a7919e4cd0175ec08a3efb3c183913e21628ba.tar.gz bcm5719-llvm-b1a7919e4cd0175ec08a3efb3c183913e21628ba.zip | |
[clang-format] Improve ObjC guessing heuristic by supporting all @keywords
Summary:
This diff improves the Objective-C guessing heuristic by
replacing the hard-coded list of a subset of Objective-C @keywords
with a general check which supports all @keywords.
I also added a few more Foundation keywords which were missing from
the heuristic.
Test Plan: Unit tests updated. Ran tests with:
% make -j16 FormatTests && ./tools/clang/unittests/Format/FormatTests
Reviewers: djasper, jolesiak
Reviewed By: djasper
Subscribers: klimek, cfe-commits
Differential Revision: https://reviews.llvm.org/D45521
llvm-svn: 329918
| -rw-r--r-- | clang/lib/Format/Format.cpp | 11 | ||||
| -rw-r--r-- | clang/unittests/Format/FormatTest.cpp | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index f7e74abab37..98b2656ee29 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -1465,6 +1465,7 @@ private: "NSAffineTransform", "NSArray", "NSAttributedString", + "NSBlockOperation", "NSBundle", "NSCache", "NSCalendar", @@ -1480,6 +1481,7 @@ private: "NSIndexPath", "NSIndexSet", "NSInteger", + "NSInvocationOperation", "NSLocale", "NSMapTable", "NSMutableArray", @@ -1494,9 +1496,13 @@ private: "NSNumber", "NSNumberFormatter", "NSObject", + "NSOperation", + "NSOperationQueue", + "NSOperationQueuePriority", "NSOrderedSet", "NSPoint", "NSPointerArray", + "NSQualityOfService", "NSRange", "NSRect", "NSRegularExpression", @@ -1518,10 +1524,7 @@ private: for (const FormatToken *FormatTok = Line->First; FormatTok; FormatTok = FormatTok->Next) { if ((FormatTok->Previous && FormatTok->Previous->is(tok::at) && - (FormatTok->isObjCAtKeyword(tok::objc_interface) || - FormatTok->isObjCAtKeyword(tok::objc_implementation) || - FormatTok->isObjCAtKeyword(tok::objc_protocol) || - FormatTok->isObjCAtKeyword(tok::objc_end) || + (FormatTok->Tok.getObjCKeywordID() != tok::objc_not_keyword || FormatTok->isOneOf(tok::numeric_constant, tok::l_square, tok::l_brace))) || (FormatTok->Tok.isAnyIdentifier() && diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index d1869d2494a..4397cdfe692 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -12118,6 +12118,12 @@ TEST_F(FormatTest, FileAndCode) { EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.mm", "")); EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo.h", "")); EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.h", "@interface Foo\n@end\n")); + EXPECT_EQ( + FormatStyle::LK_ObjC, + guessLanguage("foo.h", "#define TRY(x, y) @try { x; } @finally { y; }")); + EXPECT_EQ(FormatStyle::LK_ObjC, + guessLanguage("foo.h", "#define AVAIL(x) @available(x, *))")); + EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo.h", "@class Foo;")); EXPECT_EQ(FormatStyle::LK_Cpp, guessLanguage("foo", "")); EXPECT_EQ(FormatStyle::LK_ObjC, guessLanguage("foo", "@interface Foo\n@end\n")); EXPECT_EQ(FormatStyle::LK_ObjC, |
