Merge pull request #2626 from comintern/next

Fix naming collision for built in enums and types. Ref #2620

Author: retailcoder

RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs

@@ -60,8 +60,6 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 handlers.AddRange(forms.SelectMany(form => State.FindFormEventHandlers(form)));
             }
 
-            //handlers.AddRange(builtInHandlers);
-
             var interfaceMembers = State.DeclarationFinder.FindAllInterfaceMembers().ToList();
             var implementingMembers = State.DeclarationFinder.FindAllInterfaceImplementingMembers().ToList();
 
@@ -78,7 +76,10 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
         private static readonly DeclarationType[] ProcedureTypes =
         {
             DeclarationType.Procedure,
-            DeclarationType.Function
+            DeclarationType.Function,
+            DeclarationType.LibraryProcedure,
+            DeclarationType.LibraryFunction,
+            DeclarationType.Event
         };
 
         private bool IsIgnoredDeclaration(Declaration declaration, IEnumerable<Declaration> interfaceMembers, IEnumerable<Declaration> interfaceImplementingMembers , IEnumerable<Declaration> handlers, IEnumerable<Declaration> classes, IEnumerable<Declaration> modules)

Rubberduck.Parsing/Symbols/ProceduralModuleDeclaration.cs

@@ -49,18 +49,18 @@ public ProceduralModuleDeclaration(ComModule statics, Declaration parent, Qualif
         //These are the pseudo-module ctor for COM enumerations and types.
         public ProceduralModuleDeclaration(ComEnumeration pseudo, Declaration parent, QualifiedModuleName module)
             : this(
-                module.QualifyMemberName(pseudo.Name),
+                module.QualifyMemberName(string.Format("_{0}", pseudo.Name)),
                 parent,
-                pseudo.Name,
+                string.Format("_{0}", pseudo.Name),
                 true,
                 new List<IAnnotation>(),
                 new Attributes()) { }
 
         public ProceduralModuleDeclaration(ComStruct pseudo, Declaration parent, QualifiedModuleName module)
             : this(
-                module.QualifyMemberName(pseudo.Name),
+                module.QualifyMemberName(string.Format("_{0}", pseudo.Name)),
                 parent,
-                pseudo.Name,
+                string.Format("_{0}", pseudo.Name),
                 true,
                 new List<IAnnotation>(),
                 new Attributes()) { }