C#: Add marshalling support for IEnumerable and IDictionary

Added constructor that takes IEnumerable for Array and IEnumerable<T> for Array<T>.
Added constructor that takes IDictionary for Dictionary and IDictionary<TKey, TValue> for Dictionary<TKey, TValue>.

3 files changed, 82 insertions, 5 deletions

diff --git a/modules/mono/glue/Managed/Files/Array.cs b/modules/mono/glue/Managed/Files/Array.cs
index 0a0891296b..2277c7bf18 100644
--- a/modules/mono/glue/Managed/Files/Array.cs
+++ b/modules/mono/glue/Managed/Files/Array.cs
@@ -38,6 +38,14 @@ namespace Godot.Collections
             safeHandle = new ArraySafeHandle(godot_icall_Array_Ctor());
         }
 
+        public Array(IEnumerable collection) : this()
+        {
+            if (collection == null)
+                throw new NullReferenceException($"Parameter '{nameof(collection)} cannot be null.'");
+
+            MarshalUtils.EnumerableToArray(collection, GetPtr());
+        }
+
         internal Array(ArraySafeHandle handle)
         {
             safeHandle = handle;
@@ -201,6 +209,14 @@ namespace Godot.Collections
             objectArray = new Array();
         }
 
+        public Array(IEnumerable<T> collection)
+        {
+            if (collection == null)
+                throw new NullReferenceException($"Parameter '{nameof(collection)} cannot be null.'");
+
+            objectArray = new Array(collection);
+        }
+
         public Array(Array array)
         {
             objectArray = array;
diff --git a/modules/mono/glue/Managed/Files/Dictionary.cs b/modules/mono/glue/Managed/Files/Dictionary.cs
index b89851f246..af1782b79a 100644
--- a/modules/mono/glue/Managed/Files/Dictionary.cs
+++ b/modules/mono/glue/Managed/Files/Dictionary.cs
@@ -40,6 +40,14 @@ namespace Godot.Collections
             safeHandle = new DictionarySafeHandle(godot_icall_Dictionary_Ctor());
         }
 
+        public Dictionary(IDictionary dictionary) : this()
+        {
+            if (dictionary == null)
+                throw new NullReferenceException($"Parameter '{nameof(dictionary)} cannot be null.'");
+
+            MarshalUtils.IDictionaryToDictionary(dictionary, GetPtr());
+        }
+
         internal Dictionary(DictionarySafeHandle handle)
         {
             safeHandle = handle;
@@ -255,6 +263,23 @@ namespace Godot.Collections
             objectDict = new Dictionary();
         }
 
+        public Dictionary(IDictionary<TKey, TValue> dictionary)
+        {
+            objectDict = new Dictionary();
+
+            if (dictionary == null)
+                throw new NullReferenceException($"Parameter '{nameof(dictionary)} cannot be null.'");
+
+            // TODO: Can be optimized
+
+            IntPtr godotDictionaryPtr = GetPtr();
+
+            foreach (KeyValuePair<TKey, TValue> entry in dictionary)
+            {
+                Dictionary.godot_icall_Dictionary_Add(godotDictionaryPtr, entry.Key, entry.Value);
+            }
+        }
+
         public Dictionary(Dictionary dictionary)
         {
             objectDict = dictionary;
diff --git a/modules/mono/glue/Managed/Files/MarshalUtils.cs b/modules/mono/glue/Managed/Files/MarshalUtils.cs
index f7699a15bf..c67cda55bf 100644
--- a/modules/mono/glue/Managed/Files/MarshalUtils.cs
+++ b/modules/mono/glue/Managed/Files/MarshalUtils.cs
@@ -1,18 +1,54 @@
 using System;
-using Godot.Collections;
+using System.Collections;
 
 namespace Godot
 {
+    using Array = Godot.Collections.Array;
+    using Dictionary = Godot.Collections.Dictionary;
+
     static class MarshalUtils
     {
-        static bool IsArrayGenericType(Type type)
+        static bool TypeIsGenericArray(Type type)
+        {
+            return type.GetGenericTypeDefinition() == typeof(Godot.Collections.Array<>);
+        }
+
+        static bool TypeIsGenericDictionary(Type type)
+        {
+            return type.GetGenericTypeDefinition() == typeof(Godot.Collections.Dictionary<,>);
+        }
+
+        // TODO: EnumerableToArray and IDictionaryToDictionary can be optimized
+
+        internal static void EnumerableToArray(IEnumerable enumerable, IntPtr godotArrayPtr)
         {
-            return type.GetGenericTypeDefinition() == typeof(Array<>);
+            if (enumerable is ICollection collection)
+            {
+                int count = collection.Count;
+
+                object[] tempArray = new object[count];
+                collection.CopyTo(tempArray, 0);
+
+                for (int i = 0; i < count; i++)
+                {
+                    Array.godot_icall_Array_Add(godotArrayPtr, tempArray[i]);
+                }
+            }
+            else
+            {
+                foreach (object element in enumerable)
+                {
+                    Array.godot_icall_Array_Add(godotArrayPtr, element);
+                }
+            }
         }
 
-        static bool IsDictionaryGenericType(Type type)
+        internal static void IDictionaryToDictionary(IDictionary dictionary, IntPtr godotDictionaryPtr)
         {
-            return type.GetGenericTypeDefinition() == typeof(Dictionary<, >);
+            foreach (DictionaryEntry entry in dictionary)
+            {
+                Dictionary.godot_icall_Dictionary_Add(godotDictionaryPtr, entry.Key, entry.Value);
+            }
         }
     }
 }