Merge branch 'Issue2069' of https://github.com/Hosch250/Rubberduck

Author: Hosch250

Installer Build Script.iss

@@ -27,6 +27,7 @@ OutputDir={#OutputDirectory}
 OutputBaseFilename=Rubberduck.Setup.{#AppVersion}
 Compression=lzma
 SolidCompression=yes
+SignTool=RubberduckSignTool /d $qRubberduck Installer$q $f
 
 ArchitecturesAllowed=x86 x64
 ArchitecturesInstallIn64BitMode=x64

RetailCoder.VBE/Inspections/ParameterCanBeByValInspection.cs

@@ -44,6 +44,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
 
             issues.AddRange(declarations.Where(declaration =>
                 !declaration.IsArray
+                && (declaration.AsTypeDeclaration == null || declaration.AsTypeDeclaration.DeclarationType != DeclarationType.UserDefinedType)
                 && !declareScopes.Contains(declaration.ParentScope)
                 && !eventScopes.Contains(declaration.ParentScope)
                 && !interfaceScopes.Contains(declaration.ParentScope)

RetailCoder.VBE/Inspections/UnassignedVariableUsageInspection.cs

@@ -1,5 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
+using Antlr4.Runtime;
+using Rubberduck.Parsing;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 
@@ -27,10 +29,46 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 .SelectMany(declaration => declaration.References)
                 .Where(usage => !usage.IsInspectionDisabled(AnnotationName));
 
+            var lenFunction = BuiltInDeclarations.SingleOrDefault(s => s.Scope == "VBE7.DLL;VBA.Strings.Len");
+            var lenbFunction = BuiltInDeclarations.SingleOrDefault(s => s.Scope == "VBE7.DLL;VBA.Strings.LenB");
+
             foreach (var issue in usages)
             {
-                yield return new UnassignedVariableUsageInspectionResult(this, issue.Context, issue.QualifiedModuleName, issue.Declaration);
+                if (DeclarationReferencesContainsReference(lenFunction, issue) ||
+                    DeclarationReferencesContainsReference(lenbFunction, issue))
+                {
+                    continue;
+                }
+
+                yield return
+                    new UnassignedVariableUsageInspectionResult(this, issue.Context, issue.QualifiedModuleName,
+                        issue.Declaration);
+            }
+        }
+
+        private bool DeclarationReferencesContainsReference(Declaration parentDeclaration, IdentifierReference issue)
+        {
+            if (parentDeclaration == null)
+            {
+                return false;
+            }
+
+            var lenUsesIssue = false;
+            foreach (var reference in parentDeclaration.References)
+            {
+                var context = (ParserRuleContext) reference.Context.Parent;
+                if (context.GetSelection().Contains(issue.Selection))
+                {
+                    lenUsesIssue = true;
+                    break;
+                }
+            }
+
+            if (lenUsesIssue)
+            {
+                return true;
             }
+            return false;
         }
     }
 }

RetailCoder.VBE/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.5.*")]
-[assembly: AssemblyFileVersion("2.0.5.0")]
+[assembly: AssemblyVersion("2.0.6.*")]
+[assembly: AssemblyFileVersion("2.0.6.0")]

RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceModel.cs

@@ -42,7 +42,6 @@ public ExtractInterfaceModel(RubberduckParserState state, QualifiedSelection sel
 
             if (_targetDeclaration == null)
             {
-                //throw new InvalidOperationException();
                 return;
             }
 

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();

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;

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()

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")
             {

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)