Add failed type to exception message in EnumerableItemType, RicoSuter…

…/NSwag#4532
RicoSuter · Oct 6, 2023 · 38b43c2 · 38b43c2
1 parent 7152297
commit 38b43c2
Showing 1 changed file with 27 additions and 20 deletions.
diff --git a/src/Namotion.Reflection/Context/ContextualType.cs b/src/Namotion.Reflection/Context/ContextualType.cs
@@ -137,34 +137,41 @@ public ContextualType? EnumerableItemType
         {
             get
             {
-                var elementType = ElementType;
-                if (elementType != null)
+                try
                 {
-                    return elementType;
-                }
-
-                var getEnumeratorMethod = Methods.SingleOrDefault(m => m.Name == "GetEnumerator");
-                if (getEnumeratorMethod != null)
-                {
-                    if (GenericArguments?.Length == 1)
+                    var elementType = ElementType;
+                    if (elementType != null)
                     {
-                        return GenericArguments[0];
+                        return elementType;
                     }
 
-                    if (_enumerableItemType != null)
+                    var getEnumeratorMethod = Methods.SingleOrDefault(m => m.Name == "GetEnumerator");
+                    if (getEnumeratorMethod != null)
                     {
-                        return _enumerableItemType;
-                    }
+                        if (GenericArguments?.Length == 1)
+                        {
+                            return GenericArguments[0];
+                        }
 
-                    var returnParam = getEnumeratorMethod.ReturnParameter;
-                    if (returnParam?.GenericArguments.Length == 1)
-                    {
-                        _enumerableItemType = returnParam.GenericArguments[0];
-                        return _enumerableItemType;
+                        if (_enumerableItemType != null)
+                        {
+                            return _enumerableItemType;
+                        }
+
+                        var returnParam = getEnumeratorMethod.ReturnParameter;
+                        if (returnParam?.GenericArguments.Length == 1)
+                        {
+                            _enumerableItemType = returnParam.GenericArguments[0];
+                            return _enumerableItemType;
+                        }
                     }
-                }
 
-                return null;
+                    return null;
+                }
+                catch (Exception exception)
+                {
+                    throw new InvalidOperationException($"Failed to retrieve enumerable item type of {Type.FullName}.", exception);
+                }
             }
         }