final implementation of this version. Haven't implemented line lable moves

Author: grleachman

RetailCoder.VBE/UI/Command/Refactorings/RefactorExtractMethodCommand.cs

@@ -43,13 +43,20 @@ public override bool CanExecute(object parameter)
 
             var code = Vbe.ActiveCodePane.CodeModule.Lines[selection.StartLine, selection.LineCount];
 
-            var parentProcedure = _state.AllDeclarations.FindSelectedDeclaration(qualifiedSelection.Value, DeclarationExtensions.ProcedureTypes, d => ((ParserRuleContext)d.Context.Parent).GetSelection());
+            var allDeclarations = _state.AllDeclarations;
+            var extractMethodValidation = new ExtractMethodSelectionValidation(allDeclarations);
+            //var parentProcedure = _state.AllDeclarations.FindSelectedDeclaration(qualifiedSelection.Value, DeclarationExtensions.ProcedureTypes, d => ((ParserRuleContext)d.Context.Parent).GetSelection());
+            var canExecute = extractMethodValidation.withinSingleProcedure(qualifiedSelection.Value);
+
+                
+            /*
             var canExecute = parentProcedure != null
                 && selection.StartColumn != selection.EndColumn
                 && selection.LineCount > 0
                 && !string.IsNullOrWhiteSpace(code);
+            */
 
-            Debug.WriteLine("{0}.CanExecute evaluates to {1}", GetType().Name, canExecute);
+            Debug.Print("{0}.CanExecute evaluates to {1}", GetType().Name, canExecute);
             return canExecute;
         }
 

RubberduckTests/Refactoring/ExtractMethod/ExtractedMethodRefactoringTests.cs

@@ -104,14 +104,12 @@ public void shouldCallTheExtraction()
          * - When the return value is a reference - the return assignment is Set initially implement with return values returned as ByRef */
 
 
-        [TestClass]
         //[TestClass]
         public class when_local_variable_is_only_used_before_the_selection : ExtractMethodModelTests
         {
             /* When a local variable/constant is only used before the selection, 
              * its declaration remains where it was */
-            [TestMethod]
-
+            //[TestMethod]
             public void should_leave_declaration_in_source_method()
             {
             }
@@ -121,7 +119,7 @@ public class when_local_variable_is_only_used_after_the_selection : ExtractMetho
         {
             /* When a local variable/constant is only used after the selection, 
              * its declaration remains where it was */
-            [TestMethod]
+            //[TestMethod]
             public void should_leave_declaration_in_source_method()
             {
 
@@ -133,7 +131,7 @@ public class when_local_variable_is_used_before_and_within_the_selection : Extra
         {
             /* When a local variable is used before and within the selction, 
              * it's considered an input */
-            [TestMethod]
+            //[TestMethod]
             public void should_be_passed_as_a_byref_parameter()
             {
             }
@@ -143,7 +141,7 @@ public class when_local_variable_is_used_after_and_within_the_selection : Extrac
         {
             /* When a local variable is used after and within the selection, 
              * it's considered an output */
-            [TestMethod]
+            //[TestMethod]
             public void should_be_passed_as_a_byref_parameter()
             {
             }
@@ -154,6 +152,7 @@ public void should_be_passed_as_a_byref_parameter()
         //[TestClass]
         public class when_multiple_values_are_updated_within_selection : ExtractMethodModelTests    
         {
+            
             public void should_add_byref_param_for_each()
             {
             }