Handling ElaboratedType and InjectedClassNameType in blink_qual_type_matcher.

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 60 matching lines @@
         cxxDependentScopeMemberExpr;
 
 AST_MATCHER(clang::FunctionDecl, isOverloadedOperator) {
   return Node.isOverloadedOperator();
 }
 
 AST_MATCHER(clang::CXXMethodDecl, isInstanceMethod) {
   return Node.isInstance();
 }
 
+// TODO(lukasza): Remove this matcher definition, after we pull
+// https://reviews.llvm.org/D27207 (aka rL288366) from upstream clang.
+AST_MATCHER_P(clang::Type,
+              hasUnqualifiedDesugaredType,
+              clang::ast_matchers::internal::Matcher<clang::Type>,
+              InnerMatcher) {
+  const clang::Type* desugaredType = Node.getUnqualifiedDesugaredType();
+  return InnerMatcher.matches(*desugaredType, Finder, Builder);
+}
+
 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 1092 matching lines @@
                   var_decl_matcher, field_decl_matcher, function_decl_matcher,
                   method_decl_matcher, function_template_decl_matcher,
                   method_template_decl_matcher, enum_member_decl_matcher)))));
   UsingDeclRewriter using_decl_rewriter(&replacements);
   match_finder.addMatcher(using_decl_matcher, &using_decl_rewriter);
 
   // Matches any QualType that refers to a blink type:
   // - const blink::Foo&
   // - blink::Foo*
   // - blink::Foo<T>
-  // - ...
-  // TODO(lukasza): The matchers below can be simplified after
-  // https://llvm.org/bugs/show_bug.cgi?id=30331 is fixed.
-  // Simplified matchers:
-  //    auto blink_qual_type_base_matcher =
-  //        qualType(hasDeclaration(in_blink_namespace));
-  //    auto blink_qual_type_matcher = qualType(anyOf(
-  //        blink_qual_type_base_matcher,
-  //        pointsTo(blink_qual_type_base_matcher),
-  //        references(blink_qual_type_base_matcher)));
-  auto blink_qual_type_bug_workaround_matcher1 = hasBaseType(
+  auto blink_qual_type_base_matcher = hasBaseType(hasUnqualifiedDesugaredType(
       anyOf(enumType(hasDeclaration(in_blink_namespace)),
+            injectedClassNameType(hasDeclaration(in_blink_namespace)),
             recordType(hasDeclaration(in_blink_namespace)),
             templateSpecializationType(hasDeclaration(in_blink_namespace)),
-            templateTypeParmType(hasDeclaration(in_blink_namespace)),
-            typedefType(hasDeclaration(in_blink_namespace))));
-  auto blink_qual_type_base_matcher =
-      qualType(anyOf(blink_qual_type_bug_workaround_matcher1,
-                     hasBaseType(elaboratedType(
-                         namesType(blink_qual_type_bug_workaround_matcher1)))));
-  auto blink_qual_type_matcher =
-      qualType(anyOf(blink_qual_type_base_matcher, pointsTo(in_blink_namespace),
-                     references(in_blink_namespace)));
+            templateTypeParmType(hasDeclaration(in_blink_namespace)))));
+  auto blink_qual_type_matcher = qualType(anyOf(
+      blink_qual_type_base_matcher, pointsTo(blink_qual_type_base_matcher),
+      references(blink_qual_type_base_matcher)));
 
   // Template-dependent decl lookup ========
   // Given
   //   template <typename T> void f() { T::foo(); }
   // matches |T::foo|.
   auto dependent_scope_decl_ref_expr_matcher =
       expr(id("expr", dependentScopeDeclRefExpr(has(nestedNameSpecifier(
                           specifiesType(blink_qual_type_matcher))))));
   DependentScopeDeclRefExprRewriter dependent_scope_decl_ref_expr_rewriter(
       &replacements);
@@ skipping 60 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;
 }