Merge pull request #5864 from BZngr/5844_IntegrateReplaceRefRefactoringAction

Author: Vogel612

Rubberduck.Refactorings/Rename/RenameCodeDefinedIdentifierRefactoringAction.cs

@@ -6,6 +6,7 @@
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Refactorings.ReplaceReferences;
 using Rubberduck.VBEditor.ComManagement;
 
 namespace Rubberduck.Refactorings.Rename
@@ -18,15 +19,18 @@ public class RenameCodeDefinedIdentifierRefactoringAction : CodeOnlyRefactoringA
         private readonly IDeclarationFinderProvider _declarationFinderProvider;
         private readonly IProjectsProvider _projectsProvider;
         private readonly IDictionary<DeclarationType, Action<RenameModel, IRewriteSession>> _renameActions;
+        private readonly ReplaceReferencesRefactoringAction _replaceReferencesRefactoringAction;
 
         public RenameCodeDefinedIdentifierRefactoringAction(
             IDeclarationFinderProvider declarationFinderProvider,
+            ReplaceReferencesRefactoringAction replaceReferencesRefactoringAction,
             IProjectsProvider projectsProvider,
             IRewritingManager rewritingManager)
             : base(rewritingManager)
         {
             _declarationFinderProvider = declarationFinderProvider;
             _projectsProvider = projectsProvider;
+            _replaceReferencesRefactoringAction = replaceReferencesRefactoringAction;
 
             _renameActions = new Dictionary<DeclarationType, Action<RenameModel, IRewriteSession>>
             {
@@ -172,21 +176,17 @@ private void RenameStandardElements(Declaration target, string newName, IRewrite
 
         private void RenameReferences(Declaration target, string newName, IRewriteSession rewriteSession)
         {
-            var modules = target.References
-                .Where(reference =>
-                    reference.Context.GetText() != "Me"
-                    && !reference.IsArrayAccess
-                    && !reference.IsDefaultMemberAccess)
-                .GroupBy(r => r.QualifiedModuleName);
+            var replaceReferencesModel = new ReplaceReferencesModel()
+            {
+                ModuleQualifyExternalReferences = true
+            };
 
-            foreach (var grouping in modules)
+            foreach (var reference in target.References)
             {
-                var rewriter = rewriteSession.CheckOutModuleRewriter(grouping.Key);
-                foreach (var reference in grouping)
-                {
-                    rewriter.Replace(reference.Context, newName);
-                }
+                replaceReferencesModel.AssignReferenceReplacementExpression(reference, newName);
             }
+
+            _replaceReferencesRefactoringAction.Refactor(replaceReferencesModel, rewriteSession);
         }
 
         private void RenameDeclaration(Declaration target, string newName, IRewriteSession rewriteSession)

RubberduckTests/Refactoring/Rename/RenameTests.cs

@@ -20,6 +20,7 @@
 using Rubberduck.Refactorings.Exceptions.Rename;
 using Rubberduck.UI.Refactorings;
 using Rubberduck.VBEditor.Utility;
+using Rubberduck.Refactorings.ReplaceReferences;
 
 namespace RubberduckTests.Refactoring.Rename
 {
@@ -2518,10 +2519,11 @@ MsgBox CStr(baz.bar)
                 RefactoringDialogResult.Execute);
         }
 
-        [Test]
+        [TestCase("UserType", "Module1.NewUserType")]
+        [TestCase("Module1.UserType", "Module1.NewUserType")]
         [Category("Refactorings")]
         [Category("Rename")]
-        public void RenameRefactoring_RenamePublicUDT_ReferenceInDifferentModule()
+        public void RenameRefactoring_RenamePublicUDT_ReferenceInDifferentModule(string originalReference, string expectedReference)
         {
             var tdo = new RenameTestsDataObject(selectedIdentifier: "UserType", newName: "NewUserType");
             var inputOutput = new RenameTestModuleDefinition("Module1", ComponentType.StandardModule)
@@ -2546,15 +2548,15 @@ End Type"
             var otherModule = new RenameTestModuleDefinition("Module2", ComponentType.StandardModule)
             {
                 Input =
-                    @"Option Explicit
+                    $@"Option Explicit
 
-Private Sub DoSomething(baz As UserType)
+Private Sub DoSomething(baz As {originalReference})
     MsgBox CStr(baz.bar)
 End Sub",
                 Expected =
-                    @"Option Explicit
+                    $@"Option Explicit
 
-Private Sub DoSomething(baz As NewUserType)
+Private Sub DoSomething(baz As {expectedReference})
     MsgBox CStr(baz.bar)
 End Sub"
             };
@@ -3395,7 +3397,8 @@ protected override IRefactoring TestRefactoring(
         {
             var selectedDeclarationService = new SelectedDeclarationProvider(selectionService, state);
             var componentRename = new RenameComponentOrProjectRefactoringAction(state, state?.ProjectsProvider, state, rewritingManager);
-            var otherRename = new RenameCodeDefinedIdentifierRefactoringAction(state, state?.ProjectsProvider, rewritingManager);
+            var replaceReferencesRefactoringAction = new ReplaceReferencesRefactoringAction(rewritingManager);
+            var otherRename = new RenameCodeDefinedIdentifierRefactoringAction(state, replaceReferencesRefactoringAction, state?.ProjectsProvider,  rewritingManager);
             var baseRefactoring = new RenameRefactoringAction(componentRename, otherRename);
             return new RenameRefactoring(baseRefactoring, userInteraction, state, state?.ProjectsProvider, selectionService, selectedDeclarationService);
         }