Handle typedefs not at the start again

Author: localspook

clang-tools-extra/clang-tidy/modernize/UseUsingCheck.cpp

@@ -75,19 +75,27 @@ void UseUsingCheck::check(const MatchFinder::MatchResult &Result) {
   // consecutive TypedefDecl nodes whose SourceRanges overlap. Each range starts
   // at the "typedef" and then continues *across* previous definitions through
   // the end of the current TypedefDecl definition.
+  const Token TokenBeforeName =
+      *Lexer::findPreviousToken(MatchedDecl.getLocation(), SM, LO,
+                                /*IncludeComments=*/false);
   const SourceRange RemovalRange = {
-      Lexer::findPreviousToken(MatchedDecl.getLocation(), SM, LO,
-                               /*IncludeComments=*/true)
-          ->getEndLoc(),
+      TokenBeforeName.getEndLoc(),
       Lexer::getLocForEndOfToken(MatchedDecl.getLocation(), 1, SM, LO)};
   if (NextTypedefStartsANewSequence) {
-    diag(MatchedDecl.getBeginLoc(), UseUsingWarning)
-        << FixItHint::CreateReplacement(
-               {MatchedDecl.getBeginLoc(),
-                Lexer::getLocForEndOfToken(MatchedDecl.getBeginLoc(), 0, SM,
-                                           LO)},
-               ("using " + MatchedDecl.getName() + " =").str())
-        << FixItHint::CreateRemoval(RemovalRange);
+    auto Diag = diag(MatchedDecl.getBeginLoc(), UseUsingWarning)
+                << FixItHint::CreateInsertion(
+                       MatchedDecl.getBeginLoc(),
+                       ("using " + MatchedDecl.getName() + " =").str())
+                << FixItHint::CreateRemoval(RemovalRange);
+
+    Token FirstToken;
+    Lexer::getRawToken(MatchedDecl.getBeginLoc(), FirstToken, SM, LO);
+    if (FirstToken.getRawIdentifier() == "typedef")
+      Diag << FixItHint::CreateRemoval(FirstToken.getLocation());
+
+    if (TokenBeforeName.getRawIdentifier() == "typedef")
+      Diag << FixItHint::CreateRemoval(TokenBeforeName.getLocation());
+
     FirstTypedefName = MatchedDecl.getName();
   } else {
     diag(LastCommaOrSemi, UseUsingWarning)

clang-tools-extra/test/clang-tidy/checkers/modernize/use-using.cpp

@@ -137,16 +137,38 @@ typedef struct Foo Bap;
 // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
 // CHECK-FIXES: using Bap = struct Foo;
 
+struct Foo typedef Bap2;
+// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using Bap2 =struct Foo ;
+
+Foo typedef Bap3;
+// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using Bap3 =Foo ;
+
 typedef struct Unknown Baq;
 // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
 // CHECK-FIXES: using Baq = struct Unknown;
 
+struct Unknown2 typedef Baw;
+// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using Baw =struct Unknown2 ;
+
+int typedef Bax;
+// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using Bax =int ;
+
 typedef struct Q1 { int a; } S1;
 // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
 // CHECK-FIXES: using S1 = struct Q1 { int a; };
 typedef struct { int b; } S2;
 // CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
 // CHECK-FIXES: using S2 = struct { int b; };
+struct Q2 { int c; } typedef S3;
+// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using S3 =struct Q2 { int c; } ;
+struct { int d; } typedef S4;
+// CHECK-MESSAGES: :[[@LINE-1]]:1: warning: use 'using' instead of 'typedef'
+// CHECK-FIXES: using S4 =struct { int d; } ;
 
 namespace my_space {
   class my_cclass {};