Merge pull request #100 from DanielStout5/FixAnonymousTypeWrapperCast

Fix AnonymousTypeWrapper cast failing on lists of structs
adoconnection · Apr 6, 2022 · b65e99c · b65e99c
2 parents ac0b735 + d6ca867
commit b65e99c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/RazorEngineCore.Tests/TestCompileAndRun.cs b/RazorEngineCore.Tests/TestCompileAndRun.cs
@@ -157,6 +157,24 @@ public async Task TestCompileAndRun_DynamicModel_PlainAsync()
             Assert.AreEqual("Hello Alex", actual);
         }
 
+        public struct Item
+        {
+            public string Name { get; set; }
+        }
+
+        [TestMethod]
+        public void TestCompileAndRun_StructList()
+        {
+            var eng = new RazorEngine();
+            var model = new
+            {
+                Items = new[] { new Item { Name = "Bob" }, new Item { Name = "Alice" } }
+            };
+            var temp = eng.Compile("@foreach(var item in Model.Items) { @item.Name }");
+            var result = temp.Run(model);
+            Assert.AreEqual("BobAlice", result);
+        }
+
         [TestMethod]
         public void TestCompileAndRun_DynamicModel_Nested()
         {

diff --git a/RazorEngineCore/AnonymousTypeWrapper.cs b/RazorEngineCore/AnonymousTypeWrapper.cs
@@ -39,8 +39,6 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
                 result = new AnonymousTypeWrapper(result);
             }
 
-            bool isEnumerable = typeof(IEnumerable).IsAssignableFrom(type);
-
             if (result is IDictionary dictionary)
             {
                 List<object> keys = new List<object>();
@@ -58,9 +56,9 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
                     }
                 }
             }
-            else if (isEnumerable && !(result is string))
+            else if (result is IEnumerable enumer && !(result is string))
             {
-                result = ((IEnumerable<object>)result)
+                result = enumer.Cast<object>()
                         .Select(e =>
                         {
                             if (e.IsAnonymous())