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

Formatter: Don't put spaces betwen @ and objc keywords. 

llvm-svn: 171753
This commit is contained in:
Nico Weber 2013-01-07 16:14:28 +00:00
parent 803d61d143
commit e89c42f409
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -946,6 +946,8 @@ private:
(Left.isNot(tok::identifier) && Left.isNot(tok::kw_sizeof) &&
Left.isNot(tok::kw_typeof) && Left.isNot(tok::kw_alignof));
}
if (Left.is(tok::at) && Right.getObjCKeywordID() != tok::objc_not_keyword)
return false;
return true;
}

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

@ -1022,10 +1022,9 @@ TEST_F(FormatTest, FormatForObjectiveCMethodDecls) {
}
TEST_F(FormatTest, ObjCAt) {
// FIXME: Make the uncommented lines pass.
verifyFormat("@autoreleasepool");
//verifyFormat("@catch");
//verifyFormat("@class");
verifyFormat("@catch");
verifyFormat("@class");
verifyFormat("@compatibility_alias");
verifyFormat("@defs");
verifyFormat("@dynamic");
@ -1037,17 +1036,17 @@ TEST_F(FormatTest, ObjCAt) {
verifyFormat("@interface");
verifyFormat("@optional");
verifyFormat("@package");
//verifyFormat("@private");
verifyFormat("@private");
verifyFormat("@property");
//verifyFormat("@protected");
verifyFormat("@protected");
verifyFormat("@protocol");
//verifyFormat("@public");
verifyFormat("@public");
verifyFormat("@required");
verifyFormat("@selector");
verifyFormat("@synchronized");
verifyFormat("@synthesize");
//verifyFormat("@throw");
//verifyFormat("@try");
verifyFormat("@throw");
verifyFormat("@try");
EXPECT_EQ("@interface", format("@ interface"));