Merge pull request #2082 from Hosch250/Issue2065

Hosch250 · web-flow · commit 98f6446dd234 · 2016-07-18T18:11:41.000-05:00
Extract Interface tests, many bug fixes
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs
@@ -42,7 +42,6 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel
 
             if (_targetDeclaration == null)
             {
-                //throw new InvalidOperationException();
                 return;
             }
 
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs
@@ -22,7 +22,10 @@ public ExtractInterfacePresenter(IExtractInterfaceDialog view, ExtractInterfaceM
 
         public ExtractInterfaceModel Show()
         {
-            if (_model.TargetDeclaration == null) { return null; }
+            if (_model.TargetDeclaration == null)
+            {
+                return null;
+            }
 
             _view.ComponentNames =
                 _model.TargetDeclaration.Project.VBComponents.Cast<VBComponent>().Select(c => c.Name).ToList();
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenterFactory.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenterFactory.cs
@@ -1,7 +1,6 @@
 ﻿using System.Linq;
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing.VBA;
-using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.Refactorings.ExtractInterface
 {
@@ -20,7 +19,7 @@ public ExtractInterfacePresenterFactory(VBE vbe, RubberduckParserState state, IE
 
         public ExtractInterfacePresenter Create()
         {
-            var selection = _vbe.ActiveCodePane.CodeModule.GetSelection();
+            var selection = _vbe.ActiveCodePane.GetQualifiedSelection();
             if (selection == null)
             {
                 return null;
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs
@@ -17,11 +17,11 @@ public class ExtractInterfaceRefactoring : IRefactoring
         private readonly VBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
-        private readonly IRefactoringPresenterFactory<ExtractInterfacePresenter> _factory;
+        private readonly IRefactoringPresenterFactory<IExtractInterfacePresenter> _factory;
         private ExtractInterfaceModel _model;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public ExtractInterfaceRefactoring(VBE vbe, RubberduckParserState state, IMessageBox messageBox, IRefactoringPresenterFactory<ExtractInterfacePresenter> factory)
+        public ExtractInterfaceRefactoring(VBE vbe, RubberduckParserState state, IMessageBox messageBox, IRefactoringPresenterFactory<IExtractInterfacePresenter> factory)
         {
             _vbe = vbe;
             _state = state;
@@ -38,7 +38,6 @@ public void Refactor()
             }
 
             _model = presenter.Show();
-
             if (_model == null)
             {
                 return;
@@ -66,8 +65,8 @@ private void AddInterface()
             var interfaceComponent = _model.TargetDeclaration.Project.VBComponents.Add(vbext_ComponentType.vbext_ct_ClassModule);
             interfaceComponent.Name = _model.InterfaceName;
 
-            _vbe.ActiveCodePane.CodeModule.InsertLines(1, Tokens.Option + ' ' + Tokens.Explicit + Environment.NewLine);
-            _vbe.ActiveCodePane.CodeModule.InsertLines(3, GetInterfaceModuleBody());
+            interfaceComponent.CodeModule.InsertLines(1, Tokens.Option + ' ' + Tokens.Explicit + Environment.NewLine);
+            interfaceComponent.CodeModule.InsertLines(3, GetInterfaceModuleBody());
 
             var module = _model.TargetDeclaration.QualifiedSelection.QualifiedName.Component.CodeModule;
 
@@ -85,14 +84,13 @@ private void _state_StateChanged(object sender, EventArgs e)
             {
                 return;
             }
-            
+
+            _state.StateChanged -= _state_StateChanged;
             var qualifiedSelection = new QualifiedSelection(_model.TargetDeclaration.QualifiedSelection.QualifiedName, new Selection(_insertionLine, 1, _insertionLine, 1));
             _vbe.ActiveCodePane.CodeModule.SetSelection(qualifiedSelection);
 
             var implementInterfaceRefactoring = new ImplementInterfaceRefactoring(_vbe, _state, _messageBox);
             implementInterfaceRefactoring.Refactor(qualifiedSelection);
-
-            _state.StateChanged -= _state_StateChanged;
         }
 
         private string GetInterfaceModuleBody()
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/InterfaceMember.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/InterfaceMember.cs
@@ -46,17 +46,25 @@ public InterfaceMember(Declaration member, IEnumerable<Declaration> declarations
             
             GetMethodType();
 
-            MemberParams = declarations.Where(item => item.DeclarationType == DeclarationType.Parameter &&
-                                          item.ParentScope == Member.Scope)
-                                       .OrderBy(o => o.Selection.StartLine)
-                                       .ThenBy(t => t.Selection.StartColumn)
-                                       .Select(p => new Parameter
-                                       {
-                                           ParamAccessibility = ((VBAParser.ArgContext)p.Context).BYREF() == null ? Tokens.ByVal : Tokens.ByRef,
-                                           ParamName = p.IdentifierName,
-                                           ParamType = p.AsTypeName
-                                       })
-                                       .ToList();
+            var memberWithParams = member as IDeclarationWithParameter;
+            if (memberWithParams != null)
+            {
+                MemberParams = memberWithParams.Parameters
+                    .OrderBy(o => o.Selection.StartLine)
+                    .ThenBy(t => t.Selection.StartColumn)
+                    .Select(p => new Parameter
+                    {
+                        ParamAccessibility =
+                            ((VBAParser.ArgContext) p.Context).BYVAL() != null ? Tokens.ByVal : Tokens.ByRef,
+                        ParamName = p.IdentifierName,
+                        ParamType = p.AsTypeName
+                    })
+                    .ToList();
+            }
+            else
+            {
+                MemberParams = new List<Parameter>();
+            }
 
             if (MemberType == "Property Get")
             {
diff --git a/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs b/RetailCoder.VBE/Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs
@@ -17,7 +17,7 @@ public class ImplementInterfaceRefactoring : IRefactoring
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
 
-        private List<Declaration> _declarations;
+        private readonly List<Declaration> _declarations;
         private Declaration _targetInterface;
         private Declaration _targetClass;
 
@@ -91,7 +91,7 @@ private void AddItems(List<Declaration> members)
 
             var missingMembersText = members.Aggregate(string.Empty, (current, member) => current + Environment.NewLine + GetInterfaceMember(member));
 
-            module.InsertLines(module.CountOfDeclarationLines + 2, missingMembersText);
+            module.InsertLines(module.CountOfDeclarationLines + 1, missingMembersText);
         }
 
         private string GetInterfaceMember(Declaration member)
diff --git a/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs b/Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs
@@ -4,6 +4,7 @@
 using Rubberduck.Parsing.Binding;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.Extensions;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/RubberduckTests/Mocks/MockProjectBuilder.cs b/RubberduckTests/Mocks/MockProjectBuilder.cs
@@ -158,17 +158,18 @@ private Mock<VBComponents> CreateComponentsMock()
             result.Setup(m => m.Item(It.IsAny<string>())).Returns<string>(name => Components.Single(item => item.Name == name));
             result.SetupGet(m => m.Count).Returns(Components.Count);
 
-            result.Setup(m => m.Add(It.IsAny<vbext_ComponentType>())).Callback((vbext_ComponentType c) =>
-            {
-                _componentsMock.Add(CreateComponentMock("test", c, string.Empty, new Selection()));
-            });
-            result.Setup(m => m.Add(It.IsAny<vbext_ComponentType>())).Returns(() =>
-            {
-                var lastComponent = _componentsMock.LastOrDefault();
-                return lastComponent == null
-                    ? null
-                    : lastComponent.Object;
-            });
+            result.Setup(m => m.Add(It.IsAny<vbext_ComponentType>()))
+                .Callback((vbext_ComponentType c) =>
+                {
+                    _componentsMock.Add(CreateComponentMock("test", c, string.Empty, new Selection()));
+                })
+                .Returns(() =>
+                {
+                    var lastComponent = _componentsMock.LastOrDefault();
+                    return lastComponent == null
+                        ? null
+                        : lastComponent.Object;
+                });
 
             result.Setup(m => m.Remove(It.IsAny<VBComponent>())).Callback((VBComponent c) =>
             {
@@ -286,7 +287,7 @@ private Mock<CodeModule> CreateCodeModuleMock(string content)
                 {
                     if (index - 1 >= lines.Count)
                     {
-                        lines.AddRange(newLine.Split(new[] {Environment.NewLine}, StringSplitOptions.None));
+                        lines.AddRange(newLine.Split(new[] { Environment.NewLine }, StringSplitOptions.None));
                     }
                     else
                     {
diff --git a/RubberduckTests/Refactoring/ExtractInterfaceTests.cs b/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
diff --git a/RubberduckTests/Refactoring/ImplementInterfaceTests.cs b/RubberduckTests/Refactoring/ImplementInterfaceTests.cs
diff --git a/RubberduckTests/RubberduckTests.csproj b/RubberduckTests/RubberduckTests.csproj
diff --git a/RubberduckTests/TodoExplorer/TodoExplorerTests.cs b/RubberduckTests/TodoExplorer/TodoExplorerTests.cs

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel`
`42`	`42`
`43`	`43`	`if (_targetDeclaration == null)`
`44`	`44`	`{`
`45`		`- //throw new InvalidOperationException();`
`46`	`45`	`return;`
`47`	`46`	`}`
`48`	`47`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System.Linq;`
`2`	`2`	`using Microsoft.Vbe.Interop;`
`3`	`3`	`using Rubberduck.Parsing.VBA;`
`4`		`-using Rubberduck.VBEditor.Extensions;`
`5`	`4`
`6`	`5`	`namespace Rubberduck.Refactorings.ExtractInterface`
`7`	`6`	`{`
`@@ -20,7 +19,7 @@ public ExtractInterfacePresenterFactory(VBE vbe, RubberduckParserState state, IE`
`20`	`19`
`21`	`20`	`public ExtractInterfacePresenter Create()`
`22`	`21`	`{`
`23`		`- var selection = _vbe.ActiveCodePane.CodeModule.GetSelection();`
	`22`	`+ var selection = _vbe.ActiveCodePane.GetQualifiedSelection();`
`24`	`23`	`if (selection == null)`
`25`	`24`	`{`
`26`	`25`	`return null;`