fixed FormEventDeclarations

Author: MDoerner

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -140,6 +140,24 @@ public Declaration FindStdModule(string name, Declaration parent = null, bool in
             return result;
         }
 
+        public Declaration FindClassModule(string name, Declaration parent = null, bool includeBuiltIn = false)
+        {
+            Declaration result = null;
+            try
+            {
+                var matches = MatchName(name);
+                result = matches.SingleOrDefault(declaration => declaration.DeclarationType.HasFlag(DeclarationType.ClassModule)
+                    && (parent == null || parent.Equals(declaration.ParentDeclaration))
+                    && (includeBuiltIn || !declaration.IsBuiltIn));
+            }
+            catch (InvalidOperationException exception)
+            {
+                Logger.Error(exception, "Multiple matches found for class module '{0}'.", name);
+            }
+
+            return result;
+        }
+
         public Declaration FindReferencedProject(Declaration callingProject, string referencedProjectName)
         {
             return FindInReferencedProjectByPriority(callingProject, referencedProjectName, p => p.DeclarationType.HasFlag(DeclarationType.Project));

Rubberduck.Parsing/Symbols/FormEventDeclarations.cs

@@ -33,12 +33,11 @@ private static Declaration FormsClassModuleFromParserState(RubberduckParserState
             var msForms = finder.FindProject("MSForms");
             if (msForms == null)
             {
-                // If the VBA project is null, we haven't loaded any COM references;
-                // we're in a unit test and the mock project didn't setup any references.
+                //The corresponding COM reference has not been loaded.
                 return null;
             }
 
-            return finder.FindStdModule("FormEvents", msForms, true);
+            return finder.FindClassModule("FormEvents", msForms, true);
         }