Fix api surface generator to support overloads

ValveResourceFormat · Feb 16, 2024 · f939dcb · f939dcb
1 parent bb29fd0
commit f939dcb
Showing 1 changed file with 39 additions and 25 deletions.
diff --git a/ValveKeyValue/ValveKeyValue.Test/ApiSurfaceTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/ApiSurfaceTestCase.cs
@@ -142,41 +142,55 @@ static bool IsHidingMember(MethodInfo method)
                 return false;
             }
 
-            var baseMethod = baseType.GetMethod(method.Name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-            if (baseMethod == null)
-            {
-                return false;
-            }
+            var baseMethods = baseType.GetMethods(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
 
-            if (baseMethod.DeclaringType == method.DeclaringType)
+            foreach (var baseMethod in baseMethods)
             {
-                return false;
-            }
+                if (baseMethod.Name != method.Name)
+                {
+                    continue;
+                }
 
-            var methodDefinition = method.GetBaseDefinition();
-            var baseMethodDefinition = baseMethod.GetBaseDefinition();
+                if (baseMethod.DeclaringType == method.DeclaringType)
+                {
+                    continue;
+                }
 
-            if (methodDefinition.DeclaringType == baseMethodDefinition.DeclaringType)
-            {
-                return false;
-            }
+                var methodDefinition = method.GetBaseDefinition();
+                var baseMethodDefinition = baseMethod.GetBaseDefinition();
 
-            var methodParameters = method.GetParameters();
-            var baseMethodParameters = baseMethod.GetParameters();
-            if (methodParameters.Length != baseMethodParameters.Length)
-            {
-                return false;
-            }
+                if (methodDefinition.DeclaringType == baseMethodDefinition.DeclaringType)
+                {
+                    continue;
+                }
 
-            for (int i = 0; i < methodParameters.Length; i++)
-            {
-                if (methodParameters[i].ParameterType != baseMethodParameters[i].ParameterType)
+                var methodParameters = method.GetParameters();
+                var baseMethodParameters = baseMethod.GetParameters();
+                if (methodParameters.Length != baseMethodParameters.Length)
                 {
-                    return false;
+                    continue;
                 }
+
+                var hasMatchingParameters = true;
+
+                for (int i = 0; i < methodParameters.Length; i++)
+                {
+                    if (methodParameters[i].ParameterType != baseMethodParameters[i].ParameterType)
+                    {
+                        hasMatchingParameters = false;
+                        break;
+                    }
+                }
+
+                if (!hasMatchingParameters)
+                {
+                    continue;
+                }
+
+                return true;
             }
 
-            return true;
+            return false;
         }
 
         static string GetTypeAsString(Type type)