Refactored enum item generation in CLI backend to use blocks.

src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@@ -614,9 +614,10 @@ namespace CppSharp.Generators.CLI
             WriteLine("{");
 
             PushIndent();
-            for (int i = 0; i < @enum.Items.Count; ++i)
+            foreach (var item in @enum.Items)
             {
-                var item = @enum.Items[i];
+                PushBlock(CLIBlockKind.EnumItem);
+
                 GenerateInlineSummary(item.Comment);
                 if (item.ExplicitValue)
                     Write(String.Format("{0} = {1}", SafeIdentifier(item.Name),
@@ -624,8 +625,10 @@ namespace CppSharp.Generators.CLI
                 else
                     Write(String.Format("{0}", SafeIdentifier(item.Name)));
 
-                if (i < @enum.Items.Count - 1)
+                if (item != @enum.Items.Last())
                     WriteLine(",");
+
+                PopBlock(NewLineKind.Never);
             }
             PopIndent();
 

src/Generator/Generators/CLI/CLITextTemplate.cs

@@ -30,7 +30,7 @@ namespace CppSharp.Generators.CLI
         public const int Namespace = BlockKind.LAST + 3;
         public const int ForwardReferences = BlockKind.LAST + 4;
         public const int Enum = BlockKind.LAST + 5;
-        public const int Typedef = BlockKind.LAST + 6;
+        public const int EnumItem = BlockKind.LAST + 6;
         public const int Class = BlockKind.LAST + 7;
         public const int Method = BlockKind.LAST + 8;
         public const int MethodBody = BlockKind.LAST + 9;
@@ -38,6 +38,7 @@ namespace CppSharp.Generators.CLI
         public const int FunctionsClass = BlockKind.LAST + 11;
         public const int Function = BlockKind.LAST + 12;
         public const int Property = BlockKind.LAST + 13;
+        public const int Typedef = BlockKind.LAST + 14;
     }
 
     /// <summary>