Reimplement FindEventHandlers taking an event declaration in the DeclarationFinder

Author: MDoerner

Rubberduck.CodeAnalysis/Inspections/Concrete/ParameterCanBeByValInspection.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Rubberduck.Common;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;
 using Rubberduck.Parsing;
@@ -12,7 +11,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Parsing.VBA.Extensions;
-using Rubberduck.Inspections.Inspections.Extensions;
 
 namespace Rubberduck.Inspections.Concrete
 {
@@ -157,11 +155,8 @@ private IEnumerable<ParameterDeclaration> EventMembersThatCanBeChangedToBePassed
 
                 var parameterCanBeChangedToBeByVal = eventParameters.Select(parameter => parameter.IsByRef).ToList();
 
-                //todo: Find a better way to find the handlers.
                 var eventHandlers = State.DeclarationFinder
-                    .AllUserDeclarations
-                    .FindHandlersForEvent(memberDeclaration)
-                    .Select(s => s.Item2)
+                    .FindEventHandlers(memberDeclaration)
                     .ToList();
 
                 foreach (var eventHandler in eventHandlers.OfType<IParameterizedDeclaration>())

Rubberduck.CodeAnalysis/Inspections/Concrete/ProcedureCanBeWrittenAsFunctionInspection.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Antlr4.Runtime;
-using Rubberduck.Common;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Results;
 using Rubberduck.Parsing;
@@ -11,7 +10,6 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
-using Rubberduck.Inspections.Inspections.Extensions;
 
 namespace Rubberduck.Inspections.Concrete
 {

Rubberduck.CodeAnalysis/QuickFixes/PassParameterByValueQuickFix.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Rubberduck.Common;
 using Rubberduck.Inspections.Abstract;
 using Rubberduck.Inspections.Concrete;
 using Rubberduck.Parsing.Grammar;
@@ -52,12 +51,14 @@ private void FixMethods(Declaration target, IRewriteSession rewriteSession)
                 return; // should only happen if the parse results are stale; prevents a crash in that case
             }
 
-            //FIXME: Make this use the DeclarationFinder.
             var members = target.ParentDeclaration.DeclarationType == DeclarationType.Event
-                ? _state.AllUserDeclarations.FindHandlersForEvent(target.ParentDeclaration)
-                    .Select(s => s.Item2)
+                ? _state.DeclarationFinder
+                    .FindEventHandlers(target.ParentDeclaration)
                     .ToList()
-                : _state.DeclarationFinder.FindInterfaceImplementationMembers(target.ParentDeclaration).Cast<Declaration>().ToList();
+                : _state.DeclarationFinder
+                    .FindInterfaceImplementationMembers(target.ParentDeclaration)
+                    .Cast<Declaration>()
+                    .ToList();
 
             foreach (var member in members)
             {

Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs

@@ -306,7 +306,15 @@ public IEnumerable<Declaration> FindEventHandlers()
         {
             return _eventHandlers.Value;
         }
-        
+
+        public IEnumerable<Declaration> FindEventHandlers(Declaration eventDeclaration)
+        {
+            var withEventsDeclarations = FindWithEventFields(eventDeclaration);
+            return withEventsDeclarations
+                .Select(withEventsField => FindHandlersForWithEventsField(withEventsField)
+                                            .Single(handler => handler.IdentifierName == $"{withEventsField.IdentifierName}_{eventDeclaration.IdentifierName}"));
+        }
+
         public IEnumerable<Declaration> FindFormControlEventHandlers()
         {
             return _controlEventHandlers.Value;
@@ -361,6 +369,16 @@ public IEnumerable<Declaration> FindHandlersForWithEventsField(Declaration field
                 : Enumerable.Empty<Declaration>();
         }
 
+        public IEnumerable<Declaration> FindWithEventFields()
+        {
+            return _handlersByWithEventsField.Value.Keys;
+        }
+
+        public IEnumerable<Declaration> FindWithEventFields(Declaration eventDeclaration)
+        {
+            return FindWithEventFields().Where(withEventField => withEventField.AsTypeName == eventDeclaration.ComponentName);
+        }
+
         /// <summary>
         /// Finds all members of a class that are implementing the interface defined by the passed context.
         /// </summary>

Rubberduck.Refactorings/Common/DeclarationExtensions.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using Rubberduck.Common;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;
@@ -84,17 +83,16 @@ private static RemoveParametersModel ResolvedInterfaceMemberTarget(RemoveParamet
 
         private RemoveParametersModel ResolvedEventTarget(RemoveParametersModel model)
         {
-            foreach (var events in _declarationFinderProvider
+            foreach (var eventDeclaration in _declarationFinderProvider
                 .DeclarationFinder
                 .UserDeclarations(DeclarationType.Event))
             {
                 if (_declarationFinderProvider.DeclarationFinder
-                    .AllUserDeclarations
-                    .FindHandlersForEvent(events)
-                    .Any(reference => Equals(reference.Item2, model.TargetDeclaration)))
+                    .FindEventHandlers(eventDeclaration)
+                    .Any(handler => Equals(handler, model.TargetDeclaration)))
                 {
                     model.IsEventRefactoring = true;
-                    model.TargetDeclaration = events;
+                    model.TargetDeclaration = eventDeclaration;
                     return model;
                 }
             }
@@ -289,10 +287,7 @@ private void AdjustSignatures(RemoveParametersModel model, IRewriteSession rewri
             RemoveSignatureParameters(model, model.TargetDeclaration, rewriteSession);
 
             var eventImplementations = _declarationFinderProvider.DeclarationFinder
-                .AllUserDeclarations
-                .Where(item => item.IsWithEvents && item.AsTypeName == model.TargetDeclaration.ComponentName)
-                .SelectMany(withEvents => _declarationFinderProvider.DeclarationFinder
-                    .FindHandlersForWithEventsField(withEvents));
+                .FindEventHandlers(model.TargetDeclaration);
 
             foreach (var eventImplementation in eventImplementations)
             {

Rubberduck.Refactorings/RemoveParameters/RemoveParametersRefactoring.cs

@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.Rewriter;
 using System.Collections.Generic;
 using System.Linq;
-using Rubberduck.Common;
 using Rubberduck.Parsing.VBA;
  using Rubberduck.Refactorings.Exceptions;
  using Rubberduck.VBEditor.Utility;
@@ -83,17 +82,16 @@ private static ReorderParametersModel ResolvedInterfaceMemberTarget(ReorderParam
 
         private ReorderParametersModel ResolvedEventTarget(ReorderParametersModel model)
         {
-            foreach (var events in _declarationFinderProvider
+            foreach (var eventDeclaration in _declarationFinderProvider
                 .DeclarationFinder
                 .UserDeclarations(DeclarationType.Event))
             {
                 if (_declarationFinderProvider.DeclarationFinder
-                    .AllUserDeclarations
-                    .FindHandlersForEvent(events)
-                    .Any(reference => Equals(reference.Item2, model.TargetDeclaration)))
+                    .FindEventHandlers(eventDeclaration)
+                    .Any(handler => Equals(handler, model.TargetDeclaration)))
                 {
                     model.IsEventRefactoring = true;
-                    model.TargetDeclaration = events;
+                    model.TargetDeclaration = eventDeclaration;
                     return model;
                 }
             }