Merge pull request #1721 from Hosch250/InspectionBugs

Fix built-in event discovery

Author: retailcoder

RetailCoder.VBE/API/DeclarationType.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 
 namespace Rubberduck.API
 {

RetailCoder.VBE/App.cs

@@ -18,7 +18,6 @@
 using System.Runtime.InteropServices.ComTypes;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Rubberduck.Common.Hotkeys;
 
 namespace Rubberduck
 {

RetailCoder.VBE/Common/ClipboardWriter.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media.Imaging;
 

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -225,35 +225,25 @@ public static IEnumerable<Declaration> FindBuiltInEventHandlers(this IEnumerable
             var declarationList = declarations.ToList();
 
             var handlerNames = declarationList.Where(declaration => declaration.IsBuiltIn && declaration.DeclarationType == DeclarationType.Event)
-                                           .Select(e => e.ParentDeclaration.IdentifierName + "_" + e.IdentifierName);
+                                           .SelectMany(e =>
+                                           {
+                                               var parentModuleSubtypes = ((ClassModuleDeclaration) e.ParentDeclaration).Subtypes;
+                                               return parentModuleSubtypes.Any()
+                                                   ? parentModuleSubtypes.Select(v => v.IdentifierName + "_" + e.IdentifierName)
+                                                   : new[] { e.ParentDeclaration.IdentifierName + "_" + e.IdentifierName };
+                                           });
 
             // class module built-in events
             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 = 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_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 = declarationList.Where(declaration => !declaration.IsBuiltIn
                                                      && declaration.DeclarationType == DeclarationType.Procedure
                                                      && handlerNames.Contains(declaration.IdentifierName)).ToList();
 
             handlers.AddRange(classModuleHandlers);
-            handlers.AddRange(userFormHandlers);
 
             return handlers;
         }

RetailCoder.VBE/Common/ExportFormatter.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading.Tasks;
 using System.Xml;
 
 namespace Rubberduck.Common

RetailCoder.VBE/Common/Hotkeys/Hotkey.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Windows.Forms;
 using System.Windows.Input;
 using Rubberduck.Common.WinAPI;

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;

RetailCoder.VBE/Common/WinAPI/DeviceInfoHid.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rubberduck.Common.WinAPI
+namespace Rubberduck.Common.WinAPI
 {
     public struct DeviceInfoHid
     {

RetailCoder.VBE/Common/WinAPI/DeviceInfoMouse.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rubberduck.Common.WinAPI
+namespace Rubberduck.Common.WinAPI
 {
     public struct DeviceInfoMouse
     {

RetailCoder.VBE/Common/WinAPI/DeviceNotification.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Rubberduck.Common.WinAPI
+namespace Rubberduck.Common.WinAPI
 {
     enum DeviceNotification
     {