Remove FindControlEventHandlers from DeclarationExtensions

Author: MDoerner

Rubberduck.CodeAnalysis/Inspections/Concrete/ProcedureNotUsedInspection.cs

@@ -8,6 +8,7 @@
 using Rubberduck.Resources.Inspections;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Parsing.VBA.Extensions;
 using Rubberduck.VBEditor.SafeComWrappers;
 
 namespace Rubberduck.Inspections.Concrete
@@ -59,40 +60,19 @@ public ProcedureNotUsedInspection(RubberduckParserState state) : base(state) { }
 
         protected override IEnumerable<IInspectionResult> DoGetInspectionResults()
         {
-            var declarations = UserDeclarations.ToList();
-
             var classes = State.DeclarationFinder.UserDeclarations(DeclarationType.ClassModule)
                 .Concat(State.DeclarationFinder.UserDeclarations(DeclarationType.Document))
                 .ToList(); 
             var modules = State.DeclarationFinder.UserDeclarations(DeclarationType.ProceduralModule).ToList();
 
-            var handlers = State.DeclarationFinder.UserDeclarations(DeclarationType.Control)
-                .SelectMany(control => declarations.FindEventHandlers(control)).ToList();
+            var handlers = State.DeclarationFinder.FindEventHandlers().ToHashSet();
 
-            var builtInHandlers = State.DeclarationFinder.FindEventHandlers();
-            handlers.AddRange(builtInHandlers);
+            var interfaceMembers = State.DeclarationFinder.FindAllInterfaceMembers().ToHashSet();
+            var implementingMembers = State.DeclarationFinder.FindAllInterfaceImplementingMembers().ToHashSet();
 
-            var withEventFields = State.DeclarationFinder.UserDeclarations(DeclarationType.Variable).Where(item => item.IsWithEvents).ToList();
-            var withHanders = withEventFields
-                .SelectMany(field => State.DeclarationFinder.FindHandlersForWithEventsField(field))
+            var items = State.AllUserDeclarations
+                .Where(item => !IsIgnoredDeclaration(item, interfaceMembers, implementingMembers, handlers, classes, modules))
                 .ToList();
-
-            handlers.AddRange(withHanders);
-
-            var forms = State.DeclarationFinder.UserDeclarations(DeclarationType.ClassModule)
-                .Where(item => item.QualifiedName.QualifiedModuleName.ComponentType == ComponentType.UserForm)
-                .ToList();
-
-            if (forms.Any())
-            {
-                handlers.AddRange(forms.SelectMany(form => State.FindFormEventHandlers(form)));
-            }
-
-            var interfaceMembers = State.DeclarationFinder.FindAllInterfaceMembers().ToList();
-            var implementingMembers = State.DeclarationFinder.FindAllInterfaceImplementingMembers().ToList();
-
-            var items = declarations
-                .Where(item => !IsIgnoredDeclaration(item, interfaceMembers, implementingMembers, handlers, classes, modules)).ToList();
             var issues = items.Select(issue => new DeclarationInspectionResult(this,
                                                                     string.Format(InspectionResults.IdentifierNotUsedInspection, issue.DeclarationType.ToLocalizedString(), issue.IdentifierName),
                                                                     issue));

Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs

@@ -51,6 +51,7 @@ public class DeclarationFinder
 
         private Lazy<List<Declaration>> _nonBaseAsType;
         private Lazy<List<Declaration>> _eventHandlers;
+        private Lazy<List<Declaration>> _controlEventHandlers;
         private Lazy<List<Declaration>> _projects;
         private Lazy<List<Declaration>> _classes;
 
@@ -165,6 +166,7 @@ private void InitializeLazyCollections()
                 , true);
 
             _eventHandlers = new Lazy<List<Declaration>>(FindAllEventHandlers, true);
+            _controlEventHandlers = new Lazy<List<Declaration>>(FindAllFormControlHandlers, true);
             _projects = new Lazy<List<Declaration>>(() => DeclarationsWithType(DeclarationType.Project).ToList(), true);
             _classes = new Lazy<List<Declaration>>(() => DeclarationsWithType(DeclarationType.ClassModule).ToList(), true);
             _handlersByWithEventsField = new Lazy<IDictionary<Declaration, List<Declaration>>>(FindAllHandlersByWithEventField, true);
@@ -302,6 +304,18 @@ public IEnumerable<Declaration> FindEventHandlers()
             return _eventHandlers.Value;
         }
 
+        public IEnumerable<Declaration> FindFormControlEventHandlers()
+        {
+            return _controlEventHandlers.Value;
+        }
+
+        public IEnumerable<Declaration> FindFormControlEventHandlers(Declaration control)
+        {
+            return _eventHandlers.Value
+                .Where(handlers=> handlers.ParentScope == control.ParentScope
+                                  && handlers.IdentifierName.StartsWith(control.IdentifierName + "_"));
+        }
+
         public IEnumerable<Declaration> Classes => _classes.Value;
         public IEnumerable<Declaration> Projects => _projects.Value;
 
@@ -1165,15 +1179,15 @@ private IEnumerable<Declaration> FindAllInReferencedProjectByPriority(Declaratio
             }
         }
 
-        private IEnumerable<Declaration> FindAllFormControlHandlers()
+        private List<Declaration> FindAllFormControlHandlers()
         {
             var controls = DeclarationsWithType(DeclarationType.Control);
             var handlerNames = BuiltInDeclarations(DeclarationType.Event)
                 .SelectMany(e => controls.Select(c => c.IdentifierName + "_" + e.IdentifierName))
                 .ToHashSet();
             var handlers = UserDeclarations(DeclarationType.Procedure)
                 .Where(procedure => handlerNames.Contains(procedure.IdentifierName));
-            return handlers;
+            return handlers.ToList();
         }
 
         private List<Declaration> FindAllEventHandlers()
@@ -1197,7 +1211,7 @@ private List<Declaration> FindAllEventHandlers()
                         .Where(item => handlerNames.Contains(item.IdentifierName))
                 )
                 .Concat(_handlersByWithEventsField.Value.AllValues())
-                .Concat(FindAllFormControlHandlers());
+                .Concat(FindFormControlEventHandlers());
             return handlers.ToList();
 
             // Local functions to help break up the complex logic in finding built-in handlers

Rubberduck.Refactorings/Common/DeclarationExtensions.cs

@@ -1,29 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor.SafeComWrappers;
 
-// ReSharper disable LocalizableElement
-
 namespace Rubberduck.Common
 {
     public static class DeclarationExtensions
     {
-        /// <summary>
-        /// Finds all event handler procedures for specified control declaration.
-        /// </summary>
-        public static IEnumerable<Declaration> FindEventHandlers(this IEnumerable<Declaration> declarations, Declaration control)
-        {
-            Debug.Assert(control.DeclarationType == DeclarationType.Control);
-
-            return declarations.Where(declaration => declaration.ParentScope == control.ParentScope
-                && declaration.DeclarationType == DeclarationType.Procedure
-                && declaration.IdentifierName.StartsWith(control.IdentifierName + "_"));
-        }
-
         public static IEnumerable<Declaration> FindUserEventHandlers(this IEnumerable<Declaration> declarations)
         {
             var declarationList = declarations.ToList();