Improve IList and IDictionary types' conversion.

BearOffice · Oct 9, 2022 · ecf0b06 · ecf0b06
1 parent f582940
commit ecf0b06
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 16 deletions.
diff --git a/BearMarkupLanguage/BearMarkupLanguage.csproj b/BearMarkupLanguage/BearMarkupLanguage.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>5.0.8</Version>
+    <Version>5.0.10</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>Bear</Authors>
     <Company>Bear Office</Company>

diff --git a/BearMarkupLanguage/Elements/DictionaryElement.cs b/BearMarkupLanguage/Elements/DictionaryElement.cs
@@ -9,7 +9,7 @@
 
 namespace BearMarkupLanguage.Elements;
 
-internal class DictionaryElement: IBaseElement
+internal class DictionaryElement : IBaseElement
 {
     internal OrderedDictionary<BasicElement, IBaseElement> ElementsDic { get; private init; }
     public ParseMode PreferredParseMode
@@ -70,8 +70,19 @@ public object ConvertTo(Type targetType, IConversionProvider[] providers)
     private object ConvertIDictionaryTo(Type targetType, IConversionProvider[] providers)
     {
         // IDictionary contains two generic arguments
-        var keyType = targetType.GetGenericArguments()[0];
-        var valueType = targetType.GetGenericArguments()[1];
+        var arguments = targetType.GetGenericArguments();
+        // try to find key and value types in target type if target type is not generic / doesn't contain 2 arguments
+        if (arguments.Length < 2) 
+        {
+            var iDicInterface = targetType.GetInterfaces()
+                                          .FirstOrDefault(i => i.GetGenericTypeDefinitionIfHas() == typeof(IDictionary<,>));
+            arguments = iDicInterface?.GetGenericArguments();
+        }
+        if (arguments is null || arguments.Length < 2)
+            throw new TypeNotSupportException($"Cannot find key or value type in Type {targetType}");
+
+        var keyType = arguments[0];
+        var valueType = arguments[1];
 
         var preferredKeyType = IBaseElement.PreferredElementType(keyType);
         var preferredValueType = IBaseElement.PreferredElementType(valueType);
@@ -257,9 +268,9 @@ private string[] ExpandedParse()
 
     private bool IsKeysNeedCollapse()
     {
-        foreach((var key, _) in ElementsDic)
+        foreach ((var key, _) in ElementsDic)
         {
-            if (key.Literal.IsNullOrWhiteSpace() 
+            if (key.Literal.IsNullOrWhiteSpace()
                 || key.Literal.StartsWith(' ') || key.Literal.EndsWith(' '))
                 return true;
         }

diff --git a/BearMarkupLanguage/Elements/ListElement.cs b/BearMarkupLanguage/Elements/ListElement.cs
@@ -9,7 +9,7 @@
 
 namespace BearMarkupLanguage.Elements;
 
-internal class ListElement: IBaseElement
+internal class ListElement : IBaseElement
 {
     internal List<IBaseElement> ElementsList { get; private init; }
     public ParseMode PreferredParseMode
@@ -50,11 +50,11 @@ internal ListElement(List<IBaseElement> elementsList)
         ElementsList = elementsList;
     }
 
-    public object ConvertTo(Type targetType, IConversionProvider[] providers) 
+    public object ConvertTo(Type targetType, IConversionProvider[] providers)
     {
         if (targetType.IsListType())
         {
-            if (!targetType.IsSZArray)
+            if (targetType.IsArray && !targetType.IsSZArray)
                 throw new TypeNotSupportException("Do not support multi-dimensional array.");
 
             return ConvertIListTo(targetType, providers);
@@ -72,14 +72,28 @@ public object ConvertTo(Type targetType, IConversionProvider[] providers)
 
     private object ConvertIListTo(Type targetType, IConversionProvider[] providers)
     {
-        Type argumentType;
-        if (targetType.IsSZArray)
+        var argumentType = default(Type);
+
+        // Array needs a special treatment
+        if (targetType.IsArray && targetType.IsSZArray)
         {
-            argumentType = targetType.GetElementType();  // Array needs a special treatment
+            argumentType = targetType.GetElementType();  
         }
         else
         {
-            argumentType = targetType.GetGenericArguments()[0];  // IList only contains one generic argument
+            // IList only contains one generic argument
+            var arguments = targetType.GetGenericArguments();
+            // try to find elements type in target type if target type is not generic / doesn't contain 1 argument
+            if (arguments.Length < 1)
+            {
+                var iListInterface = targetType.GetInterfaces()
+                                               .FirstOrDefault(i => i.GetGenericTypeDefinitionIfHas() == typeof(IList<>));
+                arguments = iListInterface?.GetGenericArguments();
+            }
+            if (arguments is null || arguments.Length < 1)
+                throw new TypeNotSupportException($"Cannot find elements type in Type {targetType}");
+
+            argumentType = arguments[0];
         }
 
         var preferredType = IBaseElement.PreferredElementType(argumentType);

diff --git a/BearMarkupLanguage/Helpers/TypeExtension.cs b/BearMarkupLanguage/Helpers/TypeExtension.cs
@@ -71,12 +71,12 @@ internal static bool IsTupleType(this Type type)
 
     internal static bool IsListType(this Type type)
     {
-        return type.HasInterface(typeof(IList));
+        return type.HasInterface(typeof(IList)) || type.HasInterface(typeof(IList<>));
     }
 
     internal static bool IsDictionaryType(this Type type)
     {
-        return type.HasInterface(typeof(IDictionary));
+        return type.HasInterface(typeof(IDictionary)) || type.HasInterface(typeof(IDictionary<,>));
     }
 
     internal static bool IsSerializableObject(this Type type)

diff --git a/BearMarkupLanguage/Interpretation/DictionaryElementInterpreter.cs b/BearMarkupLanguage/Interpretation/DictionaryElementInterpreter.cs
@@ -246,7 +246,6 @@ private static ElementResult ExpandedInterprete(string[] lines)
                     Message = "Key must be unique."
                 });
 
-
             // key.Length + id's length
             if (idIndex + 1 == lines[i].Length)
                 refLines[i] = "";