Fix a few more inspections

Author: Hosch250

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -220,33 +220,35 @@ public static IEnumerable<Declaration> FindEventHandlers(this IEnumerable<Declar
                 && declaration.IdentifierName.StartsWith(control.IdentifierName + "_"));
         }
 
-        public static IEnumerable<Declaration> FindBuiltInEventHandlers(this List<Declaration> declarations)
+        public static IEnumerable<Declaration> FindBuiltInEventHandlers(this IEnumerable<Declaration> declarations)
         {
-            var handlerNames = declarations.Where(declaration => declaration.IsBuiltIn && declaration.DeclarationType == DeclarationType.Event)
+            var declarationList = declarations.ToList();
+
+            var handlerNames = declarationList.Where(declaration => declaration.IsBuiltIn && declaration.DeclarationType == DeclarationType.Event)
                                            .Select(e => e.ParentDeclaration.IdentifierName + "_" + e.IdentifierName);
 
             // class module built-in events
-            var classModuleHandlers = declarations.Where(item =>
+            var classModuleHandlers = declarationList.Where(item =>
                         item.DeclarationType == DeclarationType.Procedure &&
                         item.ParentDeclaration.DeclarationType == DeclarationType.ClassModule &&
                         (item.IdentifierName == "Class_Initialize" || item.IdentifierName == "Class_Terminate"));
 
             // user form built-in events
-            var userFormHandlers = declarations.Where(item =>
+            var userFormHandlers = declarationList.Where(item =>
                 item.DeclarationType == DeclarationType.Procedure &&
                 item.ParentDeclaration.DeclarationType == DeclarationType.ClassModule &&
                 item.QualifiedName.QualifiedModuleName.Component.Type == vbext_ComponentType.vbext_ct_MSForm &&
                 new[]
                 {
                     "UserForm_Activate", "UserForm_AddControl", "UserForm_BeforeDragOver", "UserForm_BeforeDropOrPaste",
-                    "UserForm_Click", "UserForm_DblCIick", "UserForm_Deactivate", "UserForm_Error",
+                    "UserForm_Click", "UserForm_DblClick", "UserForm_Deactivate", "UserForm_Error",
                     "UserForm_Initialize", "UserForm_KeyDown", "UserForm_KeyPress", "UserForm_KeyUp", "UserForm_Layout",
                     "UserForm_MouseDown", "UserForm_MouseMove", "UserForm_MouseUp", "UserForm_QueryClose",
                     "UserForm_RemoveControl", "UserForm_Resize", "UserForm_Scroll", "UserForm_Terminate",
                     "UserForm_Zoom"
                 }.Contains(item.IdentifierName));
 
-            var handlers = declarations.Where(declaration => !declaration.IsBuiltIn
+            var handlers = declarationList.Where(declaration => !declaration.IsBuiltIn
                                                      && declaration.DeclarationType == DeclarationType.Procedure
                                                      && handlerNames.Contains(declaration.IdentifierName)).ToList();
 

RetailCoder.VBE/Inspections/ImplicitByRefParameterInspection.cs

@@ -30,6 +30,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                     // ParamArray parameters do not allow an explicit "ByRef" parameter mechanism.               
                     && !((ParameterDeclaration)item).IsParamArray
                     && !interfaceMembers.Select(m => m.Scope).Contains(item.ParentScope)
+                    && !UserDeclarations.FindBuiltInEventHandlers().Contains(item.ParentDeclaration)
                 let arg = item.Context as VBAParser.ArgContext
                 where arg != null && arg.BYREF() == null && arg.BYVAL() == null
                 select new QualifiedContext<VBAParser.ArgContext>(item.QualifiedName, arg))

RetailCoder.VBE/Inspections/ParameterCanBeByValInspection.cs

@@ -49,7 +49,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
 
             var eventScopes = declarations.Where(item =>
                 !item.IsBuiltIn && item.DeclarationType == DeclarationType.Event)
-                .Select(e => e.Scope);
+                .Select(e => e.Scope).Concat(declarations.FindBuiltInEventHandlers().Select(e => e.Scope));
 
             var declareScopes = declarations.Where(item =>
                     item.DeclarationType == DeclarationType.LibraryFunction

RetailCoder.VBE/Inspections/ProcedureCanBeWrittenAsFunctionInspection.cs

@@ -71,7 +71,8 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                     if (declaration == null) { return false; }  // rather be safe than sorry
 
                     return UserDeclarations.Where(item => item.IsWithEvents)
-                            .All(withEvents => UserDeclarations.FindEventProcedures(withEvents) == null);
+                            .All(withEvents => UserDeclarations.FindEventProcedures(withEvents) == null) &&
+                            !UserDeclarations.FindBuiltInEventHandlers().Contains(declaration);
                 });
 
             return ParseTreeResults.ArgListsWithOneByRefParam