Merge pull request #4520 from BZngr/4349_RenameClash_2

Fixes 4349...take two
rubberduck-vba · Nov 16, 2018 · c5c9083 · c5c9083
2 parents 0994d59 + 1c38368
commit c5c9083
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 18 deletions.
diff --git a/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs b/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs
@@ -1034,12 +1034,8 @@ public IEnumerable<Declaration> FindNewDeclarationNameConflicts(string newName,
 
             if (IsEnumOrUDTMemberDeclaration(renameTarget)) 
             {
-                var memberMatches = identifierMatches.Where(idm =>
+                return identifierMatches.Where(idm =>
                     IsEnumOrUDTMemberDeclaration(idm) && idm.ParentDeclaration == renameTarget.ParentDeclaration);
-                if (memberMatches.Any())
-                {
-                    return memberMatches;
-                }
             }
 
             identifierMatches = identifierMatches.Where(nc => !IsEnumOrUDTMemberDeclaration(nc));

diff --git a/RubberduckTests/Refactoring/RenameTests.cs b/RubberduckTests/Refactoring/RenameTests.cs
@@ -2384,50 +2384,52 @@ End Sub
             tdo.MsgBox.Verify(m => m.NotifyWarn(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
         }
 
+        //Issue: https://github.com/rubberduck-vba/Rubberduck/issues/4349
         [Test]
         [Category("Refactorings")]
         [Category("Rename")]
-        public void RenameRefactoring_DoesNotWarnForUDTMember_Issue4349()
+        public void RenameRefactoring_DoesNotWarnForUDTMember()
         {
-            var tdo = new RenameTestsDataObject(selection: "VS", newName: "verySatisfiedResponses");
+            var tdo = new RenameTestsDataObject(selection: "VS", newName: "VerySatisfiedResponses");
             var inputOutput = new RenameTestModuleDefinition("Module1", ComponentType.StandardModule)
             {
                 Input =
 @"Private Type TMonthScoreInfo
-            verySatisfiedResponses As Long
+            VerySatisfiedResponses As Long
         End Type
 
         Private monthScoreInfo As TMonthScoreInfo
 
         Public Property Get V|S() As Long
-            VS = monthScoreInfo.verySatisfiedResponses
+            VS = monthScoreInfo.VerySatisfiedResponses
         End Property
         Public Property Let VS(ByVal theVal As Long)
-            monthScoreInfo.verySatisfiedResponses = theVal
+            monthScoreInfo.VerySatisfiedResponses = theVal
         End Property",
                 Expected =
 @"Private Type TMonthScoreInfo
-            verySatisfiedResponses As Long
+            VerySatisfiedResponses As Long
         End Type
 
         Private monthScoreInfo As TMonthScoreInfo
 
-        Public Property Get verySatisfiedResponses() As Long
-            verySatisfiedResponses = monthScoreInfo.verySatisfiedResponses
+        Public Property Get VerySatisfiedResponses() As Long
+            VerySatisfiedResponses = monthScoreInfo.VerySatisfiedResponses
         End Property
-        Public Property Let verySatisfiedResponses(ByVal theVal As Long)
-            monthScoreInfo.verySatisfiedResponses = theVal
+        Public Property Let VerySatisfiedResponses(ByVal theVal As Long)
+            monthScoreInfo.VerySatisfiedResponses = theVal
         End Property"
             };
 
             PerformExpectedVersusActualRenameTests(tdo, inputOutput);
             tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
         }
 
+        //Issue: https://github.com/rubberduck-vba/Rubberduck/issues/4349
         [Test]
         [Category("Refactorings")]
         [Category("Rename")]
-        public void RenameRefactoring_DoesNotWarnForEnumMember_Issue4349()
+        public void RenameRefactoring_DoesNotWarnForEnumMember()
         {
             var tdo = new RenameTestsDataObject(selection: "VerySatisfiedID", newName: "VerySatisfiedResponse");
             var inputOutput = new RenameTestModuleDefinition("Module1", ComponentType.StandardModule)
@@ -2439,7 +2441,7 @@ public void RenameRefactoring_DoesNotWarnForEnumMember_Issue4349()
         End Enum
 
         Public Property Get V|erySatisfiedID() As Long
-            VS = MonthScoreTypes.VerySatisfiedResponse
+            VerySatisfiedID = MonthScoreTypes.VerySatisfiedResponse
         End Property",
                 Expected =
 @"Private Enum MonthScoreTypes
@@ -2448,7 +2450,40 @@ End Enum
         End Enum
 
         Public Property Get VerySatisfiedResponse() As Long
-            VS = MonthScoreTypes.VerySatisfiedResponse
+            VerySatisfiedResponse = MonthScoreTypes.VerySatisfiedResponse
+        End Property",
+            };
+
+            PerformExpectedVersusActualRenameTests(tdo, inputOutput);
+            tdo.MsgBox.Verify(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>()), Times.Never);
+        }
+
+        //Issue: https://github.com/rubberduck-vba/Rubberduck/issues/4349
+        [Test]
+        [Category("Refactorings")]
+        [Category("Rename")]
+        public void RenameRefactoring_DoesNotWarnForMember()
+        {
+            var tdo = new RenameTestsDataObject(selection: "VerySatisfiedResponse", newName: "VerySatisfiedID");
+            var inputOutput = new RenameTestModuleDefinition("Module1", ComponentType.StandardModule)
+            {
+                Input =
+@"Private Enum MonthScoreTypes
+            VerySa|tisfiedResponse
+            VeryDissatisfiedResponse
+        End Enum
+
+        Public Property Get VerySatisfiedID() As Long
+            VerySatisfiedID = MonthScoreTypes.VerySatisfiedResponse
+        End Property",
+                Expected =
+@"Private Enum MonthScoreTypes
+            VerySatisfiedID
+            VeryDissatisfiedResponse
+        End Enum
+
+        Public Property Get VerySatisfiedID() As Long
+            VerySatisfiedID = MonthScoreTypes.VerySatisfiedID
         End Property",
             };