test fixes, move simple matchers into ASTMatchers.h

Author: localspook

clang-tools-extra/clang-tidy/readability/RedundantTypenameCheck.cpp

@@ -19,29 +19,25 @@ using namespace clang::ast_matchers::internal;
 namespace clang::tidy::readability {
 
 void RedundantTypenameCheck::registerMatchers(MatchFinder *Finder) {
-  // NOLINTNEXTLINE(readability-identifier-naming)
-  const VariadicDynCastAllOfMatcher<TypeLoc, TypedefTypeLoc> typedefTypeLoc;
   Finder->addMatcher(typedefTypeLoc().bind("typedefTypeLoc"), this);
 
   if (!getLangOpts().CPlusPlus20)
     return;
 
-  // NOLINTBEGIN(readability-identifier-naming)
-  const VariadicDynCastAllOfMatcher<Stmt, CXXNamedCastExpr> cxxNamedCastExpr;
-  const auto inImplicitTypenameContext = anyOf(
+  const auto InImplicitTypenameContext = anyOf(
       hasParent(typedefNameDecl()), hasParent(templateTypeParmDecl()),
       hasParent(nonTypeTemplateParmDecl()), hasParent(cxxNamedCastExpr()),
       hasParent(cxxNewExpr()), hasParent(friendDecl()), hasParent(fieldDecl()),
-      hasParent(varDecl(
-          hasDeclContext(anyOf(namespaceDecl(), translationUnitDecl())))),
+      hasParent(
+          varDecl(hasDeclContext(anyOf(namespaceDecl(), translationUnitDecl())),
+                  unless(parmVarDecl()))),
       hasParent(parmVarDecl(hasParent(expr(requiresExpr())))),
       hasParent(parmVarDecl(hasParent(typeLoc(hasParent(
           namedDecl(anyOf(cxxMethodDecl(), hasParent(friendDecl()),
                           functionDecl(has(nestedNameSpecifier()))))))))),
       // Match return types.
       hasParent(functionDecl(unless(cxxConversionDecl()))));
-  // NOLINTEND(readability-identifier-naming)
-  Finder->addMatcher(typeLoc(inImplicitTypenameContext).bind("typeloc"), this);
+  Finder->addMatcher(typeLoc(InImplicitTypenameContext).bind("typeloc"), this);
 }
 
 void RedundantTypenameCheck::check(const MatchFinder::MatchResult &Result) {

clang/include/clang/ASTMatchers/ASTMatchers.h

@@ -2763,6 +2763,17 @@ extern const internal::VariadicDynCastAllOfMatcher<Stmt, CXXDynamicCastExpr>
 extern const internal::VariadicDynCastAllOfMatcher<Stmt, CXXConstCastExpr>
     cxxConstCastExpr;
 
+/// Matches any named cast expression.
+///
+/// Example: Matches all four of the casts in
+/// \code
+///   struct S { virtual void f(); };
+///   void* ptr = dynamic_cast<void*>(reinterpret_cast<S*>(
+///                    const_cast<int*>(static_cast<int*>(nullptr))));
+/// \endcode
+extern const internal::VariadicDynCastAllOfMatcher<Stmt, CXXNamedCastExpr>
+    cxxNamedCastExpr;
+
 /// Matches a C-style cast expression.
 ///
 /// Example: Matches (int) 2.2f in
@@ -6987,6 +6998,20 @@ extern const internal::VariadicDynCastAllOfMatcher<
     TypeLoc, TemplateSpecializationTypeLoc>
     templateSpecializationTypeLoc;
 
+/// Matches `TypedefTypeLoc`s.
+///
+/// Given
+/// \code
+///   using t1 = int;
+///   template <typename T> class C { using t2 = int; };
+///   t1 var1;
+///   const C<char>::t2* var2;
+/// \endcode
+/// typedefTypeLoc()
+///   matches `t1` (in the declaration of var1) and `C<char>::t2`.
+extern const internal::VariadicDynCastAllOfMatcher<TypeLoc, TypedefTypeLoc>
+    typedefTypeLoc;
+
 /// Matches template specialization `TypeLoc`s, class template specializations,
 /// variable template specializations, and function template specializations
 /// that have at least one `TemplateArgumentLoc` matching the given

clang/lib/ASTMatchers/ASTMatchersInternal.cpp

@@ -810,6 +810,8 @@ const internal::VariadicDynCastAllOfMatcher<TypeLoc, ReferenceTypeLoc>
 const internal::VariadicDynCastAllOfMatcher<TypeLoc,
                                             TemplateSpecializationTypeLoc>
     templateSpecializationTypeLoc;
+const internal::VariadicDynCastAllOfMatcher<TypeLoc, TypedefTypeLoc>
+    typedefTypeLoc;
 
 const internal::VariadicDynCastAllOfMatcher<Stmt, UnaryExprOrTypeTraitExpr>
     unaryExprOrTypeTraitExpr;
@@ -1009,6 +1011,8 @@ const internal::VariadicDynCastAllOfMatcher<Stmt, CXXDynamicCastExpr>
     cxxDynamicCastExpr;
 const internal::VariadicDynCastAllOfMatcher<Stmt, CXXConstCastExpr>
     cxxConstCastExpr;
+const internal::VariadicDynCastAllOfMatcher<Stmt, CXXNamedCastExpr>
+    cxxNamedCastExpr;
 const internal::VariadicDynCastAllOfMatcher<Stmt, CStyleCastExpr>
     cStyleCastExpr;
 const internal::VariadicDynCastAllOfMatcher<Stmt, ExplicitCastExpr>