Merge pull request #88 from azeno/master

Explicitly cast recursive field to IEnumerable in generated GetEnumerator methods

Author: AArnott

src/ImmutableObjectGraph.Generation.Tests/CodeGenTests.cs

@@ -74,6 +74,12 @@ public async Task ByteArray_CanBuild()
             var result = await this.GenerateFromStreamAsync("ByteArray");
         }
 
+        [Fact]
+        public async Task ImmutableArray_CanBuild()
+        {
+            var result = await this.GenerateFromStreamAsync("ImmutableArray");
+        }
+
         [Fact]
         public async Task OneScalarFieldAndEmptyDerived_HasCreateMethod()
         {

src/ImmutableObjectGraph.Generation.Tests/ImmutableObjectGraph.Generation.Tests.csproj

@@ -58,6 +58,7 @@
       <Generator>MSBuild:GenerateCodeFromAttributes</Generator>
     </Compile>
     <EmbeddedResource Include="TestSources\ByteArray.cs" />
+    <EmbeddedResource Include="TestSources\ImmutableArray.cs" />
     <Compile Include="TestSources\Generations.cs">
       <Generator>MSBuild:GenerateCodeFromAttributes</Generator>
     </Compile>

src/ImmutableObjectGraph.Generation.Tests/TestSources/ImmutableArray.cs

@@ -0,0 +1,10 @@
+namespace ImmutableObjectGraph.Generation.Tests.TestSources
+{
+    using System.Collections.Immutable;
+
+    [GenerateImmutable]
+    partial class Node
+    {
+        readonly ImmutableArray<Node> children;
+    }
+}

src/ImmutableObjectGraph.Generation/CodeGen+EnumerableRecursiveParentGen.cs

@@ -74,15 +74,18 @@ private void ImplementIEnumerableInterfaces()
             {
                 this.baseTypes.Add(SyntaxFactory.SimpleBaseType(Syntax.IEnumerableOf(this.generator.applyToMetaType.RecursiveType.TypeSyntax)));
 
-                // return this.<#=templateType.RecursiveField.NameCamelCase#>.GetEnumerator();
+                // return ((IEnumerable<RecursiveType>)this.<#=templateType.RecursiveField.NameCamelCase#>).GetEnumerator();
                 var body = SyntaxFactory.Block(
                     SyntaxFactory.ReturnStatement(
                         SyntaxFactory.InvocationExpression(
                             SyntaxFactory.MemberAccessExpression(
                                 SyntaxKind.SimpleMemberAccessExpression,
-                                Syntax.ThisDot(SyntaxFactory.IdentifierName(this.generator.applyToMetaType.RecursiveField.Name)),
-                                SyntaxFactory.IdentifierName(nameof(IEnumerable<int>.GetEnumerator))),
-                            SyntaxFactory.ArgumentList())));
+                                SyntaxFactory.ParenthesizedExpression(
+                                    SyntaxFactory.CastExpression(
+                                        Syntax.IEnumerableOf(GetFullyQualifiedSymbolName(this.generator.applyToMetaType.RecursiveField.ElementType)),
+                                        Syntax.ThisDot(SyntaxFactory.IdentifierName(this.generator.applyToMetaType.RecursiveField.Name)))),
+                                            SyntaxFactory.IdentifierName(nameof(IEnumerable<int>.GetEnumerator))),
+                                        SyntaxFactory.ArgumentList())));
 
                 // public System.Collections.Generic.IEnumerator<RecursiveType> GetEnumerator()
                 this.innerMembers.Add(