Add new check in google module for Objective-C code to ensure global variables follow the naming convention of Google Objective-C Style Guide

[Wizard]

Summary

This is a new checker for objc files in clang-tidy.

The new check finds global variable declarations in Objective-C files that are not follow the pattern of variable names in Google's Objective-C Style Guide.

All the global variables should follow the pattern of "g[A-Z].*" (variables) or "k[A-Z].*" (constants). The check will suggest a variable name that follows the pattern
if it can be inferred from the original name.

[Eugene.Zelenko]

Check is really identifiers naming, so should have name like readability-identifier-naming. There are also google submodules, like google-readability, google-runtime, so will be good idea to add submodule for Objective-C.

docs/ReleaseNotes.rst

63 ↗

(On Diff #120699)

No need for module name.

[Wizard]

update the check name to indicate that it is objc specific

[hokein]

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

26 ↗

(On Diff #120699)

Please make sure the patch follow the LLVM code style (https://llvm.org/docs/CodingStandards.html#name-types-functions-variables-and-enumerators-properly).

For variable names, LLVM also uses Camel Case.

29 ↗

(On Diff #120699)

Can you add a test for this case?

39 ↗

(On Diff #120699)

Instead of constructing the new prefix, maybe construct a full new name, and replace the old name, this would also simplify the code below (so that you can use decl-getSourceRange).

52 ↗

(On Diff #120699)

I think we need to filter out the source files, only allow the check to run on object-c files. You can use getLangOpts().

54 ↗

(On Diff #120699)

Do we need to restrict to variable definitions (IsDefinition())?

69 ↗

(On Diff #120699)

nit: I would use

if (const auto* VD = Result.Result.Nodes.getNodeAs<VarDecl>("global_var")) {
   ...
}
if (const auto* VD = XXX) {
   ...
}

clang-tidy/google/GoogleTidyModule.cpp

40 ↗

(On Diff #120771)

We should put the check under clang::tidy::google::objc namespace.

41 ↗

(On Diff #120771)

nit: sort in an alphabet order.

docs/clang-tidy/checks/google-global-variable-declaration.rst

7 ↗

(On Diff #120699)

nit: would be nicer provide the link.

docs/clang-tidy/checks/google-objc-global-variable-declaration.rst

4 ↗

(On Diff #120771)

nit: add missing ===

30 ↗

(On Diff #120771)

I think we should have a newline at the end of the file, the same to the test.m file.

test/clang-tidy/google-global-variable-declaration.m

6 ↗

(On Diff #120699)

nit: check the full code statement for fixes: static NSString* const kMConstString = @"hello";.

8 ↗

(On Diff #120699)

Maybe add a test without static?

[Wizard]

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

29 ↗

(On Diff #120699)

The test case of single character is added in line 12 of google-objc-global-variable-declaration.m

54 ↗

(On Diff #120699)

I have thought about it. I think we should include non-definitions as well for now in order to check all cases.

[Wizard]

address comments

[Wizard]

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

39 ↗

(On Diff #120699)

Done. But I played with it a little bit and had to avoid using decl-getSourceRange.
This method will return a range from the start of the type to the beginning of the init. E.g. for "static NSString* MyString = @"hi";" the substring of range will be "static NSString* MyString = @". It is pretty weird and will lead a result of replacement like 'kMyString"hi"'. With getLocation() + getName().size() it works well.

52 ↗

(On Diff #120699)

I took a look at the getLangOpts(), but did not find any straight stuff to get the language type. Is there any trick about this?

[hokein]

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

39 ↗

(On Diff #120699)

Oh, my bad. Thank for the clarification.

But still, we can use token range, CreateReplace(CharSourceRange::getTokenRange(SourceRange(Decl->getLocation()))) should work.

52 ↗

(On Diff #120699)

The members are defined in llvm/tools/clang/include/clang/Basic/LangOptions.def. getLangOpts().ObjC1() or getLangOpts().ObjC2() should work (not sure the difference between ObjC1 and ObjC2).

54 ↗

(On Diff #120699)

If this is expected, probably add a test case for it.

28 ↗

(On Diff #120914)

There are still some code-style violations, e.g. fc, sc, the variable name should be CamelCase.

nit: I would use char here to make the type explicit.

29 ↗

(On Diff #120914)

I'm a bit unclear here, are these exceptions? Are they stated in the code-style guideline?

docs/clang-tidy/checks/google-objc-global-variable-declaration.rst

10 ↗

(On Diff #120914)

nit: please use the public link: http://google.github.io/styleguide/objcguide.html#variable-names

24 ↗

(On Diff #120914)

The prefix of fix should be g, right? becasue this is not a constant.

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

18 ↗

(On Diff #120914)

Maybe use CHECK-FIXES: static NSString* a = @"too simple"; to make sure the check doesn't generate replacement., the same to the below case.

[Wizard]

Address comments. Adding language option check

[Wizard]

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

29 ↗

(On Diff #120914)

Generally we should never use a single-character name for global variables (it does not match our regex in the check of course). The special check here is because we don't wanna give a false hint that it should be 'kA' or something. The user need to decide a better name on their own.

[hokein]

Thanks for the updates. The code looks mostly good, a few nits.

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

29 ↗

(On Diff #120914)

I see. it is worth a comment describing the purpose here.

44 ↗

(On Diff #121367)

any reason why not using CharSourceRange::getTokenRange(SourceRange(Decl->getLocation())) here? Doesn't it work?

72 ↗

(On Diff #121367)

nit: Not sure whether it is worth here, but I'd just remove it.

docs/clang-tidy/checks/google-objc-global-variable-declaration.rst

19 ↗

(On Diff #121367)

nit: would be nicer to add a constant case here.

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

22 ↗

(On Diff #121367)

Check the full code statement.

[Wizard]

address comments

[Wizard]

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

44 ↗

(On Diff #121367)

Oh it works. I was looking at another constructor. So the getTokenRange can infer the length of the token given only the start location of the token?

[hokein]

LGTM.

clang-tidy/google/GlobalVariableDeclarationCheck.cpp

44 ↗

(On Diff #121367)

yes, it returns the range of the token which the source location points to.

clang-tools-extra/trunk/clang-tidy/google/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS support)
 
 add_clang_library(clangTidyGoogleModule
   AvoidCStyleCastsCheck.cpp
   DefaultArgumentsCheck.cpp
   ExplicitConstructorCheck.cpp
   ExplicitMakePairCheck.cpp
   GlobalNamesInHeadersCheck.cpp
+  GlobalVariableDeclarationCheck.cpp
   GoogleTidyModule.cpp
   IntegerTypesCheck.cpp
   NonConstReferences.cpp
   OverloadedUnaryAndCheck.cpp
   StringReferenceMemberCheck.cpp
   TodoCommentCheck.cpp
   UnnamedNamespaceInHeaderCheck.cpp
   UsingNamespaceDirectiveCheck.cpp

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

+//===--- GlobalVariableDeclarationCheck.h - clang-tidy-----------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GOOGLE_OBJC_GLOBAL_VARIABLE_DECLARATION_H
+#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GOOGLE_OBJC_GLOBAL_VARIABLE_DECLARATION_H
+
+#include "../ClangTidy.h"
+
+namespace clang {
+namespace tidy {
+namespace google {
+namespace objc {
+
+/// The check for Objective-C global variables and constants naming convention.
+/// The declaration should follow the patterns of 'k[A-Z].*' (constants) or
+/// 'g[A-Z].*' (variables).
+///
+/// For the user-facing documentation see:
+/// http://clang.llvm.org/extra/clang-tidy/checks/google-objc-global-variable-declaration.html
+class GlobalVariableDeclarationCheck : public ClangTidyCheck {
+ public:
+  GlobalVariableDeclarationCheck(StringRef Name, ClangTidyContext *Context)
+      : ClangTidyCheck(Name, Context) {}
+  void registerMatchers(ast_matchers::MatchFinder *Finder) override;
+  void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+};
+
+}  // namespace objc
+}  // namespace google
+}  // namespace tidy
+}  // namespace clang
+
+#endif  // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_GOOGLE_OBJC_GLOBAL_VARIABLE_DECLARATION_H

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

+//===--- GlobalVariableDeclarationCheck.cpp - clang-tidy-------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "GlobalVariableDeclarationCheck.h"
+#include "clang/AST/ASTContext.h"
+#include "clang/ASTMatchers/ASTMatchFinder.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringRef.h"
+
+#include <string>
+
+using namespace clang::ast_matchers;
+
+namespace clang {
+namespace tidy {
+namespace google {
+namespace objc {
+
+namespace {
+
+FixItHint generateFixItHint(const VarDecl *Decl, bool IsConst) {
+  char FC = Decl->getName()[0];
+  if (!llvm::isAlpha(FC) || Decl->getName().size() == 1) {
+    // No fix available if first character is not alphabetical character, or it
+    // is a single-character variable, since it is difficult to determine the 
+    // proper fix in this case. Users should create a proper variable name by
+    // their own.
+    return FixItHint();
+  }
+  char SC = Decl->getName()[1];
+  if ((FC == 'k' || FC == 'g') && !llvm::isAlpha(SC)) {
+    // No fix available if the prefix is correct but the second character is not
+    // alphabetical, since it is difficult to determine the proper fix in this
+    // case.
+    return FixItHint();
+  }
+  auto NewName = (IsConst ? "k" : "g") +
+                 llvm::StringRef(std::string(1, FC)).upper() +
+                 Decl->getName().substr(1).str();
+  return FixItHint::CreateReplacement(
+      CharSourceRange::getTokenRange(SourceRange(Decl->getLocation())),
+      llvm::StringRef(NewName));
+}
+}  // namespace
+
+void GlobalVariableDeclarationCheck::registerMatchers(MatchFinder *Finder) {
+  // The relevant Style Guide rule only applies to Objective-C.
+  if (!getLangOpts().ObjC1 && !getLangOpts().ObjC2) {
+    return;
+  }
+  // need to add two matchers since we need to bind different ids to distinguish
+  // constants and variables. Since bind() can only be called on node matchers,
+  // we cannot make it in one matcher.
+  Finder->addMatcher(
+      varDecl(hasGlobalStorage(), unless(hasType(isConstQualified())),
+              unless(matchesName("::g[A-Z]")))
+          .bind("global_var"),
+      this);
+  Finder->addMatcher(varDecl(hasGlobalStorage(), hasType(isConstQualified()),
+                             unless(matchesName("::k[A-Z]")))
+                         .bind("global_const"),
+                     this);
+}
+
+void GlobalVariableDeclarationCheck::check(
+    const MatchFinder::MatchResult &Result) {
+  if (const auto *Decl = Result.Nodes.getNodeAs<VarDecl>("global_var")) {
+    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")) {
+    diag(Decl->getLocation(),
+         "const global variable '%0' must have a name which starts with "
+         "'k[A-Z]'")
+        << Decl->getName() << generateFixItHint(Decl, true);
+  }
+}
+
+}  // namespace objc
+}  // namespace google
+}  // namespace tidy
+}  // namespace clang

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

 #include "../readability/FunctionSizeCheck.h"
 #include "../readability/NamespaceCommentCheck.h"
 #include "../readability/RedundantSmartptrGetCheck.h"
 #include "AvoidCStyleCastsCheck.h"
 #include "DefaultArgumentsCheck.h"
 #include "ExplicitConstructorCheck.h"
 #include "ExplicitMakePairCheck.h"
 #include "GlobalNamesInHeadersCheck.h"
+#include "GlobalVariableDeclarationCheck.h"
 #include "IntegerTypesCheck.h"
 #include "NonConstReferences.h"
 #include "OverloadedUnaryAndCheck.h"
 #include "StringReferenceMemberCheck.h"
 #include "TodoCommentCheck.h"
 #include "UnnamedNamespaceInHeaderCheck.h"
 #include "UsingNamespaceDirectiveCheck.h"
 
 using namespace clang::ast_matchers;
 
 namespace clang {
 namespace tidy {
 namespace google {
 
 class GoogleModule : public ClangTidyModule {
  public:
   void addCheckFactories(ClangTidyCheckFactories &CheckFactories) override {
     CheckFactories.registerCheck<build::ExplicitMakePairCheck>(
         "google-build-explicit-make-pair");
     CheckFactories.registerCheck<build::UnnamedNamespaceInHeaderCheck>(
         "google-build-namespaces");
     CheckFactories.registerCheck<build::UsingNamespaceDirectiveCheck>(
         "google-build-using-namespace");
     CheckFactories.registerCheck<DefaultArgumentsCheck>(
         "google-default-arguments");
     CheckFactories.registerCheck<ExplicitConstructorCheck>(
         "google-explicit-constructor");
+    CheckFactories.registerCheck<readability::GlobalNamesInHeadersCheck>(
+        "google-global-names-in-headers");
+    CheckFactories.registerCheck<objc::GlobalVariableDeclarationCheck>(
+        "google-objc-global-variable-declaration");
     CheckFactories.registerCheck<runtime::IntegerTypesCheck>(
         "google-runtime-int");
     CheckFactories.registerCheck<runtime::OverloadedUnaryAndCheck>(
         "google-runtime-operator");
     CheckFactories.registerCheck<runtime::NonConstReferences>(
         "google-runtime-references");
     CheckFactories.registerCheck<runtime::StringReferenceMemberCheck>(
         "google-runtime-member-string-references");
     CheckFactories.registerCheck<readability::AvoidCStyleCastsCheck>(
         "google-readability-casting");
     CheckFactories.registerCheck<readability::TodoCommentCheck>(
         "google-readability-todo");
     CheckFactories
         .registerCheck<clang::tidy::readability::BracesAroundStatementsCheck>(
             "google-readability-braces-around-statements");
-    CheckFactories.registerCheck<readability::GlobalNamesInHeadersCheck>(
-        "google-global-names-in-headers");
     CheckFactories.registerCheck<clang::tidy::readability::FunctionSizeCheck>(
         "google-readability-function-size");
     CheckFactories
         .registerCheck<clang::tidy::readability::NamespaceCommentCheck>(
             "google-readability-namespace-comments");
     CheckFactories
         .registerCheck<clang::tidy::readability::RedundantSmartptrGetCheck>(
             "google-readability-redundant-smartptr-get");
ClangTidyOptions getModuleOptions() override {
     return Options;
   }
 };
 
 // Register the GoogleTidyModule using this statically initialized variable.
 static ClangTidyModuleRegistry::Add<GoogleModule> X("google-module",
                                                     "Adds Google lint checks.");
 
-} // namespace google
+}  // namespace google
 
 // This anchor is used to force the linker to link in the generated object file
 // and thus register the GoogleModule.
 volatile int GoogleModuleAnchorSource = 0;
 
-} // namespace tidy
-} // namespace clang
+}  // namespace tidy
+}  // namespace clang

clang-tools-extra/trunk/docs/ReleaseNotes.rst

 Improvements to clang-rename
 ----------------------------
 
 The improvements are...
 
 Improvements to clang-tidy
 --------------------------
 
+- New `google-objc-global-variable-declaration
+  <http://clang.llvm.org/extra/clang-tidy/checks/google-global-variable-declaration.html>`_ check
+
+  Add new check for Objective-C code to ensure global 
+  variables follow the naming convention of 'k[A-Z].*' (for constants) 
+  or 'g[A-Z].*' (for variables).
+
 - New module `objc` for Objective-C style checks.
 
 - New `objc-forbidden-subclassing
   <http://clang.llvm.org/extra/clang-tidy/checks/objc-forbidden-subclassing.html>`_ check
 
   Ensures Objective-C classes do not subclass any classes which are
   not intended to be subclassed. Includes a list of classes from Foundation
   and UIKit which are documented as not supporting subclassing.

clang-tools-extra/trunk/docs/clang-tidy/checks/google-objc-global-variable-declaration.rst

+.. title:: clang-tidy - google-objc-global-variable-declaration
+
+google-objc-global-variable-declaration
+=======================================
+
+Finds global variable declarations in Objective-C files that are not follow the pattern
+of variable names in Google's Objective-C Style Guide.
+
+The corresponding style guide rule:
+http://google.github.io/styleguide/objcguide.html#variable-names
+
+All the global variables should follow the pattern of `g[A-Z].*` (variables) or
+`k[A-Z].*` (constants). The check will suggest a variable name that follows the pattern
+if it can be inferred from the original name.
+
+For code:
+
+.. code-block:: objc
+  static NSString* myString = @"hello";
+
+The fix will be:
+
+.. code-block:: objc
+  static NSString* gMyString = @"hello";
+
+Another example of constant:
+
+.. code-block:: objc
+  static NSString* const myConstString = @"hello";
+
+The fix will be:
+
+.. code-block:: objc
+  static NSString* const kMyConstString = @"hello";
+
+However for code that prefixed with non-alphabetical characters like:
+
+.. code-block:: objc
+  static NSString* __anotherString = @"world";
+
+The check will give a warning message but will not be able to suggest a fix. The user
+need to fix it on his own.

clang-tools-extra/trunk/docs/clang-tidy/checks/list.rst

.. toctree::
    cppcoreguidelines-slicing
    cppcoreguidelines-special-member-functions
    google-build-explicit-make-pair
    google-build-namespaces
    google-build-using-namespace
    google-default-arguments
    google-explicit-constructor
    google-global-names-in-headers
+   google-objc-global-variable-declaration
    google-readability-braces-around-statements (redirects to readability-braces-around-statements) <google-readability-braces-around-statements>
    google-readability-casting
    google-readability-function-size (redirects to readability-function-size) <google-readability-function-size>
    google-readability-namespace-comments (redirects to llvm-namespace-comment) <google-readability-namespace-comments>
    google-readability-redundant-smartptr-get (redirects to readability-redundant-smartptr-get) <google-readability-redundant-smartptr-get>
    google-readability-todo
    google-runtime-int
    google-runtime-member-string-references

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

+// 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 'k[A-Z]' [google-objc-global-variable-declaration]
+// CHECK-FIXES: static NSString* const kMyConstString = @"hello";
+
+static NSString* MyString = @"hi";
+// CHECK-MESSAGES: :[[@LINE-1]]:18: warning: non-const global variable 'MyString' must have a name which starts with 'g[A-Z]' [google-objc-global-variable-declaration]
+// CHECK-FIXES: static NSString* gMyString = @"hi";
+
+NSString* globalString = @"test";
+// CHECK-MESSAGES: :[[@LINE-1]]:11: warning: non-const global variable 'globalString' must have a name which starts with 'g[A-Z]' [google-objc-global-variable-declaration]
+// CHECK-FIXES: NSString* gGlobalString = @"test";
+
+static NSString* a = @"too simple";
+// CHECK-MESSAGES: :[[@LINE-1]]:18: warning: non-const global variable 'a' must have a name which starts with 'g[A-Z]' [google-objc-global-variable-declaration]
+// CHECK-FIXES: static NSString* a = @"too simple";
+
+static NSString* noDef;
+// CHECK-MESSAGES: :[[@LINE-1]]:18: warning: non-const global variable 'noDef' must have a name which starts with 'g[A-Z]' [google-objc-global-variable-declaration]
+// CHECK-FIXES: static NSString* gNoDef;
+
+static NSString* const _notAlpha = @"NotBeginWithAlpha";
+// CHECK-MESSAGES: :[[@LINE-1]]:24: warning: const global variable '_notAlpha' must have a name which starts with 'k[A-Z]' [google-objc-global-variable-declaration]
+// CHECK-FIXES: static NSString* const _notAlpha = @"NotBeginWithAlpha";
+
+static NSString* const k_Alpha = @"SecondNotAlpha";
+// CHECK-MESSAGES: :[[@LINE-1]]:24: warning: const global variable 'k_Alpha' must have a name which starts with 'k[A-Z]' [google-objc-global-variable-declaration]
+// CHECK-FIXES: static NSString* const k_Alpha = @"SecondNotAlpha";
+
+static NSString* const kGood = @"hello";
+// CHECK-MESSAGES-NOT: :[[@LINE-1]]:24: warning: const global variable 'kGood' must have a name which starts with 'k[A-Z]' [google-objc-global-variable-declaration]
+static NSString* gMyIntGood = 0;
+// CHECK-MESSAGES-NOT: :[[@LINE-1]]:18: warning: non-const global variable 'gMyIntGood' must have a name which starts with 'g[A-Z]' [google-objc-global-variable-declaration]
+@implementation Foo
+- (void)f {
+    int x = 0;
+// CHECK-MESSAGES-NOT: :[[@LINE-1]]:9: warning: non-const global variable 'gMyIntGood' must have a name which starts with 'g[A-Z]' [google-objc-global-variable-declaration]
+}
+@end