Fix Cancel button not working correctly for Rename

Author: Hosch250

RetailCoder.VBE/Refactorings/Rename/IRenameView.cs

@@ -7,5 +7,7 @@ public interface IRenameView : IDialogView
     {
         Declaration Target { get; set; }
         string NewName { get; set; }
+
+        void Hide();
     }
 }

RetailCoder.VBE/Refactorings/Rename/RenamePresenter.cs

@@ -6,12 +6,13 @@ namespace Rubberduck.Refactorings.Rename
     public class RenamePresenter
     {
         private readonly IRenameView _view;
-        private readonly RenameModel _model;
+        private RenameModel _model;
 
         public RenamePresenter(IRenameView view, RenameModel model)
         {
             _view = view;
             _view.OkButtonClicked += OnViewOkButtonClicked;
+            _view.CancelButtonClicked += OnViewCancelButtonClicked;
 
             _model = model;
         }
@@ -40,6 +41,12 @@ private void OnViewOkButtonClicked(object sender, EventArgs e)
         {
             _model.NewName = _view.NewName;
         }
+
+        private void OnViewCancelButtonClicked(object sender, EventArgs e)
+        {
+            _model = null;
+            _view.Hide();
+        }
     }
 }
 

RetailCoder.VBE/Refactorings/Rename/RenameRefactoring.cs

@@ -28,7 +28,7 @@ public void Refactor()
             var presenter = _factory.Create();
             _model = presenter.Show();
 
-            if (_model.Declarations != null)
+            if (_model != null && _model.Declarations != null)
             {
                 Rename();
             }
@@ -44,7 +44,11 @@ public void Refactor(Declaration target)
         {
             var presenter = _factory.Create();
             _model = presenter.Show(target);
-            Rename();
+
+            if (_model != null && _model.Declarations != null)
+            {
+                Rename();
+            }
         }
 
         private Declaration AmbiguousId()

RetailCoder.VBE/UI/Refactorings/RenameDialog.cs

@@ -15,6 +15,7 @@ public RenameDialog()
             InitializeCaptions();
 
             OkButton.Click += OkButtonClick;
+            CancelButton.Click += CancelButtonClick;
             Shown += RenameDialog_Shown;
             NewNameBox.TextChanged += NewNameBox_TextChanged;
         }
@@ -45,15 +46,22 @@ private void OkButtonClick(object sender, EventArgs e)
             OnOkButtonClicked();
         }
 
-        public event EventHandler CancelButtonClicked;
+        private void CancelButtonClick(object sender, EventArgs e)
+        {
+            OnCancelButtonClicked();
+        }
 
+        public event EventHandler CancelButtonClicked;
         public void OnCancelButtonClicked()
         {
-            Hide();
+            var handler = CancelButtonClicked;
+            if (handler != null)
+            {
+                handler(this, EventArgs.Empty);
+            }
         }
 
         public event EventHandler OkButtonClicked;
-
         public void OnOkButtonClicked()
         {
             var handler = OkButtonClicked;