UserForm modules have UserForm declaration type; fixes the tests broken by 49db96c

retailcoder · retailcoder · commit 688d9228d836 · 2020-08-16T23:26:00.000-04:00
diff --git a/Rubberduck.CodeAnalysis/Inspections/Concrete/ShadowedDeclarationInspection.cs b/Rubberduck.CodeAnalysis/Inspections/Concrete/ShadowedDeclarationInspection.cs
@@ -197,7 +197,7 @@ private static bool DeclarationInReferencedProjectCanBeShadowed(Declaration orig
                 return false;
             }
 
-            if (userDeclaration.DeclarationType == DeclarationType.ClassModule || userDeclaration.DeclarationType == DeclarationType.Document)
+            if (userDeclaration.DeclarationType.HasFlag(DeclarationType.ClassModule))
             {
                 switch (userDeclarationEnclosingType)
                 {
@@ -208,8 +208,7 @@ private static bool DeclarationInReferencedProjectCanBeShadowed(Declaration orig
                 }
             }
 
-            if ((userDeclaration.DeclarationType != DeclarationType.ClassModule && userDeclaration.DeclarationType != DeclarationType.Document) ||
-                (userDeclarationEnclosingType != ComponentType.UserForm && userDeclarationEnclosingType != ComponentType.Document))
+            if (!userDeclaration.DeclarationType.HasFlag(DeclarationType.ClassModule))
             {
                 if (!ReferencedProjectTypeShadowingRelations[originalDeclaration.DeclarationType].Contains(userDeclaration.DeclarationType))
                 {
@@ -256,22 +255,25 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi
             // It is not possible to directly access any declarations placed inside a Class Module.
             if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&
                 originalDeclaration.DeclarationType != DeclarationType.Document &&
+                originalDeclaration.DeclarationType != DeclarationType.UserForm &&
                 originalDeclarationEnclosingType == 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 &&
-                originalDeclaration.DeclarationType != DeclarationType.Document && 
+                originalDeclaration.DeclarationType != DeclarationType.Document &&
+                originalDeclaration.DeclarationType != DeclarationType.UserForm &&
                 originalDeclarationEnclosingType == ComponentType.Document)
             {
                 return false;
             }
 
-            // It is not possible to directly access any declarations placed inside a User Form. (User Forms have DeclarationType ClassMoodule.)
+            // It is not possible to directly access any declarations placed inside a User Form.
             if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&
-                originalDeclaration.DeclarationType != DeclarationType.Document && 
+                originalDeclaration.DeclarationType != DeclarationType.Document &&
+                originalDeclaration.DeclarationType != DeclarationType.UserForm &&
                 originalDeclarationEnclosingType == ComponentType.UserForm)
             {
                 return false;
@@ -315,9 +317,11 @@ private static bool DeclarationInTheSameComponentCanBeShadowed(Declaration origi
             if (originalDeclaration.DeclarationType == DeclarationType.ProceduralModule || 
                 originalDeclaration.DeclarationType == DeclarationType.ClassModule ||
                 originalDeclaration.DeclarationType == DeclarationType.Document ||
+                originalDeclaration.DeclarationType == DeclarationType.UserForm ||
                 userDeclaration.DeclarationType == DeclarationType.ProceduralModule || 
                 userDeclaration.DeclarationType == DeclarationType.ClassModule ||
-                userDeclaration.DeclarationType == DeclarationType.Document)
+                userDeclaration.DeclarationType == DeclarationType.Document ||
+                userDeclaration.DeclarationType == DeclarationType.UserForm)
             {
                 return false;
             }
diff --git a/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs b/Rubberduck.Parsing/VBA/DeclarationCaching/DeclarationFinder.cs
@@ -243,6 +243,7 @@ private IDictionary<ClassModuleDeclaration, List<Declaration>> FindAllInterfaceM
         {
             return UserDeclarations(DeclarationType.ClassModule)
                 .Concat(UserDeclarations(DeclarationType.Document))
+                .Concat(UserDeclarations(DeclarationType.UserForm))
                 .Cast<ClassModuleDeclaration>()
                 .Where(module => module.IsInterface)
                 .ToDictionary(
diff --git a/Rubberduck.Parsing/VBA/DeclarationResolving/DeclarationResolveRunnerBase.cs b/Rubberduck.Parsing/VBA/DeclarationResolving/DeclarationResolveRunnerBase.cs
@@ -206,7 +206,9 @@ private ModuleDeclaration NewModuleDeclaration(
                         qualifiedModuleName.ComponentName,
                         true,
                         moduleAnnotations,
-                        moduleAttributes, isUserForm:true);
+                        moduleAttributes, 
+                        hasDefaultInstanceVariable:true, 
+                        isUserForm:true);
                 case ComponentType.Document:
                     return new DocumentModuleDeclaration(
                         qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
diff --git a/Rubberduck.Parsing/VBA/ReferenceManagement/CompilationPasses/TypeHierarchyPass.cs b/Rubberduck.Parsing/VBA/ReferenceManagement/CompilationPasses/TypeHierarchyPass.cs
@@ -33,6 +33,7 @@ public void Execute(IReadOnlyCollection<QualifiedModuleName> modules)
         {
             var toRelsolveSupertypesFor = _declarationFinder.UserDeclarations(DeclarationType.ClassModule)
                                             .Concat(_declarationFinder.UserDeclarations(DeclarationType.Document))
+                                            .Concat(_declarationFinder.UserDeclarations(DeclarationType.UserForm))
                                             .Where(decl => modules.Contains(decl.QualifiedName.QualifiedModuleName))
                                             .Concat(_declarationFinder.BuiltInDeclarations(DeclarationType.ClassModule));
             foreach (var declaration in toRelsolveSupertypesFor)

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ private static bool DeclarationInReferencedProjectCanBeShadowed(Declaration orig`
`197`	`197`	`return false;`
`198`	`198`	`}`
`199`	`199`
`200`		`- if (userDeclaration.DeclarationType == DeclarationType.ClassModule \|\| userDeclaration.DeclarationType == DeclarationType.Document)`
	`200`	`+ if (userDeclaration.DeclarationType.HasFlag(DeclarationType.ClassModule))`
`201`	`201`	`{`
`202`	`202`	`switch (userDeclarationEnclosingType)`
`203`	`203`	`{`
`@@ -208,8 +208,7 @@ private static bool DeclarationInReferencedProjectCanBeShadowed(Declaration orig`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`		`- if ((userDeclaration.DeclarationType != DeclarationType.ClassModule && userDeclaration.DeclarationType != DeclarationType.Document) \|\|`
`212`		`- (userDeclarationEnclosingType != ComponentType.UserForm && userDeclarationEnclosingType != ComponentType.Document))`
	`211`	`+ if (!userDeclaration.DeclarationType.HasFlag(DeclarationType.ClassModule))`
`213`	`212`	`{`
`214`	`213`	`if (!ReferencedProjectTypeShadowingRelations[originalDeclaration.DeclarationType].Contains(userDeclaration.DeclarationType))`
`215`	`214`	`{`
`@@ -256,22 +255,25 @@ private static bool DeclarationInAnotherComponentCanBeShadowed(Declaration origi`
`256`	`255`	`// It is not possible to directly access any declarations placed inside a Class Module.`
`257`	`256`	`if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&`
`258`	`257`	`originalDeclaration.DeclarationType != DeclarationType.Document &&`
	`258`	`+ originalDeclaration.DeclarationType != DeclarationType.UserForm &&`
`259`	`259`	`originalDeclarationEnclosingType == ComponentType.ClassModule)`
`260`	`260`	`{`
`261`	`261`	`return false;`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`// It is not possible to directly access any declarations placed inside a Document Module. (Document Modules have DeclarationType ClassMoodule.)`
`265`	`265`	`if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&`
`266`		`- originalDeclaration.DeclarationType != DeclarationType.Document &&`
	`266`	`+ originalDeclaration.DeclarationType != DeclarationType.Document &&`
	`267`	`+ originalDeclaration.DeclarationType != DeclarationType.UserForm &&`
`267`	`268`	`originalDeclarationEnclosingType == ComponentType.Document)`
`268`	`269`	`{`
`269`	`270`	`return false;`
`270`	`271`	`}`
`271`	`272`
`272`		`- // It is not possible to directly access any declarations placed inside a User Form. (User Forms have DeclarationType ClassMoodule.)`
	`273`	`+ // It is not possible to directly access any declarations placed inside a User Form.`
`273`	`274`	`if (originalDeclaration.DeclarationType != DeclarationType.ClassModule &&`
`274`		`- originalDeclaration.DeclarationType != DeclarationType.Document &&`
	`275`	`+ originalDeclaration.DeclarationType != DeclarationType.Document &&`
	`276`	`+ originalDeclaration.DeclarationType != DeclarationType.UserForm &&`
`275`	`277`	`originalDeclarationEnclosingType == ComponentType.UserForm)`
`276`	`278`	`{`
`277`	`279`	`return false;`
`@@ -315,9 +317,11 @@ private static bool DeclarationInTheSameComponentCanBeShadowed(Declaration origi`
`315`	`317`	`if (originalDeclaration.DeclarationType == DeclarationType.ProceduralModule \|\|`
`316`	`318`	`originalDeclaration.DeclarationType == DeclarationType.ClassModule \|\|`
`317`	`319`	`originalDeclaration.DeclarationType == DeclarationType.Document \|\|`
	`320`	`+ originalDeclaration.DeclarationType == DeclarationType.UserForm \|\|`
`318`	`321`	`userDeclaration.DeclarationType == DeclarationType.ProceduralModule \|\|`
`319`	`322`	`userDeclaration.DeclarationType == DeclarationType.ClassModule \|\|`
`320`		`- userDeclaration.DeclarationType == DeclarationType.Document)`
	`323`	`+ userDeclaration.DeclarationType == DeclarationType.Document \|\|`
	`324`	`+ userDeclaration.DeclarationType == DeclarationType.UserForm)`
`321`	`325`	`{`
`322`	`326`	`return false;`
`323`	`327`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,6 +243,7 @@ private IDictionary<ClassModuleDeclaration, List<Declaration>> FindAllInterfaceM`
`243`	`243`	`{`
`244`	`244`	`return UserDeclarations(DeclarationType.ClassModule)`
`245`	`245`	`.Concat(UserDeclarations(DeclarationType.Document))`
	`246`	`+ .Concat(UserDeclarations(DeclarationType.UserForm))`
`246`	`247`	`.Cast<ClassModuleDeclaration>()`
`247`	`248`	`.Where(module => module.IsInterface)`
`248`	`249`	`.ToDictionary(`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public void Execute(IReadOnlyCollection<QualifiedModuleName> modules)`
`33`	`33`	`{`
`34`	`34`	`var toRelsolveSupertypesFor = _declarationFinder.UserDeclarations(DeclarationType.ClassModule)`
`35`	`35`	`.Concat(_declarationFinder.UserDeclarations(DeclarationType.Document))`
	`36`	`+ .Concat(_declarationFinder.UserDeclarations(DeclarationType.UserForm))`
`36`	`37`	`.Where(decl => modules.Contains(decl.QualifiedName.QualifiedModuleName))`
`37`	`38`	`.Concat(_declarationFinder.BuiltInDeclarations(DeclarationType.ClassModule));`
`38`	`39`	`foreach (var declaration in toRelsolveSupertypesFor)`