Skip to content
Merged
Show file tree
Hide file tree
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
17 changes: 14 additions & 3 deletions src/TUnit.Mocks.SourceGenerator/Builders/MockMembersBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1535,11 +1535,23 @@ private static void EmitSingleFuncOverload(CodeWriter writer, MockMemberModel me
// A null predicate (including null/default literals) matches the parameter type’s default.
// This also handles value-type instantiations of unconstrained generic parameters.
// Keep non-null predicates on the existing implicit-conversion path.
// Reserve parameter and type parameter identifiers, including escaped names, before allocating locals.
var usedNames = new HashSet<string>(method.Parameters.Select(p => p.Name.TrimStart('@')), StringComparer.Ordinal);
usedNames.UnionWith(model.TypeParameters.Select(tp => tp.Name.TrimStart('@')));
usedNames.UnionWith(method.TypeParameters.Select(tp => tp.Name.TrimStart('@')));
var predicateLocals = new Dictionary<int, string>();
foreach (var idx in funcIndices.OrderBy(i => i))
{
var p = method.Parameters[idx];
var rawName = p.Name.StartsWith("@", StringComparison.Ordinal) ? p.Name[1..] : p.Name;
writer.AppendLine($"global::TUnit.Mocks.Arguments.Arg<{p.FullyQualifiedType}> __fa_{rawName} = {p.Name} is null ? global::TUnit.Mocks.Arguments.Arg.Is<{p.FullyQualifiedType}>(default({p.FullyQualifiedType})!) : (global::TUnit.Mocks.Arguments.Arg<{p.FullyQualifiedType}>){p.Name};");
var baseName = $"__fa_{rawName}";
var localName = baseName;
for (var suffix = 1; !usedNames.Add(localName); suffix++)
{
localName = $"{baseName}_{suffix.ToString(CultureInfo.InvariantCulture)}";
}
predicateLocals.Add(idx, localName);
writer.AppendLine($"global::TUnit.Mocks.Arguments.Arg<{p.FullyQualifiedType}> {localName} = {p.Name} is null ? global::TUnit.Mocks.Arguments.Arg.Is<{p.FullyQualifiedType}>(default({p.FullyQualifiedType})!) : (global::TUnit.Mocks.Arguments.Arg<{p.FullyQualifiedType}>){p.Name};");
}

// Build matchers array
Expand All @@ -1550,8 +1562,7 @@ private static void EmitSingleFuncOverload(CodeWriter writer, MockMemberModel me
if (p.Direction == ParameterDirection.Out) continue;
if (!includeRefStructArgs && p.IsRefStruct) continue;

var rawName = p.Name.StartsWith("@", StringComparison.Ordinal) ? p.Name[1..] : p.Name;
matcherExprs.Add(funcIndices.Contains(i) ? $"__fa_{rawName}.Matcher" : $"{p.Name}.Matcher");
matcherExprs.Add(funcIndices.Contains(i) ? $"{predicateLocals[i]}.Matcher" : $"{p.Name}.Matcher");
}

if (matcherExprs.Count == 0)
Expand Down
26 changes: 26 additions & 0 deletions tests/TUnit.Mocks.SourceGenerator.Tests/Issue7433Tests.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
namespace TUnit.Mocks.SourceGenerator.Tests;

public class Issue7433Tests : SnapshotTestBase
{
[Test]
public async Task Predicate_Locals_Avoid_Parameter_Names()
{
const string source = """
using TUnit.Mocks;

public interface IService
{
void Send(string value, string __fa_value, string __fa_value_1);
void Escaped(string @event, string @__fa_event);
void Generic<__fa_value_1>(__fa_value_1 value, out int __fa_value);
}

public class Usage
{
void M() => _ = Mock.Of<IService>();
}
""";

await VerifyGeneratorOutput(source);
}
}
Loading
Loading