Merge pull request #888 from Hosch250/ExtractMethod

Check declaration scope as well as reference scope, and validate method name better

Author: retailcoder

RetailCoder.VBE/Refactorings/ExtractMethod/ExtractMethodModel.cs

@@ -33,12 +33,15 @@ public ExtractMethodModel(IActiveCodePaneEditor editor, IEnumerable<Declaration>
                 .ToList();
 
             var usedInSelection = new HashSet<Declaration>(inScopeDeclarations.Where(item =>
+                selection.Selection.Contains(item.Selection) &&
                 item.References.Any(reference => inSelection.Contains(reference))));
 
             var usedBeforeSelection = new HashSet<Declaration>(inScopeDeclarations.Where(item =>
+                item.Selection.StartLine < selection.Selection.StartLine ||
                 item.References.Any(reference => reference.Selection.StartLine < selection.Selection.StartLine)));
 
             var usedAfterSelection = new HashSet<Declaration>(inScopeDeclarations.Where(item =>
+                item.Selection.StartLine > selection.Selection.StartLine ||
                 item.References.Any(reference => reference.Selection.StartLine > selection.Selection.EndLine)));
 
             // identifiers used inside selection and before selection (or if it's a parameter) are candidates for parameters:

RetailCoder.VBE/Refactorings/ExtractMethod/ExtractMethodPresenter.cs

@@ -36,6 +36,7 @@ public ExtractMethodModel Show()
 
         private void PrepareView()
         {
+            _view.OldMethodName = _model.SourceMember.IdentifierName;
             _view.MethodName = _model.SourceMember.IdentifierName + "_1";
             _view.Inputs = _model.Inputs;
             _view.Outputs = _model.Outputs;

RetailCoder.VBE/Refactorings/ExtractMethod/IExtractMethodDialog.cs

@@ -15,6 +15,7 @@ public interface IExtractMethodDialog : IDialogView
         string Preview { get; set; }
 
         string MethodName { get; set; }
+        string OldMethodName { get; set; }
         Accessibility Accessibility { get; set; }
         bool SetReturnValue { get; set; }
         ExtractedParameter ReturnValue { get; set; }