clang-rename: handle non-inline ctor definitions when renaming classes

[vmiklos]

Summary

The result of the test was C::D(), not D::D().

[klimek]

lg

clang-tools-extra/trunk/clang-rename/USRLocFinder.cpp

for (clang::CXXConstructorDecl::init_const_iterator it = ConstructorDecl->init_begin(); it != ConstructorDecl->init_end(); ++it) {
           StringRef TokenName = Lexer::getSourceText(CharSourceRange::getTokenRange(Location), Context.getSourceManager(), Context.getLangOpts());
           if (TokenName == PrevName) {
             // The token of the source location we find actually has the old name.
             LocationsFound.push_back(Initializer->getSourceLocation());
           }
         }
       }
     }
+
+    if (getUSRForDecl(ConstructorDecl) == USR) {
+      // This takes care of the class name part of a non-inline ctor definition.
+      LocationsFound.push_back(ConstructorDecl->getLocStart());
+    }
     return true;
   }
 
   // Expression visitors:
 
   bool VisitDeclRefExpr(const DeclRefExpr *Expr) {
     const auto *Decl = Expr->getFoundDecl();
 

clang-tools-extra/trunk/test/clang-rename/CtorDefTest.cpp

+// RUN: cat %s > %t.cpp
+// RUN: clang-rename -offset=133 -new-name=D %t.cpp -i --
+// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+class C
+{
+public:
+    C();
+};
+
+C::C() // CHECK: D::D()
+{
+}
+
+// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing
+// this file.