diff options
3 files changed, 8 insertions, 0 deletions
diff --git a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp index fd15df9dea1..cafeac42ba1 100644 --- a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp +++ b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp @@ -217,6 +217,12 @@ void PropertyDeclarationCheck::check(const MatchFinder::MatchResult &Result) { 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) || diff --git a/clang-tools-extra/test/clang-tidy/objc-property-declaration-custom.m b/clang-tools-extra/test/clang-tidy/objc-property-declaration-custom.m index d4a2f5033ad..68374ec0e8f 100644 --- a/clang-tools-extra/test/clang-tidy/objc-property-declaration-custom.m +++ b/clang-tools-extra/test/clang-tidy/objc-property-declaration-custom.m @@ -14,4 +14,5 @@ // 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 diff --git a/clang-tools-extra/test/clang-tidy/objc-property-declaration.m b/clang-tools-extra/test/clang-tidy/objc-property-declaration.m index 3f001a84316..ede14426df9 100644 --- a/clang-tools-extra/test/clang-tidy/objc-property-declaration.m +++ b/clang-tools-extra/test/clang-tidy/objc-property-declaration.m @@ -21,6 +21,7 @@ @property(assign, nonatomic) int enable2GBackgroundFetch; @property(assign, nonatomic) int shouldUseCFPreferences; @property(assign, nonatomic) int enableGLAcceleration; +@property(assign, nonatomic) int ID; @end @interface Foo (Bar) |
