Merge pull request #3504 from MDoerner/SimplyfyShadowedDeclarationTests

Simplified unit tests for shadowed declaration inspection.

Author: retailcoder

RetailCoder.VBE/Root/RubberduckIoCInstaller.cs

@@ -223,6 +223,8 @@ private static void RegisterQuickFixes(IWindsorContainer container, Assembly[] a
             {
                 container.Register(Classes.FromAssembly(assembly)
                     .BasedOn<IQuickFix>()
+                    .WithService.Base()
+                    .WithService.Self()
                     .LifestyleSingleton());
             }
         }
@@ -245,6 +247,7 @@ private static void RegisterParseTreeInspections(IWindsorContainer container, As
                 container.Register(Classes.FromAssembly(assembly)
                     .BasedOn<IParseTreeInspection>()
                     .WithService.Base()
+                    .WithService.Select(new[]{typeof(IInspection)})
                     .LifestyleTransient());
             }
         }

Rubberduck.Inspections/Concrete/ShadowedDeclarationInspection.cs

@@ -201,19 +201,31 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi
 
             var originalDeclarationComponentType = originalDeclaration.QualifiedName.QualifiedModuleName.ComponentType;
 
-            // It is not possible to directly access a Parameter, UDT Member or Label declared in another component
+            // It is not possible to directly access a Parameter, UDT Member or Label declared in another component.
             if (originalDeclaration.DeclarationType == DeclarationType.Parameter || originalDeclaration.DeclarationType == DeclarationType.UserDefinedTypeMember ||
                 originalDeclaration.DeclarationType == DeclarationType.LineLabel)
             {
                 return false;
             }
 
-            // It is not possible to directly access any declarations placed inside a Class Module
+            // It is not possible to directly access any declarations placed inside a Class Module.
             if (originalDeclaration.DeclarationType != DeclarationType.ClassModule && originalDeclarationComponentType == ComponentType.ClassModule)
             {
                 return false;
             }
 
+            // It is not possible to directly access any declarations placed inside a Document Module. (Document Modules have DeclarationType ClassMoodule.)
+            if (originalDeclaration.DeclarationType != DeclarationType.ClassModule && originalDeclarationComponentType == ComponentType.Document)
+            {
+                return false;
+            }
+
+            // It is not possible to directly access any declarations placed inside a User Form. (User Forms have DeclarationType ClassMoodule.)
+            if (originalDeclaration.DeclarationType != DeclarationType.ClassModule && originalDeclarationComponentType == ComponentType.UserForm)
+            {
+                return false;
+            }
+
             if (originalDeclaration.DeclarationType == DeclarationType.ClassModule)
             {
                 // Syntax of instantiating a new class makes it impossible to be shadowed
@@ -234,9 +246,15 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi
                     return false;
                 }
             }
-            else if (!OtherComponentTypeShadowingRelations[originalDeclaration.DeclarationType].Contains(userDeclaration.DeclarationType))
+            else
             {
-                return false;
+                HashSet<DeclarationType> shadowedTypes;
+                if (!OtherComponentTypeShadowingRelations.TryGetValue(originalDeclaration.DeclarationType,
+                        out shadowedTypes)
+                    || !shadowedTypes.Contains(userDeclaration.DeclarationType))
+                {
+                    return false;
+                }
             }
 
             // Events don't have a body, so their parameters can't be accessed