handle type of members

3 files changed, 24 insertions, 0 deletions

diff --git a/clang/qa/data/rename-move-from-global.cxx b/clang/qa/data/rename-move-from-global.cxx
index b7d1c1c..1cc2f5d 100644
--- a/clang/qa/data/rename-move-from-global.cxx
+++ b/clang/qa/data/rename-move-from-global.cxx
@@ -9,6 +9,12 @@ public:
   inline C& operator += (int x);
 };
 
+class D
+{
+private:
+  C m_c;
+};
+
 C::C() {}
 
 C::~C() {}
diff --git a/clang/qa/data/rename-move-from-global.cxx.expected b/clang/qa/data/rename-move-from-global.cxx.expected
index 40baa3e..36b56e6 100644
--- a/clang/qa/data/rename-move-from-global.cxx.expected
+++ b/clang/qa/data/rename-move-from-global.cxx.expected
@@ -15,6 +15,12 @@ public:
 };
 }
 
+class D
+{
+private:
+  ns::C m_c;
+};
+
 ns::C::C() {}
 
 ns::C::~C() {}
diff --git a/clang/rename.cxx b/clang/rename.cxx
index 4b87cb1..750641f 100644
--- a/clang/rename.cxx
+++ b/clang/rename.cxx
@@ -156,6 +156,18 @@ public:
         // Qualified name includes "C::" as a prefix, normal name does not.
         std::string aName = pDecl->getQualifiedNameAsString();
         RewriteText(pDecl->getLocation(), pDecl->getNameAsString().length(), aName);
+
+        /*
+         * C m_c;
+         * ^ Handles this.
+         */
+        clang::QualType pType = pDecl->getType();
+        if (clang::CXXRecordDecl* pCXXRecordDecl = pType->getAsCXXRecordDecl())
+        {
+            aName = pCXXRecordDecl->getNameAsString();
+            RewriteText(pDecl->getTypeSpecStartLoc(), aName.length(), aName);
+        }
+
         return true;
     }