Killed bug in Remove Parameter. He won't show his head again.

Author: Hosch250

RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersModel.cs

@@ -38,6 +38,7 @@ private void AcquireTarget(QualifiedSelection selection)
         {
             TargetDeclaration = Declarations.FindTarget(selection, ValidDeclarationTypes);
             TargetDeclaration = PromptIfTargetImplementsInterface();
+            TargetDeclaration = GetEvent();
             TargetDeclaration = GetGetter();
         }
 
@@ -98,6 +99,18 @@ private Declaration PromptIfTargetImplementsInterface()
             return confirm == DialogResult.No ? null : interfaceMember;
         }
 
+        private Declaration GetEvent()
+        {
+            foreach (var events in Declarations.Where(item => item.DeclarationType == DeclarationType.Event))
+            {
+                if (Declarations.FindHandlersForEvent(events).Any(reference => Equals(reference.Item2, TargetDeclaration)))
+                {
+                    return events;
+                }
+            }
+            return TargetDeclaration;
+        }
+
         private Declaration GetGetter()
         {
             if (TargetDeclaration == null) { return null; }

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersModel.cs

@@ -93,12 +93,9 @@ private Declaration GetEvent()
         {
             foreach (var events in Declarations.Where(item => item.DeclarationType == DeclarationType.Event))
             {
-                foreach (var reference in Declarations.FindHandlersForEvent(events))
+                if (Declarations.FindHandlersForEvent(events).Any(reference => Equals(reference.Item2, TargetDeclaration)))
                 {
-                    if (Equals(reference.Item2, TargetDeclaration))
-                    {
-                        return events;
-                    }
+                    return events;
                 }
             }
             return TargetDeclaration;

RubberduckTests/Refactoring/RemoveParametersTests.cs

@@ -1419,6 +1419,68 @@ Private Sub abc_Foo(ByVal arg1 As Integer )
             Assert.AreEqual(expectedCode2, module2.Lines());
         }
 
+        [TestMethod]
+        public void ReorderParametersRefactoring_LastEventParamRemoved_EventImplementationSelected()
+        {
+            //Input
+            const string inputCode1 =
+@"Private WithEvents abc As Class2
+
+Private Sub abc_Foo(ByVal arg1 As Integer, ByVal arg2 As String)
+End Sub";
+
+            const string inputCode2 =
+@"Public Event Foo(ByVal arg1 As Integer, ByVal arg2 As String)";
+
+            var selection = new Selection(3, 15, 3, 15);
+
+            //Expectation
+            const string expectedCode1 =
+@"Private WithEvents abc As Class2
+
+Private Sub abc_Foo(ByVal arg1 As Integer )
+End Sub";   // note: IDE removes excess spaces
+
+            const string expectedCode2 =
+@"Public Event Foo(ByVal arg1 As Integer )";
+
+            //Arrange
+            var builder = new MockVbeBuilder();
+            var project = builder.ProjectBuilder("TestProject1", vbext_ProjectProtection.vbext_pp_none)
+                .AddComponent("Class1", vbext_ComponentType.vbext_ct_ClassModule, inputCode1)
+                .AddComponent("Class2", vbext_ComponentType.vbext_ct_ClassModule, inputCode2)
+                .Build();
+            var vbe = builder.AddProject(project).Build();
+            var component = project.Object.VBComponents.Item(0);
+
+            var codePaneFactory = new CodePaneWrapperFactory();
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var parser = new RubberduckParser(vbe.Object, new RubberduckParserState());
+
+            parser.Parse();
+            if (parser.State.Status == ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
+            var module1 = project.Object.VBComponents.Item(0).CodeModule;
+            var module2 = project.Object.VBComponents.Item(1).CodeModule;
+
+            //Specify Params to remove
+            var model = new RemoveParametersModel(parser.State, qualifiedSelection, null);
+            model.Parameters.Last().IsRemoved = true;
+
+            //SetupFactory
+            var factory = SetupFactory(model);
+
+            //Act
+            var refactoring = new RemoveParametersRefactoring(factory.Object, new ActiveCodePaneEditor(vbe.Object, codePaneFactory));
+            refactoring.Refactor(qualifiedSelection);
+
+            //Assert
+            Assert.AreEqual(expectedCode1, module1.Lines());
+            Assert.AreEqual(expectedCode2, module2.Lines());
+        }
+
         [TestMethod]
         public void RemoveParametersRefactoring_LastEventParamRemoved_ParamsHaveDifferentNames()
         {