CSHARP-1326: Fix edge case in Implements and TryGetIEnumerableGenericInterface.

rstam · rstam · commit daf21242cd9b · 2022-11-02T22:07:15.000-07:00
diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Misc/TypeExtensions.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Misc/TypeExtensions.cs
@@ -32,10 +32,14 @@ public static Type GetIEnumerableGenericInterface(this Type enumerableType)
 
         public static bool Implements(this Type type, Type @interface)
         {
-            Type interfaceDefinition = null;
-            if (@interface.IsGenericType())
+            if (type == @interface)
             {
-                interfaceDefinition = @interface.GetGenericTypeDefinition();
+                return true;
+            }
+
+            if (type.IsGenericType() && type.GetGenericTypeDefinition() == @interface)
+            {
+                return true;
             }
 
             foreach (var implementedInterface in type.GetInterfaces())
@@ -45,7 +49,7 @@ public static bool Implements(this Type type, Type @interface)
                     return true;
                 }
 
-                if (implementedInterface.IsGenericType() && implementedInterface.GetGenericTypeDefinition() == interfaceDefinition)
+                if (implementedInterface.IsGenericType() && implementedInterface.GetGenericTypeDefinition() == @interface)
                 {
                     return true;
                 }
@@ -104,6 +108,12 @@ public static bool TryGetIDictionaryGenericInterface(this Type type, out Type id
 
         public static bool TryGetIEnumerableGenericInterface(this Type type, out Type ienumerableGenericInterface)
         {
+            if (type.IsGenericType() && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+            {
+                ienumerableGenericInterface = type;
+                return true;
+            }
+
             foreach (var interfaceType in type.GetInterfaces())
             {
                 if (interfaceType.IsGenericType() && interfaceType.GetGenericTypeDefinition() == typeof(IEnumerable<>))

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,14 @@ public static Type GetIEnumerableGenericInterface(this Type enumerableType)`
`32`	`32`
`33`	`33`	`public static bool Implements(this Type type, Type @interface)`
`34`	`34`	`{`
`35`		`- Type interfaceDefinition = null;`
`36`		`- if (@interface.IsGenericType())`
	`35`	`+ if (type == @interface)`
`37`	`36`	`{`
`38`		`- interfaceDefinition = @interface.GetGenericTypeDefinition();`
	`37`	`+ return true;`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ if (type.IsGenericType() && type.GetGenericTypeDefinition() == @interface)`
	`41`	`+ {`
	`42`	`+ return true;`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`foreach (var implementedInterface in type.GetInterfaces())`
`@@ -45,7 +49,7 @@ public static bool Implements(this Type type, Type @interface)`
`45`	`49`	`return true;`
`46`	`50`	`}`
`47`	`51`
`48`		`- if (implementedInterface.IsGenericType() && implementedInterface.GetGenericTypeDefinition() == interfaceDefinition)`
	`52`	`+ if (implementedInterface.IsGenericType() && implementedInterface.GetGenericTypeDefinition() == @interface)`
`49`	`53`	`{`
`50`	`54`	`return true;`
`51`	`55`	`}`
`@@ -104,6 +108,12 @@ public static bool TryGetIDictionaryGenericInterface(this Type type, out Type id`
`104`	`108`
`105`	`109`	`public static bool TryGetIEnumerableGenericInterface(this Type type, out Type ienumerableGenericInterface)`
`106`	`110`	`{`
	`111`	`+ if (type.IsGenericType() && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))`
	`112`	`+ {`
	`113`	`+ ienumerableGenericInterface = type;`
	`114`	`+ return true;`
	`115`	`+ }`
	`116`	`+`
`107`	`117`	`foreach (var interfaceType in type.GetInterfaces())`
`108`	`118`	`{`
`109`	`119`	`if (interfaceType.IsGenericType() && interfaceType.GetGenericTypeDefinition() == typeof(IEnumerable<>))`