diff --git a/src/ReactiveUI/View/DefaultViewLocator.cs b/src/ReactiveUI/View/DefaultViewLocator.cs index 152ed09184..382326aa23 100644 --- a/src/ReactiveUI/View/DefaultViewLocator.cs +++ b/src/ReactiveUI/View/DefaultViewLocator.cs @@ -111,7 +111,7 @@ internal DefaultViewLocator(Func? viewModelToViewFunc = null) => return view; } - view = AttemptViewResolutionFor(ToggleViewModelType(viewModel?.GetType()), contract); + view = AttemptViewResolutionFor(ToggleViewModelType(viewModel.GetType()), contract); if (view is not null) { @@ -129,13 +129,8 @@ internal DefaultViewLocator(Func? 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) @@ -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) @@ -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) {