Add support for ObjC property name to be a single acronym.

[Wizard]

Summary

This change will support cases like:

@property(assign, nonatomic) int ID;

[Wizard]

fix format

[benhamilton]

clang-tidy/objc/PropertyDeclarationCheck.cpp

222 ↗

(On Diff #144970)

s is a regular expression here, so you need to match it using llvm::Regex, not ==.

Why not just update validPropertyNameRegex() to handle this case?

test/clang-tidy/objc-property-declaration.m

24 ↗

(On Diff #144970)

Please add a test for a built-in regex (4G) as well as a custom regex in the other test file.

[Wizard]

clang-tidy/objc/PropertyDeclarationCheck.cpp

222 ↗

(On Diff #144970)

I would rather not to make the regex more complex as long as the change is simple and does bring extra cost. If update the regex it will be something like '(originalregex | acronyms)', which seems too much to me.

[Wizard]

resolve comments

[Wizard]

test/clang-tidy/objc-property-declaration.m

24 ↗

(On Diff #144970)

Unable to add single property test of 4G because it is illegal to use digit as the first character of property name.

[benhamilton]

clang-tidy/objc/PropertyDeclarationCheck.cpp

222 ↗

(On Diff #145145)

Please be aware this will change the match from running a single regular expression to running ~ 70 regular expressions on every single @property. I would expect this to perform pretty poorly.

test/clang-tidy/objc-property-declaration.m

24 ↗

(On Diff #144970)

Ah, of course.

[Wizard]

optimize matching

[Wizard]

clang-tidy/objc/PropertyDeclarationCheck.cpp

222 ↗

(On Diff #145145)

This is a good point. If using matching instead of equality check, I should not use any_of then. Updated it to use AcronymsGroupRegex().

[stephanemoore]

Looks good to me.

clang-tools-extra/trunk/clang-tidy/objc/PropertyDeclarationCheck.cpp

 }
 
 void PropertyDeclarationCheck::check(const MatchFinder::MatchResult &Result) {
   const auto *MatchedDecl =
       Result.Nodes.getNodeAs<ObjCPropertyDecl>("property");
   assert(MatchedDecl->getName().size() > 0);
   auto *DeclContext = MatchedDecl->getDeclContext();
   auto *CategoryDecl = llvm::dyn_cast<ObjCCategoryDecl>(DeclContext);
+
+  auto AcronymsRegex =
+      llvm::Regex("^" + AcronymsGroupRegex(EscapedAcronyms) + "$");
+  if (AcronymsRegex.match(MatchedDecl->getName())) {
+    return;
+  }
   if (CategoryDecl != nullptr &&
       hasCategoryPropertyPrefix(MatchedDecl->getName())) {
     if (!prefixedPropertyNameValid(MatchedDecl->getName(), EscapedAcronyms) ||
         CategoryDecl->IsClassExtension()) {
       NamingStyle Style = CategoryDecl->IsClassExtension() ? StandardProperty
                                                            : CategoryProperty;
       diag(MatchedDecl->getLocation(),
            "property name '%0' not using lowerCamelCase style or not prefixed "

clang-tools-extra/trunk/test/clang-tidy/objc-property-declaration-custom.m

 // RUN: %check_clang_tidy %s objc-property-declaration %t \
 // RUN: -config='{CheckOptions: \
 // RUN:  [{key: objc-property-declaration.Acronyms, value: "ABC;TGIF"}, \
 // RUN:   {key: objc-property-declaration.IncludeDefaultAcronyms, value: 0}]}' \
 // RUN: --
 @class NSString;
 
 @interface Foo
 @property(assign, nonatomic) int AbcNotRealPrefix;
 // CHECK-MESSAGES: :[[@LINE-1]]:34: warning: property name 'AbcNotRealPrefix' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 // CHECK-FIXES: @property(assign, nonatomic) int abcNotRealPrefix;
 @property(assign, nonatomic) int ABCCustomPrefix;
 @property(strong, nonatomic) NSString *ABC_custom_prefix;
 // CHECK-MESSAGES: :[[@LINE-1]]:40: warning: property name 'ABC_custom_prefix' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 @property(assign, nonatomic) int GIFIgnoreStandardAcronym;
 // CHECK-MESSAGES: :[[@LINE-1]]:34: warning: property name 'GIFIgnoreStandardAcronym' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
+@property(strong, nonatomic) NSString *TGIF;
 @end

clang-tools-extra/trunk/test/clang-tidy/objc-property-declaration.m

 // CHECK-MESSAGES: :[[@LINE-1]]:40: warning: property name 'URL_string' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 @property(strong, nonatomic) NSString *supportURLsCamelCase;
 @property(strong, nonatomic) NSString *supportURLCamelCase;
 @property(strong, nonatomic) NSString *VCsPluralToAdd;
 @property(assign, nonatomic) int centerX;
 @property(assign, nonatomic) int enable2GBackgroundFetch;
 @property(assign, nonatomic) int shouldUseCFPreferences;
 @property(assign, nonatomic) int enableGLAcceleration;
+@property(assign, nonatomic) int ID;
 @end
 
 @interface Foo (Bar)
 @property(assign, nonatomic) int abc_NotCamelCase;
 // CHECK-MESSAGES: :[[@LINE-1]]:34: warning: property name 'abc_NotCamelCase' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 @property(assign, nonatomic) int abCD_camelCase;
 // CHECK-MESSAGES: :[[@LINE-1]]:34: warning: property name 'abCD_camelCase' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 // CHECK-FIXES: @property(assign, nonatomic) int abcd_camelCase;
 @property(assign, nonatomic) int abCD_NotCamelCase;
 // CHECK-MESSAGES: :[[@LINE-1]]:34: warning: property name 'abCD_NotCamelCase' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 // CHECK-FIXES: @property(assign, nonatomic) int abcd_notCamelCase;
 @property(assign, nonatomic) int wrongFormat_;
 // CHECK-MESSAGES: :[[@LINE-1]]:34: warning: property name 'wrongFormat_' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 @property(strong, nonatomic) NSString *URLStr;
 @property(assign, nonatomic) int abc_camelCase;
 @end
 
 @interface Foo ()
 @property(assign, nonatomic) int abc_inClassExtension;
 // CHECK-MESSAGES: :[[@LINE-1]]:34: warning: property name 'abc_inClassExtension' not using lowerCamelCase style or not prefixed in a category, according to the Apple Coding Guidelines [objc-property-declaration]
 @end
 No newline at end of file