Fixed global constant/variable naming check on C++ class for ObjC++ files.

[Wizard]

Summary

For ObjC++ projects, when compiled with C++ class, we should not apply ObjC global variable naming rules for C++ static member variables.

[hokein]

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

82 ↗

(On Diff #190371)

nit: removing the {}, the same below.

test/clang-tidy/google-objc-global-variable-declaration.mm

38 ↗

(On Diff #190371)

instead of moving .m to .mm, I think we can create a new ".mm" file for testing this case.

[Wizard]

Resolve comments

[Wizard]

fix ObjC++ test

[hokein]

test/clang-tidy/google-objc-global-variable-declaration.mm

11 ↗

(On Diff #190462)

nit: I think we should have a newline at end of file.

[Wizard]

add new line

clang-tools-extra/trunk/clang-tidy/google/GlobalVariableDeclarationCheck.cpp

Finder->addMatcher(varDecl(hasGlobalStorage(), hasType(isConstQualified()),
                              unless(matchesName("::(k[A-Z]|[A-Z]{2,})")))
                          .bind("global_const"),
                      this);
 }
 
 void GlobalVariableDeclarationCheck::check(
     const MatchFinder::MatchResult &Result) {
   if (const auto *Decl = Result.Nodes.getNodeAs<VarDecl>("global_var")) {
+    if (Decl->isStaticDataMember())
+      return;
     diag(Decl->getLocation(),
          "non-const global variable '%0' must have a name which starts with "
          "'g[A-Z]'")
         << Decl->getName() << generateFixItHint(Decl, false);
   }
   if (const auto *Decl = Result.Nodes.getNodeAs<VarDecl>("global_const")) {
+    if (Decl->isStaticDataMember())
+      return;
     diag(Decl->getLocation(),
          "const global variable '%0' must have a name which starts with "
          "an appropriate prefix")
         << Decl->getName() << generateFixItHint(Decl, true);
   }
 }
 
 }  // namespace objc
 }  // namespace google
 }  // namespace tidy
 }  // namespace clang

clang-tools-extra/trunk/test/clang-tidy/google-objc-global-variable-declaration.mm

+// RUN: %check_clang_tidy %s google-objc-global-variable-declaration %t
+
+@class NSString;
+static NSString* const myConstString = @"hello";
+// CHECK-MESSAGES: :[[@LINE-1]]:24: warning: const global variable 'myConstString' must have a name which starts with an appropriate prefix [google-objc-global-variable-declaration]
+// CHECK-FIXES: static NSString* const kMyConstString = @"hello";
+
+class MyTest {
+    static int not_objc_style;
+};