Skip to content

fix(mocks): escape C# keyword identifiers at all emit sites (#5679) #5684

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.

Sign up for GitHub

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

Merged
thomhurst merged 6 commits into from
Apr 23, 2026
Merged

fix(mocks): escape C# keyword identifiers at all emit sites (#5679) #5684

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e883b9c
fix(mocks): escape C# keyword identifiers at all emit sites (#5679)
thomhurst Apr 23, 2026
e42246d
refactor(mocks): dedupe EscapeIdentifier into shared helper
thomhurst Apr 23, 2026
f0cf2b4
chore(mocks): address review feedback on #5679
thomhurst Apr 23, 2026
9fd285d
chore(mocks): tighten EscapeIdentifier visibility, document GetWrappe…
thomhurst Apr 23, 2026
b296be2
docs(mocks): note @-prefix legitimacy for GetWrapperName safeName
thomhurst Apr 23, 2026
1b63f88
Merge remote-tracking branch 'origin/main' into fix/mocks-keywords-5679
thomhurst Apr 23, 2026
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
Prev Previous commit
Merge remote-tracking branch 'origin/main' into fix/mocks-keywords-5679 
# Conflicts:
#	TUnit.Mocks.SourceGenerator/Builders/MockMembersBuilder.cs
  • Loading branch information
@thomhurst
thomhurst committed Apr 23, 2026
commit 1b63f882159ae2d1e2a0ad63d96204c4d8dce319
6 changes: 5 additions & 1 deletion TUnit.Mocks.SourceGenerator/Builders/MockMembersBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,11 @@ private static string GetWrapperName(string safeName, MockMemberModel method)
=> $"{safeName}_{method.Name}_M{method.MemberId}_MockCall";

private static string GetSafeMemberName(string name)
=> EscapeIdentifier(MockMemberNames.Contains(name) ? name + "_" : name);
{
if (ObjectMemberDisambiguations.TryGetValue(name, out var renamed))
return renamed;
return EscapeIdentifier(MockMemberNames.Contains(name) ? name + "_" : name);
}

private static string GetCombinedTypeParameterList(MockTypeModel model, MockMemberModel method)
{
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.