Clean up the RemoveParameter refactoring objects

Author: bclothier

Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersPresenter.cs

@@ -1,12 +1,11 @@
 using Rubberduck.Interaction;
 using Rubberduck.Resources;
 using Rubberduck.Refactorings.RemoveParameters;
-using System.Linq;
 using Rubberduck.Refactorings;
 
 namespace Rubberduck.UI.Refactorings.RemoveParameters
 {
-    internal class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParametersModel, RemoveParametersDialog, RemoveParametersView, RemoveParametersViewModel>, IRemoveParametersPresenter
+    public class RemoveParametersPresenter : RefactoringPresenterBase<RemoveParametersModel, IRefactoringDialog<RemoveParametersModel, IRefactoringView<RemoveParametersModel>, IRefactoringViewModel<RemoveParametersModel>>, IRefactoringView<RemoveParametersModel>, IRefactoringViewModel<RemoveParametersModel>>, IRemoveParametersPresenter
     {
         private readonly IMessageBox _messageBox;
 
@@ -23,26 +22,19 @@ public override RemoveParametersModel Show()
                 return null;
             }
 
-            if (Model.Parameters.Count == 0)
+            switch (Model.Parameters.Count)
             {
-                var message = string.Format(RubberduckUI.RemovePresenter_NoParametersError, Model.TargetDeclaration.IdentifierName);
-                _messageBox.NotifyWarn(message, RubberduckUI.RemoveParamsDialog_TitleText);
-                return null;
-            }
-
-            if (Model.Parameters.Count == 1)
-            {
-                return Model;
-            }
-
-            ViewModel.Parameters = Model.Parameters.Select(p => p.ToViewModel()).ToList();
-            Show();
-            if (DialogResult != RefactoringDialogResult.Execute)
-            {
-                return null;
+                case 0:
+                    var message = string.Format(RubberduckUI.RemovePresenter_NoParametersError, Model.TargetDeclaration.IdentifierName);
+                    _messageBox.NotifyWarn(message, RubberduckUI.RemoveParamsDialog_TitleText);
+                    return null;
+                case 1:
+                    Model.RemoveParameters = Model.Parameters;
+                    return Model;
+                default:
+                    base.Show();
+                    return DialogResult != RefactoringDialogResult.Execute ? null : Model;
             }
-            Model.RemoveParameters = ViewModel.Parameters.Where(m => m.IsRemoved).Select(vm => vm.ToModel()).ToList();
-            return Model;
         }
     }
 }

Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs

@@ -23,6 +23,8 @@ public RemoveParametersViewModel(RubberduckParserState state, RemoveParametersMo
             RestoreParameterCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param => RestoreParameter((ParameterViewModel)param));
             _messageBox = messageBox;
             model.ConfirmRemoveParameter += ConfirmRemoveParameterHandler;
+
+            Parameters = model.Parameters.Select(p => p.ToViewModel()).ToList();
         }
 
         private void ConfirmRemoveParameterHandler(object sender, RefactoringConfirmEventArgs e)
@@ -32,13 +34,19 @@ private void ConfirmRemoveParameterHandler(object sender, RefactoringConfirmEven
 
         public RubberduckParserState State { get; }
 
+        private void UpdateModelParameters()
+        {
+            Model.RemoveParameters = Parameters.Where(m => m.IsRemoved).Select(vm => vm.ToModel()).ToList();
+        }
+
         private List<ParameterViewModel> _parameters;
         public List<ParameterViewModel> Parameters
         {
             get => _parameters;
             set
             {
                 _parameters = value;
+                UpdateModelParameters();
                 OnPropertyChanged();
             }
         }
@@ -152,6 +160,7 @@ private void RemoveParameter(ParameterViewModel parameter)
             if (parameter != null)
             {
                 parameter.IsRemoved = true;
+                UpdateModelParameters();
                 OnPropertyChanged(nameof(SignaturePreview));
             }
         }
@@ -161,6 +170,7 @@ private void RestoreParameter(ParameterViewModel parameter)
             if (parameter != null)
             {
                 parameter.IsRemoved = false;
+                UpdateModelParameters();
                 OnPropertyChanged(nameof(SignaturePreview));
             }
         }

Rubberduck.Refactorings/RemoveParameters/RemoveParametersRefactoring.cs

@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Linq;
 using Rubberduck.Common;
-using Rubberduck.Interaction;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;