#1225 fix the IExtractMethod for InSelection (#1567)

* Wrap CodeModule. Add RD Interface

* Run AutoFormatter over file

* fix xml comments

* Add a method for ParseString for a module.

* Heavy refactoring of ExtractMethodRefactoring #1225.
Provisionally remove GUI interaction as it's not required. Add stubs for tests.

* Marker for needing to validate the MEthodName and increment.

* #1225 : Add checking for Multiple NewMethod signatures. Start work on ExtractMethodSelectionValidation, aka CanExecute

* prep for next stage of ExtractMethodRefactor

* Validate selection is within a single method

* Validate selection procEndLine only needs ParserRuleContext to validate

* #1225 : Removed Obsolete Call on method siganture

* #1225 modify tests for new spec on Method Call. change from underscore nomenclature

* #1225 prep for local variable only used within selection

* completed logic for ExtractMethodModel ByVal, ByRef, MoveIn

* Adjust the method for determining byval, byref and movein

* Extract methods and pull together with surrounding code.

* Break down the Extraction and Testing a little deeper

* Working through requirements now. Specifications almost complete. UI interfacing needs refactoring. Some nasty bits here and there

* Why was that left out ??. commit interface for ExtractMethodRule!

* End of my exploration into ExtractMethodRefactoring. Maybe I'll come back to this.

* Final refactorings, now only need to apply the blackbox testing

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

* #1225 added check for moving an internally declared dim. Now need to resolve if that dim is used externally

* add NCrunch to git ignore

* fix breaking code

* fix breaking code. Again

* Remove new tests, that don't have working code yet.

Author: grleachman

RetailCoder.VBE/Refactorings/ExtractMethod/IExtractMethodRule.cs

@@ -53,10 +53,11 @@ public class ExtractMethodRuleInSelection : IExtractMethodRule
     {
         public void setValidFlag(ref byte flags, IdentifierReference reference, Selection selection)
         {
-            if (selection.StartLine <= reference.Selection.StartLine && 
-                reference.Selection.StartLine <= selection.EndLine && 
-                (reference.Declaration == null) ? false : reference.Declaration.Selection.StartLine != reference.Selection.StartLine)
-                flags = (byte)(flags | 8);
+
+            if (selection.StartLine <= reference.Selection.StartLine &&
+                reference.Selection.StartLine <= selection.EndLine &&
+                ((reference.Declaration == null) ? false : reference.Declaration.Selection.StartLine != reference.Selection.StartLine))
+                flags = (byte)(flags | ((byte)ExtractMethodRuleFlags.InSelection));
         }
     }
 

RubberduckTests/Refactoring/ExtractMethod/ExtractMethodModelTests.cs

@@ -53,98 +53,6 @@ public void shouldNotSetFlag()
             }
 
         }
-        [TestClass]
-        public class WhenSetValidFlagIsCalledWhenTheReferenceIsInSelection : ExtractMethodRuleInSelectionTests
-        {
-            #region inputCode
-            string inputCode = @"
-Option explicit
-Public Sub CodeWithDeclaration()
-    Dim x as long
-    Dim z as long
-
-    x = 1 + 2
-    DebugPrint x
-    Dim y as long
-    y = x + 1
-    x = 2
-    DebugPrint y
-
-    z = x
-    DebugPrint z
-
-End Sub
-Public Sub DebugPrint(byval g as long)
-End Sub
-
-
-";
-            #endregion
-            [TestClass]
-            public class AndReferenceIsNotADeclaration : WhenSetValidFlagIsCalledWhenTheReferenceIsInSelection
-            {
-                [TestMethod]
-                [TestCategory("ExtractMethodRuleTests")]
-                public void shouldSetFlagInSelection()
-                {
-                    QualifiedModuleName qualifiedModuleName;
-                    RubberduckParserState state;
-                    MockParser.ParseString(inputCode, out qualifiedModuleName, out state);
-
-                    var declarations = state.AllDeclarations;
-                    var selection = new Selection(8, 4, 13, 14);
-                    var referenceSelection = new Selection(10, 1, 10, 1);
-
-                    QualifiedSelection? qualifiedSelection = new QualifiedSelection(qualifiedModuleName, selection);
-                    var codeModule = new Mock<ICodeModuleWrapper>();
-
-                    byte flag = new byte();
-
-
-                    IdentifierReference reference = declarations.SelectMany(d => d.References, (d, r) => new { refernce = r, declarationStartLine = d.Selection.StartLine })
-                        .Where(anon => anon.declarationStartLine != anon.refernce.Selection.StartLine)
-                        .Select(anon => anon.refernce).First();
-
-                    var SUT = new ExtractMethodRuleInSelection();
-                    SUT.setValidFlag(ref flag, reference, selection);
-
-                    Assert.AreEqual((byte)ExtractMethodRuleFlags.InSelection, flag);
-                }
-            }
-
-            [TestClass]
-            public class AndReferenceIsADeclaration : WhenSetValidFlagIsCalledWhenTheReferenceIsInSelection
-            {
-                [TestMethod]
-                [TestCategory("ExtractMethodRuleTests")]
-                public void shouldNotSetFlagInSelection()
-                {
-                    QualifiedModuleName qualifiedModuleName;
-                    RubberduckParserState state;
-                    MockParser.ParseString(inputCode, out qualifiedModuleName, out state);
-
-                    var declarations = state.AllDeclarations;
-                    var selection = new Selection(8, 4, 13, 14);
-                    var referenceSelection = new Selection(9, 1, 9, 1);
-
-                    QualifiedSelection? qualifiedSelection = new QualifiedSelection(qualifiedModuleName, selection);
-                    var codeModule = new Mock<ICodeModuleWrapper>();
-
-                    byte flag = new byte();
-
-                    IdentifierReference reference = declarations.SelectMany(d => d.References, (d, r) => new { refernce = r, declarationStartLine = d.Selection.StartLine })
-                        .Where(anon => anon.declarationStartLine != anon.refernce.Selection.StartLine)
-                        .Select(anon => anon.refernce).First();
-
-                    var SUT = new ExtractMethodRuleInSelection();
-                    SUT.setValidFlag(ref flag, reference, selection);
-
-                    Assert.AreEqual((byte)ExtractMethodRuleFlags.InSelection, flag);
-
-                }
-            }
-
-        }
 
     }