Make Debug a module

Author: MDoerner

Rubberduck.Parsing/Symbols/DeclarationLoaders/DebugDeclarations.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.Parsing.Annotations;
+using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Parsing.VBA.DeclarationCaching;
 using Rubberduck.VBEditor;
@@ -52,15 +53,11 @@ private static bool ThereIsADebugModule(DeclarationFinder finder, Declaration vb
         private List<Declaration> LoadDebugDeclarations(Declaration parentProject)
         {
             var debugModule = DebugModuleDeclaration(parentProject);
-            var debugClass = DebugClassDeclaration(parentProject); 
-            var debugObject = DebugObjectDeclaration(debugModule);
-            var debugAssert = DebugAssertDeclaration(debugClass);
-            var debugPrint = DebugPrintDeclaration(debugClass);
+            var debugAssert = DebugAssertDeclaration(debugModule);
+            var debugPrint = DebugPrintDeclaration(debugModule);
 
             return new List<Declaration> { 
                 debugModule,
-                debugClass,
-                debugObject,
                 debugAssert,
                 debugPrint
             };
@@ -70,7 +67,7 @@ private List<Declaration> LoadDebugDeclarations(Declaration parentProject)
         private static ProceduralModuleDeclaration DebugModuleDeclaration(Declaration parentProject)
         {
             return new ProceduralModuleDeclaration(
-                new QualifiedMemberName(DebugModuleName(parentProject), "DebugModule"),
+                new QualifiedMemberName(DebugModuleName(parentProject), Tokens.Debug),
                 parentProject,
                 "DebugModule",
                 false,
@@ -83,55 +80,15 @@ private static QualifiedModuleName DebugModuleName(Declaration parentProject)
                 return new QualifiedModuleName(
                     parentProject.QualifiedName.QualifiedModuleName.ProjectName,
                     parentProject.QualifiedName.QualifiedModuleName.ProjectPath,
-                    "DebugModule");
+                    Tokens.Debug);
             }
 
-
-        private static ClassModuleDeclaration DebugClassDeclaration(Declaration parentProject)
-        {
-            return new ClassModuleDeclaration(
-                new QualifiedMemberName(DebugClassName(parentProject), "DebugClass"), 
-                parentProject, 
-                "DebugClass", 
-                false, 
-                new List<IParseTreeAnnotation>(), 
-                new Attributes(), 
-                true);
-        }
-
-        private static QualifiedModuleName DebugClassName(Declaration parentProject)
-        {
-            return new QualifiedModuleName(
-                parentProject.QualifiedName.QualifiedModuleName.ProjectName,
-                parentProject.QualifiedName.QualifiedModuleName.ProjectPath,
-                "DebugClass");
-        }
-
-        private static Declaration DebugObjectDeclaration(ProceduralModuleDeclaration debugModule)
-        {
-            return new Declaration(
-                new QualifiedMemberName(debugModule.QualifiedName.QualifiedModuleName, "Debug"), 
-                debugModule, 
-                "Global", 
-                "DebugClass", 
-                null, 
-                true, 
-                false, 
-                Accessibility.Global, 
-                DeclarationType.Variable, 
-                false, 
-                null,
-                false,
-                new List<IParseTreeAnnotation>(),
-                new Attributes());
-        }
-
-        private static SubroutineDeclaration DebugAssertDeclaration(ClassModuleDeclaration debugClass)
+        private static SubroutineDeclaration DebugAssertDeclaration(ProceduralModuleDeclaration debugModule)
         {
             return new SubroutineDeclaration(
-                new QualifiedMemberName(debugClass.QualifiedName.QualifiedModuleName, "Assert"), 
-                debugClass, 
-                debugClass, 
+                new QualifiedMemberName(debugModule.QualifiedName.QualifiedModuleName, "Assert"),
+                debugModule,
+                debugModule, 
                 null, 
                 Accessibility.Global, 
                 null,
@@ -142,12 +99,12 @@ private static SubroutineDeclaration DebugAssertDeclaration(ClassModuleDeclarati
                 new Attributes());
         }
 
-        private static SubroutineDeclaration DebugPrintDeclaration(ClassModuleDeclaration debugClass)
+        private static SubroutineDeclaration DebugPrintDeclaration(ProceduralModuleDeclaration debugModule)
         {
             return new SubroutineDeclaration(
-                new QualifiedMemberName(debugClass.QualifiedName.QualifiedModuleName, "Print"), 
-                debugClass, 
-                debugClass, 
+                new QualifiedMemberName(debugModule.QualifiedName.QualifiedModuleName, "Print"),
+                debugModule,
+                debugModule, 
                 null, 
                 Accessibility.Global, 
                 null, 

Rubberduck.Parsing/Symbols/ProceduralModuleDeclaration.cs

@@ -1,6 +1,5 @@
 using Rubberduck.Parsing.Annotations;
 using Rubberduck.Parsing.ComReflection;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
 using System.Collections.Generic;