Merge pull request #670 from Hosch250/next

Fix bugs in reorder/remove params

Author: retailcoder

RetailCoder.VBE/Refactorings/RemoveParameters/RemoveParametersRefactoring.cs

@@ -249,12 +249,14 @@ private void AdjustSignatures()
                 if (setter != null)
                 {
                     AdjustSignatures(setter);
+                    AdjustReferences(setter.References, setter);
                 }
 
                 var letter = GetLetterOrSetter(_model.TargetDeclaration, DeclarationType.PropertyLet);
                 if (letter != null)
                 {
                     AdjustSignatures(letter);
+                    AdjustReferences(letter.References, letter);
                 }
             }
 

RetailCoder.VBE/Refactorings/Rename/RenamePresenter.cs

@@ -268,7 +268,7 @@ private void RenameControl()
             try
             {
                 var form = _view.Target.QualifiedName.QualifiedModuleName.Component.CodeModule;
-                var control = ((dynamic) form.Parent.Designer).Controls(_view.Target.IdentifierName);
+                var control = ((dynamic)form.Parent.Designer).Controls(_view.Target.IdentifierName);
 
                 foreach (var handler in _declarations.FindEventHandlers(_view.Target))
                 {
@@ -394,7 +394,7 @@ private string GetReplacementLine(CodeModule module, Declaration target, string
 
                 // Target.Context is an ArgContext, its parent is an ArgsListContext;
                 // the ArgsListContext's parent is the procedure context and it includes the body.
-                var context = (ParserRuleContext) target.Context.Parent.Parent;
+                var context = (ParserRuleContext)target.Context.Parent.Parent;
                 var firstTokenIndex = context.Start.TokenIndex;
                 var lastTokenIndex = -1; // will blow up if this code runs for any context other than below
 
@@ -535,3 +535,4 @@ private bool IsSelectedDeclaration(QualifiedSelection selection, Declaration dec
         }
     }
 }
+

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

@@ -163,6 +163,7 @@ private void AdjustSignatures()
                 if (setter != null)
                 {
                     AdjustSignatures(setter);
+                    AdjustReferences(setter.References);
                 }
 
                 var letter = _model.Declarations.Items.FirstOrDefault(item => item.ParentScope == _model.TargetDeclaration.ParentScope &&
@@ -172,6 +173,7 @@ private void AdjustSignatures()
                 if (letter != null)
                 {
                     AdjustSignatures(letter);
+                    AdjustReferences(letter.References);
                 }
             }
 

RetailCoder.VBE/UI/SourceControl/BranchesPresenter.cs

@@ -165,6 +165,8 @@ private void HideCreateBranchView()
         private void OnShowCreateBranchView(object sender, EventArgs e)
         {
             if (_view.Local == null) { return; }
+
+            OnCreateBranchTextChanged(this, EventArgs.Empty);
             _createView.Show();
         }
 
@@ -192,8 +194,8 @@ private void OnCreateViewCancel(object sender, EventArgs e)
         private void OnCreateBranchTextChanged(object sender, EventArgs e)
         {
             _createView.IsValidBranchName = !string.IsNullOrEmpty(_createView.UserInputText) &&
-                                          !_view.Local.Contains(_createView.UserInputText) &&
-                                          !_createView.UserInputText.Any(char.IsWhiteSpace);
+                                            !_view.Local.Contains(_createView.UserInputText) &&
+                                            !_createView.UserInputText.Any(char.IsWhiteSpace);
         }
 
         private void OnShowMerge(object sender, EventArgs e)