Clean up ReorderParameters refactoring

Author: bclothier

Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersPresenter.cs

@@ -7,7 +7,7 @@
 
 namespace Rubberduck.UI.Refactorings.ReorderParameters
 {
-    internal class ReorderParametersPresenter : RefactoringPresenterBase<ReorderParametersModel, ReorderParametersDialog, ReorderParametersView, ReorderParametersViewModel>, IReorderParametersPresenter
+    public class ReorderParametersPresenter : RefactoringPresenterBase<ReorderParametersModel, IRefactoringDialog<ReorderParametersModel, IRefactoringView<ReorderParametersModel>, IRefactoringViewModel<ReorderParametersModel>>, IRefactoringView<ReorderParametersModel>, IRefactoringViewModel<ReorderParametersModel>>, IReorderParametersPresenter
     {
         private readonly IMessageBox _messageBox;
 
@@ -28,15 +28,12 @@ public override ReorderParametersModel Show()
                 return null;
             }
 
-            ViewModel.Parameters = new ObservableCollection<Parameter>(Model.Parameters);
-
             base.Show();
             if (DialogResult != RefactoringDialogResult.Execute)
             {
                 return null;
             }
 
-            Model.Parameters = ViewModel.Parameters.ToList();
             return Model;
         }
     }

Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersViewModel.cs

@@ -22,6 +22,7 @@ public ReorderParametersViewModel(RubberduckParserState state, ReorderParameters
             MoveParameterUpCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param => MoveParameterUp((Parameter)param));
             MoveParameterDownCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param => MoveParameterDown((Parameter)param));
             _messageBox = messageBox;
+            _parameters = new ObservableCollection<Parameter>(model.Parameters);
 
             model.ConfirmReorderParameter += ConfirmReorderParameterHandler;
         }
@@ -33,13 +34,19 @@ private void ConfirmReorderParameterHandler(object sender, Rubberduck.Refactorin
 
         public RubberduckParserState State { get; }
 
+        private void UpdateModelParameters()
+        {
+            Model.Parameters = _parameters.ToList();
+        }
+
         private ObservableCollection<Parameter> _parameters;
         public ObservableCollection<Parameter> Parameters
         {
             get => _parameters;
             set
             {
                 _parameters = value;
+                UpdateModelParameters();
                 OnPropertyChanged();
             }
         }
@@ -48,7 +55,7 @@ public string SignaturePreview
         {
             get
             {
-                // if there is only one parameter, we remove it without displaying the UI; this gets called anyway as part of the initialization process
+                // if there is only one parameter, we reorder it without displaying the UI; this gets called anyway as part of the initialization process
                 if (Parameters == null)
                 {
                     return string.Empty;
@@ -171,7 +178,7 @@ private void MoveParameterUp(Parameter parameter)
             {
                 var currentIndex = Parameters.IndexOf(parameter);
                 Parameters.Move(currentIndex, currentIndex - 1);
-                
+                UpdateModelParameters();
                 OnPropertyChanged(nameof(SignaturePreview));
             }
         }
@@ -182,7 +189,7 @@ private void MoveParameterDown(Parameter parameter)
             {
                 var currentIndex = Parameters.IndexOf(parameter);
                 Parameters.Move(currentIndex, currentIndex + 1);
-                
+                UpdateModelParameters();
                 OnPropertyChanged(nameof(SignaturePreview));
             }
         }