Skip to content

Improve null handling in DefaultViewLocator #2918

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

Closed
wants to merge 1 commit into from
Closed

Improve null handling in DefaultViewLocator #2918

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
20 changes: 3 additions & 17 deletions src/ReactiveUI/View/DefaultViewLocator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ internal DefaultViewLocator(Func<string, string>? viewModelToViewFunc = null) =>
return view;
}

view = AttemptViewResolutionFor(ToggleViewModelType(viewModel?.GetType()), contract);
view = AttemptViewResolutionFor(ToggleViewModelType(viewModel.GetType()), contract);

if (view is not null)
{
Expand All @@ -129,13 +129,8 @@ internal DefaultViewLocator(Func<string, string>? viewModelToViewFunc = null) =>
return null;
}

private static Type? ToggleViewModelType(Type? viewModelType)
private static Type? ToggleViewModelType(Type viewModelType)
{
if (viewModelType is null)
{
return null;
}

var viewModelTypeName = viewModelType.AssemblyQualifiedName;

if (viewModelTypeName is null)
Expand Down Expand Up @@ -199,12 +194,7 @@ private static string InterfaceifyTypeName(string typeName)
proposedViewTypeName = typeof(IViewFor<>).MakeGenericType(viewModelType).AssemblyQualifiedName;
view = AttemptViewResolution(proposedViewTypeName, contract);

if (view is not null)
{
return view;
}

return null;
return view;
}

private IViewFor? AttemptViewResolution(string? viewTypeName, string? contract)
Expand All @@ -218,10 +208,6 @@ private static string InterfaceifyTypeName(string typeName)
}

var service = Locator.Current.GetService(viewType, contract);
if (service is null)
{
return null;
}

if (service is not IViewFor view)
{
Expand Down