improving icon enum generation

Author: ButchersBoy

mdresgen/IconThing.cs

@@ -61,16 +61,42 @@ private void UpdateEnum(string sourceFile)
             var enumDeclarationSyntaxNode = namespaceDeclarationNode.ChildNodes().OfType<EnumDeclarationSyntax>().Single();            
 
             var emptyEnumDeclarationSyntaxNode = enumDeclarationSyntaxNode.RemoveNodes(enumDeclarationSyntaxNode.ChildNodes().OfType<EnumMemberDeclarationSyntax>(), SyntaxRemoveOptions.KeepDirectives);
+
+            var leadingTriviaList = SyntaxTriviaList.Create(SyntaxFactory.Whitespace("        "));
             var generatedEnumDeclarationSyntax = emptyEnumDeclarationSyntaxNode.AddMembers(
-                SyntaxFactory.EnumMemberDeclaration("Aston"),
-                SyntaxFactory.EnumMemberDeclaration("Villa"));
+                SyntaxFactory.EnumMemberDeclaration(SyntaxFactory.Identifier(leadingTriviaList, "Aston", SyntaxTriviaList.Empty)),
+                SyntaxFactory.EnumMemberDeclaration(SyntaxFactory.Identifier(leadingTriviaList, "Villa", SyntaxTriviaList.Empty)));
 
+            generatedEnumDeclarationSyntax = AddLineFeedsToCommas(generatedEnumDeclarationSyntax);
+                
             var generatedNamespaceDeclarationSyntaxNode = namespaceDeclarationNode.ReplaceNode(enumDeclarationSyntaxNode, generatedEnumDeclarationSyntax);
             var generatedRootNode = rootNode.ReplaceNode(namespaceDeclarationNode, generatedNamespaceDeclarationSyntaxNode);
+            
+            Console.WriteLine(generatedRootNode.ToFullString());
+        }
 
-            //TODO checkout http://roslyn.codeplex.com/wikipage?title=Syntax%20Visualizer&referringTitle=Home  for Roslyn SDK
+        private static EnumDeclarationSyntax AddLineFeedsToCommas(EnumDeclarationSyntax enumDeclarationSyntax)
+        {
+            var none = new SyntaxToken();
+            var trailingTriviaList = SyntaxTriviaList.Create(SyntaxFactory.ElasticCarriageReturnLineFeed);
 
-            Console.WriteLine(generatedRootNode.ToFullString());
-        }       
+            Func<EnumDeclarationSyntax, SyntaxToken> next = enumSyntax => enumSyntax.ChildNodesAndTokens()
+                .Where(nodeOrToken => nodeOrToken.IsToken)
+                .Select(nodeOrToken => nodeOrToken.AsToken())
+                .FirstOrDefault(
+                    token =>
+                        token.Value.Equals(",") &&
+                        (!token.HasTrailingTrivia || !token.TrailingTrivia.Any(SyntaxKind.EndOfLineTrivia)));
+
+            SyntaxToken current;
+            while ((current = next(enumDeclarationSyntax)) != none)
+            {
+                enumDeclarationSyntax = enumDeclarationSyntax.ReplaceToken(current,
+                    SyntaxFactory.Identifier(SyntaxTriviaList.Empty, ",", trailingTriviaList)
+                    );
+            }
+
+            return enumDeclarationSyntax;
+        }
     }
 }

mdresgen/IconType.template.cs

@@ -16,4 +16,4 @@ public enum IconType
         AutoGenerated,
         DoNotAmend
     }
-}
+}