Fix false negative and false positive

Author: localspook

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

@@ -11,6 +11,7 @@
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/ASTMatchers/ASTMatchers.h"
 #include "clang/Basic/Diagnostic.h"
+#include "clang/Lex/Lexer.h"
 #include "clang/Sema/DeclSpec.h"
 
 using namespace clang::ast_matchers;
@@ -41,7 +42,7 @@ void RedundantTypenameCheck::registerMatchers(MatchFinder *Finder) {
 }
 
 void RedundantTypenameCheck::check(const MatchFinder::MatchResult &Result) {
-  const SourceLocation TypenameKeywordLoc = [&] {
+  const SourceLocation ElaboratedKeywordLoc = [&] {
     if (const auto *TTL =
             Result.Nodes.getNodeAs<TypedefTypeLoc>("typedefTypeLoc"))
       return TTL->getElaboratedKeywordLoc();
@@ -53,14 +54,24 @@ void RedundantTypenameCheck::check(const MatchFinder::MatchResult &Result) {
     if (const auto DNTL = InnermostTypeLoc.getAs<DependentNameTypeLoc>())
       return DNTL.getElaboratedKeywordLoc();
 
+    if (const auto TSTL =
+            InnermostTypeLoc.getAs<TemplateSpecializationTypeLoc>())
+      return TSTL.getElaboratedKeywordLoc();
+
     return SourceLocation();
   }();
 
-  if (TypenameKeywordLoc.isInvalid())
+  if (ElaboratedKeywordLoc.isInvalid())
+    return;
+
+  if (Token ElaboratedKeyword;
+      Lexer::getRawToken(ElaboratedKeywordLoc, ElaboratedKeyword,
+                         *Result.SourceManager, getLangOpts()) ||
+      ElaboratedKeyword.getRawIdentifier() != "typename")
     return;
 
-  diag(TypenameKeywordLoc, "redundant 'typename'")
-      << FixItHint::CreateRemoval(TypenameKeywordLoc);
+  diag(ElaboratedKeywordLoc, "redundant 'typename'")
+      << FixItHint::CreateRemoval(ElaboratedKeywordLoc);
 }
 
 } // namespace clang::tidy::readability

clang-tools-extra/test/clang-tidy/checkers/readability/redundant-typename.cpp

@@ -98,6 +98,11 @@ using trait = const typename T::R ****;
 // CHECK-MESSAGES-20: :[[@LINE-1]]:21: warning: redundant 'typename' [readability-redundant-typename]
 // CHECK-FIXES-20: using trait = const T::R ****;
 
+template <typename T>
+using t = typename T::template R<T>;
+// CHECK-MESSAGES-20: :[[@LINE-1]]:11: warning: redundant 'typename' [readability-redundant-typename]
+// CHECK-FIXES-20: using t = T::template R<T>;
+
 template <typename T>
 trait<typename T::R> m();
 
@@ -197,6 +202,7 @@ class A {
   // CHECK-MESSAGES-20: :[[@LINE-1]]:17: warning: redundant 'typename' [readability-redundant-typename]
   // CHECK-FIXES-20: friend void k(T::R) {}
 
+  friend struct T::R;
   enum E1 : typename T::R {};
   enum class E2 : typename T::R {};
   operator typename T::R();