clang-format: Improve line breaks in @property.
Before:
@property(nonatomic, assign,
readonly) NSString *looooooooooooooooooooooooooooongName;
After:
@property(nonatomic, assign, readonly)
NSString *looooooooooooooooooooooooooooongName;
llvm-svn: 187577
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index b9d26ca..e0e24e2 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1060,7 +1060,7 @@
}
// Breaking before a trailing 'const' or not-function-like annotation is bad.
- if (Left.is(tok::r_paren) &&
+ if (Left.is(tok::r_paren) && Line.Type != LT_ObjCProperty &&
(Right.is(tok::kw_const) || (Right.is(tok::identifier) && Right.Next &&
Right.Next->isNot(tok::l_paren))))
return 150;
@@ -1253,6 +1253,8 @@
return true;
if (Right.Type == TT_ObjCSelectorName)
return true;
+ if (Left.is(tok::r_paren) && Line.Type == LT_ObjCProperty)
+ return true;
if (Left.ClosesTemplateDeclaration)
return true;
if (Right.Type == TT_ConditionalExpr || Right.is(tok::question))
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index d5b9f27..6a5f022 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -4663,6 +4663,11 @@
"@optional\n"
"@property(assign) int madProp;\n"
"@end\n");
+
+ verifyFormat("@property(nonatomic, assign, readonly)\n"
+ " int *looooooooooooooooooooooooooooongNumber;\n"
+ "@property(nonatomic, assign, readonly)\n"
+ " NSString *looooooooooooooooooooooooooooongName;");
}
TEST_F(FormatTest, FormatObjCMethodDeclarations) {