Skip to content

Minor enhancement to avoid null exceptions #1542

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
kzu merged 1 commit into from
May 26, 2025
Merged

Minor enhancement to avoid null exceptions #1542

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
2 changes: 1 addition & 1 deletion src/Moq/Async/AwaitableFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ static IAwaitableFactory Create(Type awaitableFactoryType, Type awaitableType)
awaitableType.GetGenericArguments()));
}

public static IAwaitableFactory TryGet(Type type)
public static IAwaitableFactory? TryGet(Type type)
{
Debug.Assert(type != null);

Expand Down
4 changes: 2 additions & 2 deletions src/Moq/ExpressionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ void Split(Expression e, out Expression r /* remainder */, out MethodExpectation
var memberAccessExpression = (MemberExpression)e;
Debug.Assert(memberAccessExpression.Member is PropertyInfo);

if (IsResult(memberAccessExpression.Member, out var awaitableFactory))
if (IsResult(memberAccessExpression.Member, out var awaitableFactory) && awaitableFactory is not null)
{
Split(memberAccessExpression.Expression, out r, out p);
p.AddResultExpression(
Expand Down Expand Up @@ -339,7 +339,7 @@ void Split(Expression e, out Expression r /* remainder */, out MethodExpectation
}
}

bool IsResult(MemberInfo member, out IAwaitableFactory awaitableFactory)
bool IsResult(MemberInfo member, out IAwaitableFactory? awaitableFactory)
{
var instanceType = member.DeclaringType;
awaitableFactory = AwaitableFactory.TryGet(instanceType);
Expand Down
Loading