clang-rename: implement renaming of classes with a dtor

[vmiklos]

Summary

The declaration wasn't renamed. Also neither part of the definition
was renamed.

[klimek]

For 2), SourceLocation has getLocWithOffset?

[vmiklos]

Thanks, sounds like exactly what I need.

[vmiklos]

Now the correct patch. :-)

[klimek]

lg

clang-rename/USRLocFinder.cpp

94 ↗

(On Diff #60801)

I'd add an assert that this actually starts with ~.

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

bool VisitCXXConstructorDecl(clang::CXXConstructorDecl *ConstructorDecl) {
 
     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;
   }
 
+  bool VisitCXXDestructorDecl(clang::CXXDestructorDecl *DestructorDecl) {
+    if (getUSRForDecl(DestructorDecl->getParent()) == USR) {
+      // Handles "~Foo" from "Foo::~Foo".
+      SourceLocation Location = DestructorDecl->getLocation();
+      const ASTContext &Context = DestructorDecl->getASTContext();
+      StringRef TokenName = Lexer::getSourceText(
+          CharSourceRange::getTokenRange(Location), Context.getSourceManager(),
+          Context.getLangOpts());
+      // 1 is the length of the "~" string that is not to be touched by the
+      // rename.
+      assert(TokenName.startswith("~"));
+      LocationsFound.push_back(Location.getLocWithOffset(1));
+
+      if (DestructorDecl->isThisDeclarationADefinition()) {
+        // Handles "Foo" from "Foo::~Foo".
+        LocationsFound.push_back(DestructorDecl->getLocStart());
+      }
+    }
+
+    return true;
+  }
+
   // Expression visitors:
 
   bool VisitDeclRefExpr(const DeclRefExpr *Expr) {
     const auto *Decl = Expr->getFoundDecl();
 
     checkNestedNameSpecifierLoc(Expr->getQualifierLoc());
     if (getUSRForDecl(Decl) == USR) {
       const SourceManager &Manager = Decl->getASTContext().getSourceManager();

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

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