Fix the issue that not recognizing single acronym with prefix as ObjC property name.

[Wizard]

Summary

This will make clang-tidy accept property names like xyz_URL (URL is a common acronym).

[Wizard]

Format code.

[Wizard]

format change

clang-tidy/objc/PropertyDeclarationCheck.cpp

enum NamingStyle {
   CategoryProperty = 2,
 };
 
 /// The acronyms are aggregated from multiple sources including
 /// https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/CodingGuidelines/Articles/APIAbbreviations.html#//apple_ref/doc/uid/20001285-BCIHCGAE
 ///
 /// Keep this list sorted.
 constexpr llvm::StringLiteral DefaultSpecialAcronyms[] = {
-    "[2-9]G",
-    "ACL",
-    "API",
-    "APN",
-    "APNS",
-    "AR",
-    "ARGB",
-    "ASCII",
-    "AV",
-    "BGRA",
-    "CA",
-    "CDN",
-    "CF",
-    "CG",
-    "CI",
-    "CRC",
-    "CV",
-    "CMYK",
-    "DNS",
-    "FPS",
-    "FTP",
-    "GIF",
-    "GL",
-    "GPS",
-    "GUID",
-    "HD",
-    "HDR",
-    "HMAC",
-    "HTML",
-    "HTTP",
-    "HTTPS",
-    "HUD",
-    "ID",
-    "JPG",
-    "JS",
-    "JSON",
-    "LAN",
-    "LZW",
-    "LTR",
-    "MAC",
-    "MD",
-    "MDNS",
-    "MIDI",
-    "NS",
-    "OS",
-    "P2P",
-    "PDF",
-    "PIN",
-    "PNG",
-    "POI",
-    "PSTN",
-    "PTR",
-    "QA",
-    "QOS",
-    "RGB",
-    "RGBA",
-    "RGBX",
-    "RIPEMD",
-    "ROM",
-    "RPC",
-    "RTF",
-    "RTL",
-    "SC",
-    "SDK",
-    "SHA",
-    "SQL",
-    "SSO",
-    "TCP",
-    "TIFF",
-    "TOS",
-    "TTS",
-    "UI",
-    "URI",
-    "URL",
-    "UUID",
-    "VC",
-    "VO",
-    "VOIP",
-    "VPN",
-    "VR",
-    "W",
-    "WAN",
-    "X",
-    "XML",
-    "Y",
-    "Z",
+    "[2-9]G", "ACL",  "API",  "APN",    "APNS", "AR",   "ARGB", "ASCII", "AV",
+    "BGRA",   "CA",   "CDN",  "CF",     "CG",   "CI",   "CRC",  "CV",    "CMYK",
+    "DNS",    "FPS",  "FTP",  "GIF",    "GL",   "GPS",  "GUID", "HD",    "HDR",
+    "HMAC",   "HTML", "HTTP", "HTTPS",  "HUD",  "ID",   "JPG",  "JS",    "JSON",
+    "LAN",    "LZW",  "LTR",  "MAC",    "MD",   "MDNS", "MIDI", "NS",    "OS",
+    "P2P",    "PDF",  "PIN",  "PNG",    "POI",  "PSTN", "PTR",  "QA",    "QOS",
+    "RGB",    "RGBA", "RGBX", "RIPEMD", "ROM",  "RPC",  "RTF",  "RTL",   "SC",
+    "SDK",    "SHA",  "SQL",  "SSO",    "TCP",  "TIFF", "TOS",  "TTS",   "UI",
+    "URI",    "URL",  "UUID", "VC",     "VO",   "VOIP", "VPN",  "VR",    "W",
+    "WAN",    "X",    "XML",  "Y",      "Z",
 };
 
 /// For now we will only fix 'CamelCase' or 'abc_CamelCase' property to
 /// 'camelCase' or 'abc_camelCase'. For other cases the users need to
 /// come up with a proper name by their own.
 /// FIXME: provide fix for snake_case to snakeCase
 FixItHint generateFixItHint(const ObjCPropertyDecl *Decl, NamingStyle Style) {
   auto Name = Decl->getName();
PropertyDeclarationCheck::PropertyDeclarationCheck(StringRef Name,
     : ClangTidyCheck(Name, Context),
       SpecialAcronyms(
           utils::options::parseStringList(Options.get("Acronyms", ""))),
       IncludeDefaultAcronyms(Options.get("IncludeDefaultAcronyms", true)),
       EscapedAcronyms() {}
 
 void PropertyDeclarationCheck::registerMatchers(MatchFinder *Finder) {
   // this check should only be applied to ObjC sources.
-  if (!getLangOpts().ObjC)
-    return;
+  if (!getLangOpts().ObjC) return;
 
   if (IncludeDefaultAcronyms) {
     EscapedAcronyms.reserve(llvm::array_lengthof(DefaultSpecialAcronyms) +
                             SpecialAcronyms.size());
     // No need to regex-escape the default acronyms.
     EscapedAcronyms.insert(EscapedAcronyms.end(),
                            std::begin(DefaultSpecialAcronyms),
                            std::end(DefaultSpecialAcronyms));

 
 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())) {
+  auto SingleAcronymRegex =
+      llvm::Regex("^([a-zA-Z]+_)?" + AcronymsGroupRegex(EscapedAcronyms) + "$");
+  if (SingleAcronymRegex.match(MatchedDecl->getName())) {
     return;
   }
   if (CategoryDecl != nullptr &&
       hasCategoryPropertyPrefix(MatchedDecl->getName())) {
     if (!prefixedPropertyNameValid(MatchedDecl->getName(), EscapedAcronyms) ||
         CategoryDecl->IsClassExtension()) {
       NamingStyle Style = CategoryDecl->IsClassExtension() ? StandardProperty
                                                            : CategoryProperty;

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

 // 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;
+@property(strong, nonatomic) NSString *abc_URL;
 @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