Revert userform declaration type back to DeclarationType.ClassModule.

Author: retailcoder

Rubberduck.Core/UI/Converters/CodeExplorerNodeToIconConverter.cs

@@ -98,8 +98,9 @@ public override object Convert(object value, Type targetType, object parameter,
                         return InterfaceIcon;
                     }
 
+                    var isUserForm = component.Declaration.QualifiedModuleName.ComponentType == VBEditor.SafeComWrappers.ComponentType.UserForm; 
                     return DeclarationIcons.ContainsKey(component.Declaration.DeclarationType)
-                        ? DeclarationIcons[component.Declaration.DeclarationType]
+                        ? DeclarationIcons[isUserForm ? DeclarationType.UserForm : component.Declaration.DeclarationType]
                         : ExceptionIcon;
                 default:
                     return value is ICodeExplorerNode node &&

Rubberduck.Parsing/Symbols/ClassModuleDeclaration.cs

@@ -29,13 +29,12 @@ public ClassModuleDeclaration(
                   bool isWithEvents = false,
                   bool hasDefaultInstanceVariable = false,
                   bool isControl = false,
-                  bool isDocument = false,
-                  bool isUserForm = false)
+                  bool isDocument = false)
             : base(
                   qualifiedName,
                   projectDeclaration,
                   name,
-                  isDocument ? DeclarationType.Document : isUserForm ? DeclarationType.UserForm : DeclarationType.ClassModule,
+                  isDocument ? DeclarationType.Document : DeclarationType.ClassModule,
                   isUserDefined,
                   annotations,
                   attributes,

Rubberduck.Parsing/VBA/DeclarationResolving/DeclarationResolveRunnerBase.cs

@@ -191,6 +191,7 @@ private ModuleDeclaration NewModuleDeclaration(
                         true,
                         moduleAnnotations,
                         moduleAttributes);
+
                 case ComponentType.ClassModule:
                     return new ClassModuleDeclaration(
                         qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
@@ -199,24 +200,16 @@ private ModuleDeclaration NewModuleDeclaration(
                         true,
                         moduleAnnotations,
                         moduleAttributes);
-                case ComponentType.UserForm:
-                    return new ClassModuleDeclaration(
-                        qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
-                        projectDeclaration,
-                        qualifiedModuleName.ComponentName,
-                        true,
-                        moduleAnnotations,
-                        moduleAttributes, 
-                        hasDefaultInstanceVariable:true, 
-                        isUserForm:true);
+
                 case ComponentType.Document:
                     return new DocumentModuleDeclaration(
                         qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
                         projectDeclaration,
                         qualifiedModuleName.ComponentName,
                         moduleAnnotations,
                         moduleAttributes);
-                default:
+
+                default: /*ComponentType.UserForm*/
                     return new ClassModuleDeclaration(
                         qualifiedModuleName.QualifyMemberName(qualifiedModuleName.ComponentName),
                         projectDeclaration,