Extract namespace-level functions and variable generation into its own method.

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -219,29 +219,34 @@ namespace CppSharp.Generators.CSharp
 
         public override bool VisitDeclContext(DeclarationContext context)
         {
-            // Generate all the enum declarations.
             foreach (var @enum in context.Enums)
-            {
                 GenerateEnum(@enum);
-            }
 
-            // Generate all the typedef declarations.
             foreach (var typedef in context.Typedefs)
-            {
                 GenerateTypedef(typedef);
-            }
 
-            // Generate all the struct/class declarations.
             foreach (var @class in context.Classes)
-            {
                 @class.Visit(this);
+
+            foreach (var @event in context.Events)
+                GenerateEvent(@event);
+
+            GenerateNamespaceFunctionsAndVariables(context);
+
+            foreach(var childNamespace in context.Namespaces)
+                childNamespace.Visit(this);
+
+            return true;
         }
 
-            if (context.Functions.Any(f => f.IsGenerated) ||
+        void GenerateNamespaceFunctionsAndVariables(DeclarationContext context)
-                (!(context is Class) &&
-                context.Variables.Any(
-                    v => v.IsGenerated && v.Access == AccessSpecifier.Public)))
         {
+            var hasGlobalVariables = !(context is Class) && context.Variables.Any(
+                v => v.IsGenerated && v.Access == AccessSpecifier.Public);
+
+            if (!context.Functions.Any(f => f.IsGenerated) && !hasGlobalVariables)
+                return;
+
             PushBlock(CSharpBlockKind.Functions);
             var parentName = Helpers.SafeIdentifier(context.TranslationUnit.FileNameWithoutExtension);
             WriteLine("public unsafe partial class {0}", parentName);
@@ -277,17 +282,6 @@ namespace CppSharp.Generators.CSharp
             PopBlock(NewLineKind.BeforeNextBlock);
         }
 
-            foreach (var @event in context.Events)
-            {
-                GenerateEvent(@event);
-            }
-
-            foreach(var childNamespace in context.Namespaces)
-                childNamespace.Visit(this);
-
-            return true;
-        }
-
         private void GenerateClassTemplateSpecializationInternal(Class classTemplate)
         {
             if (classTemplate.Specializations.Count == 0)