Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reflection_Engine - Issue 703 - Fix Depth of Arrays in UnderlyingType #1124

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Reflection_Engine/Query/UnderlyingType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public static partial class Query
public static UnderlyingType UnderlyingType(this Type type)
{
int depth = 0;
while (type.GetGenericArguments().Count() == 1 && typeof(IEnumerable).IsAssignableFrom(type))
while ((type.GetGenericArguments().Count() == 1 || type.GetElementType() != null) && typeof(IEnumerable).IsAssignableFrom(type))
{
depth++;
type = type.GetGenericArguments().First();
type = type.GetElementType() ?? type.GetGenericArguments().First();
}

return new UnderlyingType { Type = type, Depth = depth };
Expand Down