Account for the fact that some type traits have static methods.

tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Changes Blink-style names to Chrome-style names. Currently transforms:
 //   fields:
 //     int m_operationCount => int operation_count_
 //   variables (including parameters):
 //     int mySuperVariable => int my_super_variable
 //   constants:
@@ skipping 41 matching lines @@
 const char kGeneratedFileRegex[] = "^gen/|/gen/";
 
 const clang::ast_matchers::internal::
     VariadicDynCastAllOfMatcher<clang::Expr, clang::UnresolvedMemberExpr>
         unresolvedMemberExpr;
 
 AST_MATCHER(clang::FunctionDecl, isOverloadedOperator) {
   return Node.isOverloadedOperator();
 }
 
+AST_MATCHER(clang::CXXMethodDecl, isUserProvidedInstanceMethod) {
+  return Node.isUserProvided() && Node.isInstance();
+}
+
 AST_MATCHER_P(clang::FunctionTemplateDecl,
               templatedDecl,
               clang::ast_matchers::internal::Matcher<clang::FunctionDecl>,
               InnerMatcher) {
   return InnerMatcher.matches(*Node.getTemplatedDecl(), Finder, Builder);
 }
 
 // If |InnerMatcher| matches |top|, then the returned matcher will match:
 // - |top::function|
 // - |top::Class::method|
@@ skipping 561 matching lines @@
 
   // Field, variable, and enum declarations ========
   // Given
   //   int x;
   //   struct S {
   //     int y;
   //     enum { VALUE };
   //   };
   // matches |x|, |y|, and |VALUE|.
   auto field_decl_matcher = id("decl", fieldDecl(in_blink_namespace));
-  auto is_type_trait_value =
-      varDecl(hasName("value"), hasStaticStorageDuration(), isPublic(),
-              hasType(isConstQualified()), hasType(booleanType()),
-              unless(hasAncestor(recordDecl(has(functionDecl())))));
+  auto is_type_trait_value = varDecl(
+      hasName("value"), hasStaticStorageDuration(), isPublic(),
+      hasType(isConstQualified()), hasType(booleanType()),
+      unless(hasAncestor(
+          recordDecl(has(cxxMethodDecl(isUserProvidedInstanceMethod()))))));

[dcheng, 2016/09/01 21:04:21]

Might be slightly nicer to compose the isUserProvided() matcher with a custom
isInstanceMethod() matcher.

[Łukasz Anforowicz, 2016/09/01 21:39:45]

Done.  Also - it turns out that isUserProvided is an already existing, built-in
matcher :->

   auto var_decl_matcher =
       id("decl", varDecl(in_blink_namespace, unless(is_type_trait_value)));
   auto enum_member_decl_matcher =
       id("decl", enumConstantDecl(in_blink_namespace));
 
   FieldDeclRewriter field_decl_rewriter(&replacements);
   match_finder.addMatcher(field_decl_matcher, &field_decl_rewriter);
 
   VarDeclRewriter var_decl_rewriter(&replacements);
   match_finder.addMatcher(var_decl_matcher, &var_decl_rewriter);
@@ skipping 269 matching lines @@
   for (const auto& r : replacements) {
     std::string replacement_text = r.getReplacementText().str();
     std::replace(replacement_text.begin(), replacement_text.end(), '\n', '\0');
     llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset()
                  << ":::" << r.getLength() << ":::" << replacement_text << "\n";
   }
   llvm::outs() << "==== END EDITS ====\n";
 
   return 0;
 }