Skip to content

fix: make events only nullable when source is nullable #630

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
vbreuss merged 1 commit into from
Apr 6, 2026
Merged

fix: make events only nullable when source is nullable #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions Source/Mockolate.SourceGenerators/Sources/Sources.MockClass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,8 +1044,7 @@ private static void AppendMockSubject_ImplementClass_AddEvent(StringBuilder sb,
sb.Append(@event.Attributes, "\t\t");
if (explicitInterfaceImplementation)
{
sb.Append(@event.IsStatic ? "\t\tstatic event " : "\t\tevent ").Append(@event.Type.Fullname.TrimEnd('?'))
.Append("? ").Append(className).Append('.').Append(@event.Name).AppendLine();
sb.Append(@event.IsStatic ? "\t\tstatic event " : "\t\tevent ").Append(@event.Type.Fullname).Append(' ').Append(className).Append('.').Append(@event.Name).AppendLine();
}
else
{
Expand All @@ -1062,11 +1061,11 @@ private static void AppendMockSubject_ImplementClass_AddEvent(StringBuilder sb,
sb.Append("override ");
}

sb.Append("event ").Append(@event.Type.Fullname.TrimEnd('?')).Append("? ");
sb.Append("event ").Append(@event.Type.Fullname).Append(' ');
}
else
{
sb.Append(@event.IsStatic ? "\t\tstatic event " : "\t\tevent ").Append(@event.Type.Fullname.TrimEnd('?')).Append("? ")
sb.Append(@event.IsStatic ? "\t\tstatic event " : "\t\tevent ").Append(@event.Type.Fullname).Append(' ')
.Append(@event.ExplicitImplementation).Append('.');
}

Expand Down
4 changes: 2 additions & 2 deletions Tests/Mockolate.SourceGenerators.Tests/GeneralTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ public MyBaseClass(global::Mockolate.MockRegistry mockRegistry, int value)
""").IgnoringNewlineStyle().And
.Contains("""
[global::System.Obsolete("This event is obsolete")]
public override event global::System.EventHandler<int>? SomeEvent
public override event global::System.EventHandler<int> SomeEvent
""").IgnoringNewlineStyle().And
.Contains("""
[global::System.Obsolete("This property is obsolete")]
Expand Down Expand Up @@ -722,7 +722,7 @@ public interface IMyService
ArrayParam = new string[] { "a", "b" },
OptionalIntParam = null
)]
event EventHandler<int> MyEvent;
event EventHandler<int>? MyEvent;
}

public enum MyEnum
Expand Down
20 changes: 10 additions & 10 deletions Tests/Mockolate.SourceGenerators.Tests/MockTests.ClassTests.EventsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@ public static void Main(string[] args)

public interface IMyService : IMyServiceBase1
{
new event EventHandler<string> SomeEvent;
new event EventHandler<string>? SomeEvent;
}

public interface IMyServiceBase1 : IMyServiceBase2
{
new event EventHandler<int> SomeEvent;
new event EventHandler<int>? SomeEvent;
}

public interface IMyServiceBase2
{
event EventHandler<long> SomeEvent;
event EventHandler<long>? SomeEvent;
}
""");

Expand Down Expand Up @@ -118,7 +118,7 @@ await That(result.Sources).ContainsKey("Mock.IMyService.g.cs").WhoseValue
.Contains("""
private global::System.EventHandler? _mockolateEvent_global__MyCode_IMyService_SomeEvent;
/// <inheritdoc cref="global::MyCode.IMyService.SomeEvent" />
public event global::System.EventHandler? SomeEvent
public event global::System.EventHandler SomeEvent
{
add
{
Expand Down Expand Up @@ -209,7 +209,7 @@ await That(result.Sources).ContainsKey("Mock.IMyService.g.cs").WhoseValue
.Contains("""
private global::System.EventHandler? _mockolateEvent_global__MyCode_IMyService_MyDirectEvent;
/// <inheritdoc cref="global::MyCode.IMyService.MyDirectEvent" />
public event global::System.EventHandler? MyDirectEvent
public event global::System.EventHandler MyDirectEvent
{
add
{
Expand All @@ -234,7 +234,7 @@ await That(result.Sources).ContainsKey("Mock.IMyService.g.cs").WhoseValue
.Contains("""
private global::System.EventHandler? _mockolateEvent_global__MyCode_IMyServiceBase1_MyBaseEvent1;
/// <inheritdoc cref="global::MyCode.IMyServiceBase1.MyBaseEvent1" />
public event global::System.EventHandler? MyBaseEvent1
public event global::System.EventHandler MyBaseEvent1
{
add
{
Expand All @@ -259,7 +259,7 @@ await That(result.Sources).ContainsKey("Mock.IMyService.g.cs").WhoseValue
.Contains("""
private global::System.EventHandler? _mockolateEvent_global__MyCode_IMyServiceBase2_MyBaseEvent2;
/// <inheritdoc cref="global::MyCode.IMyServiceBase2.MyBaseEvent2" />
public event global::System.EventHandler? MyBaseEvent2
public event global::System.EventHandler MyBaseEvent2
{
add
{
Expand All @@ -284,7 +284,7 @@ await That(result.Sources).ContainsKey("Mock.IMyService.g.cs").WhoseValue
.Contains("""
private global::System.EventHandler? _mockolateEvent_global__MyCode_IMyServiceBase3_MyBaseEvent3;
/// <inheritdoc cref="global::MyCode.IMyServiceBase3.MyBaseEvent3" />
public event global::System.EventHandler? MyBaseEvent3
public event global::System.EventHandler MyBaseEvent3
{
add
{
Expand Down Expand Up @@ -328,7 +328,7 @@ public static void Main(string[] args)

public class MyService
{
public virtual event EventHandler SomeEvent;
public virtual event EventHandler? SomeEvent;
public event EventHandler? SomeOtherEvent;
protected virtual event EventHandler SomeProtectedEvent;
}
Expand Down Expand Up @@ -374,7 +374,7 @@ await That(result.Sources).ContainsKey("Mock.MyService__IMyOtherService.g.cs").W
.Contains("""
private global::System.EventHandler? _mockolateEvent_global__MyCode_IMyOtherService_SomeThirdEvent;
/// <inheritdoc cref="global::MyCode.IMyOtherService.SomeThirdEvent" />
event global::System.EventHandler? global::MyCode.IMyOtherService.SomeThirdEvent
event global::System.EventHandler global::MyCode.IMyOtherService.SomeThirdEvent
{
add
{
Expand Down