Merge branch 'next' into next

Author: comintern

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -426,9 +426,7 @@ public static IEnumerable<Declaration> FindEventProcedures(this IEnumerable<Decl
             }
 
             var items = declarations as IList<Declaration> ?? declarations.ToList();
-            var type = items.SingleOrDefault(item => item.DeclarationType == DeclarationType.ClassModule
-                                                             && item.Project != null
-                                                             && item.IdentifierName == withEventsDeclaration.AsTypeName.Split('.').Last());
+            var type = withEventsDeclaration.AsTypeDeclaration;
 
             if (type == null)
             {
@@ -449,7 +447,7 @@ public static IEnumerable<Declaration> FindEventProcedures(this IEnumerable<Decl
 
         private static IEnumerable<Declaration> GetTypeMembers(this IEnumerable<Declaration> declarations, Declaration type)
         {
-            return declarations.Where(item => item.Project != null && item.ProjectId == type.ProjectId && item.ParentScope == type.Scope);
+            return declarations.Where(item => Equals(item.ParentScopeDeclaration, type));
         }
 
         /// <summary>

RetailCoder.VBE/Inspections/MoveFieldCloserToUsageInspection.cs

@@ -26,7 +26,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 .Where(declaration =>
                 {
 
-                    if (declaration.DeclarationType != DeclarationType.Variable ||
+                    if (declaration.DeclarationType != DeclarationType.Variable || declaration.IsWithEvents ||
                         !new[] {DeclarationType.ClassModule, DeclarationType.ProceduralModule}.Contains(declaration.ParentDeclaration.DeclarationType))
                     {
                         return false;

RetailCoder.VBE/Inspections/ProcedureNotUsedInspection.cs

@@ -43,7 +43,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
                 .SelectMany(control => declarations.FindEventHandlers(control)).ToList();
 
             var withEventFields = declarations.Where(item => item.DeclarationType == DeclarationType.Variable && item.IsWithEvents);
-            handlers.AddRange(withEventFields.SelectMany(declarations.FindEventProcedures));
+            handlers.AddRange(withEventFields.SelectMany(Declarations.FindEventProcedures));
 
             var forms = declarations.Where(item => item.DeclarationType == DeclarationType.ClassModule
                         && item.QualifiedName.QualifiedModuleName.Component.Type == ComponentType.UserForm)