Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
77 changes: 74 additions & 3 deletions Source/Mockolate.SourceGenerators/Sources/Sources.MockClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3645,6 +3645,51 @@ private static bool[] ComputeTrailingDefaults(ReadOnlySpan<MethodParameter> para
return result;
}

// Priority hierarchy among same-arity overloads emitted for one method:
// all-values : int.MaxValue (so `Method(default, …)` binds here and exposes `.AnyParameters()`)
// IParameters : int.MaxValue - 1
// pure IParameter<T>? : parameterCount (just below all-values, above any mixed combo)
// mixed : count of non-value (matcher) params, in [1, parameterCount - 1]
// parameterCount == 0 returns int.MaxValue so the lone zero-arg overload keeps its historical priority.
private static string ComputeMethodOverloadPriority(bool useParameters, bool[]? valueFlags, int parameterCount)
{
if (parameterCount == 0)
{
return "int.MaxValue";
}

if (useParameters)
{
return "int.MaxValue - 1";
}

if (valueFlags is null)
{
return parameterCount.ToString();
}

return valueFlags.Count(x => !x).ToString();
}

// Object-typed parameters defeat the all-values bump: every reference type — including the
// IParameter<T>? matcher itself — implicitly converts to object, so promoting `Method(object?)` over
// `Method(IParameter<object?>?)` would silently capture matcher instances as raw values. Detect that case
// here and skip the priority bump so callers keep using Match.AnyParameters() / It.IsAny<object?>().
private static bool ParametersBlockAllValuesPromotion(EquatableArray<MethodParameter> parameters,
bool[] valueFlags)
{
ReadOnlySpan<MethodParameter> span = parameters.AsSpan();
for (int i = 0; i < span.Length; i++)
{
if (valueFlags[i] && span[i].Type.SpecialType == SpecialType.System_Object)
{
return true;
}
}

return false;
}
Comment thread
vbreuss marked this conversation as resolved.

private static void DefineSetupInterface(StringBuilder sb, Class @class, MemberType memberType,
bool hasOverloadResolutionPriority)
{
Expand Down Expand Up @@ -3881,14 +3926,23 @@ private static void AppendMethodSetupDefinition(StringBuilder sb, Class @class,
{
if (valueFlags?.All(x => x) == true)
{
if (hasOverloadResolutionPriority &&
!ParametersBlockAllValuesPromotion(method.Parameters, valueFlags))
{
sb.Append(
"\t\t[global::System.Runtime.CompilerServices.OverloadResolutionPriority(int.MaxValue)]")
.AppendLine();
}

sb.Append("\t\tglobal::Mockolate.Setup.IReturnMethodSetupParameterIgnorer");
}
else
{
if (hasOverloadResolutionPriority)
{
sb.Append("\t\t[global::System.Runtime.CompilerServices.OverloadResolutionPriority(")
.Append(valueFlags?.Count(x => !x).ToString() ?? "int.MaxValue").Append(")]").AppendLine();
.Append(ComputeMethodOverloadPriority(useParameters, valueFlags, method.Parameters.Count))
.Append(")]").AppendLine();
}

sb.Append(method.Parameters.Count > 0
Expand All @@ -3910,14 +3964,23 @@ private static void AppendMethodSetupDefinition(StringBuilder sb, Class @class,
{
if (valueFlags?.All(x => x) == true)
{
if (hasOverloadResolutionPriority &&
!ParametersBlockAllValuesPromotion(method.Parameters, valueFlags))
{
sb.Append(
"\t\t[global::System.Runtime.CompilerServices.OverloadResolutionPriority(int.MaxValue)]")
.AppendLine();
}

sb.Append("\t\tglobal::Mockolate.Setup.IVoidMethodSetupParameterIgnorer");
}
else
{
if (hasOverloadResolutionPriority)
{
sb.Append("\t\t[global::System.Runtime.CompilerServices.OverloadResolutionPriority(")
.Append(valueFlags?.Count(x => !x).ToString() ?? "int.MaxValue").Append(")]").AppendLine();
.Append(ComputeMethodOverloadPriority(useParameters, valueFlags, method.Parameters.Count))
.Append(")]").AppendLine();
}

sb.Append(method.Parameters.Count > 0
Expand Down Expand Up @@ -5532,6 +5595,13 @@ private static void AppendMethodVerifyDefinition(StringBuilder sb, Method method
valueFlags, true);
if (valueFlags?.All(x => x) == true || (method.Parameters.Count == 0 && !useParameters))
{
if (hasOverloadResolutionPriority && method.Parameters.Count > 0 && valueFlags is not null &&
!ParametersBlockAllValuesPromotion(method.Parameters, valueFlags))
{
sb.Append("\t\t[global::System.Runtime.CompilerServices.OverloadResolutionPriority(int.MaxValue)]")
.AppendLine();
}

sb.Append("\t\tglobal::Mockolate.Verify.VerificationResult<").Append(verifyName)
.Append(">.IgnoreParameters ").Append(methodName).Append("(");
}
Expand All @@ -5540,7 +5610,8 @@ private static void AppendMethodVerifyDefinition(StringBuilder sb, Method method
if (hasOverloadResolutionPriority)
{
sb.Append("\t\t[global::System.Runtime.CompilerServices.OverloadResolutionPriority(")
.Append(valueFlags?.Count(x => !x).ToString() ?? "int.MaxValue").Append(")]").AppendLine();
.Append(ComputeMethodOverloadPriority(useParameters, valueFlags, method.Parameters.Count))
.Append(")]").AppendLine();
}

sb.Append("\t\tglobal::Mockolate.Verify.VerificationResult<").Append(verifyName).Append("> ")
Expand Down
Loading
Loading