Skip to content
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.

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

[Compatibility] Enforce CA1507 - use nameof() where possible #22103

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Compatibility/Core/src/.editorconfig
@@ -0,0 +1,2 @@
[*.cs]
dotnet_diagnostic.CA1507.severity = error
6 changes: 3 additions & 3 deletions src/Compatibility/Core/src/Android/RendererPool.cs
Expand Up @@ -17,10 +17,10 @@ public sealed class RendererPool
public RendererPool(IVisualElementRenderer renderer, VisualElement oldElement)
{
if (renderer == null)
throw new ArgumentNullException("renderer");
throw new ArgumentNullException(nameof(renderer));

if (oldElement == null)
throw new ArgumentNullException("oldElement");
throw new ArgumentNullException(nameof(oldElement));

_oldElement = oldElement;
_parent = renderer;
Expand All @@ -36,7 +36,7 @@ public void ClearChildrenRenderers()
public IVisualElementRenderer GetFreeRenderer(VisualElement view)
{
if (view == null)
throw new ArgumentNullException("view");
throw new ArgumentNullException(nameof(view));

Type rendererType = Internals.Registrar.Registered.GetHandlerTypeForObject(view) ?? typeof(ViewRenderer);

Expand Down
Expand Up @@ -16,7 +16,7 @@ public class FormsWebViewClient : WebViewClient
string _lastUrlNavigatedCancel;

public FormsWebViewClient(WebViewRenderer renderer)
=> _renderer = renderer ?? throw new ArgumentNullException("renderer");
=> _renderer = renderer ?? throw new ArgumentNullException(nameof(renderer));

protected FormsWebViewClient(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/Windows/BackgroundTracker.cs
Expand Up @@ -16,7 +16,7 @@ internal sealed class BackgroundTracker<T> : VisualElementTracker<Page, T> where
public BackgroundTracker(DependencyProperty backgroundProperty)
{
if (backgroundProperty == null)
throw new ArgumentNullException("backgroundProperty");
throw new ArgumentNullException(nameof(backgroundProperty));

_backgroundProperty = backgroundProperty;
}
Expand Down
Expand Up @@ -22,7 +22,7 @@ internal static class FrameworkElementExtensions
public static WBrush GetForeground(this FrameworkElement element)
{
if (element == null)
throw new ArgumentNullException("element");
throw new ArgumentNullException(nameof(element));

return (WBrush)element.GetValue(GetForegroundProperty(element));
}
Expand Down Expand Up @@ -57,15 +57,15 @@ public static void RestoreForegroundCache(this FrameworkElement element, object
public static void SetForeground(this FrameworkElement element, WBrush foregroundBrush)
{
if (element == null)
throw new ArgumentNullException("element");
throw new ArgumentNullException(nameof(element));

element.SetValue(GetForegroundProperty(element), foregroundBrush);
}

public static void SetForeground(this FrameworkElement element, WBinding binding)
{
if (element == null)
throw new ArgumentNullException("element");
throw new ArgumentNullException(nameof(element));

element.SetBinding(GetForegroundProperty(element), binding);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/Windows/KeyboardExtensions.cs
Expand Up @@ -10,7 +10,7 @@ public static class KeyboardExtensions
public static InputScope ToInputScope(this Keyboard self)
{
if (self == null)
throw new ArgumentNullException("self");
throw new ArgumentNullException(nameof(self));

var result = new InputScope();
var name = new InputScopeName();
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/Windows/TabbedPageRenderer.cs
Expand Up @@ -154,7 +154,7 @@ UIElement IVisualElementRenderer.GetNativeElement()
public void SetElement(VisualElement element)
{
if (element != null && !(element is TabbedPage))
throw new ArgumentException("Element must be a TabbedPage", "element");
throw new ArgumentException("Element must be a TabbedPage", nameof(element));

TabbedPage oldElement = Element;
Element = (TabbedPage)element;
Expand Down
Expand Up @@ -10,7 +10,7 @@ public static class VisualElementExtensions
public static IVisualElementRenderer GetOrCreateRenderer(this VisualElement self)
{
if (self == null)
throw new ArgumentNullException("self");
throw new ArgumentNullException(nameof(self));

IVisualElementRenderer renderer = Platform.GetRenderer(self);
if (renderer == null)
Expand All @@ -25,7 +25,7 @@ public static IVisualElementRenderer GetOrCreateRenderer(this VisualElement self
internal static void Cleanup(this VisualElement self)
{
if (self == null)
throw new ArgumentNullException("self");
throw new ArgumentNullException(nameof(self));

IVisualElementRenderer renderer = Platform.GetRenderer(self);

Expand Down
Expand Up @@ -21,7 +21,7 @@ public class VisualElementPackager : IDisposable
public VisualElementPackager(IVisualElementRenderer renderer)
{
if (renderer == null)
throw new ArgumentNullException("renderer");
throw new ArgumentNullException(nameof(renderer));

_renderer = renderer;

Expand Down
Expand Up @@ -132,7 +132,7 @@ protected override void Dispose(bool disposing)
protected void LoadApplication(Application application)
{
if (application == null)
throw new ArgumentNullException("application");
throw new ArgumentNullException(nameof(application));

Application.SetCurrentApplication(application);
_application = application;
Expand Down
8 changes: 4 additions & 4 deletions src/Compatibility/Core/src/iOS/RendererPool.cs
Expand Up @@ -21,10 +21,10 @@ public sealed class RendererPool
public RendererPool(IVisualElementRenderer renderer, VisualElement oldElement)
{
if (renderer == null)
throw new ArgumentNullException("renderer");
throw new ArgumentNullException(nameof(renderer));

if (oldElement == null)
throw new ArgumentNullException("oldElement");
throw new ArgumentNullException(nameof(oldElement));

_oldElement = oldElement;
_parent = renderer;
Expand All @@ -33,7 +33,7 @@ public RendererPool(IVisualElementRenderer renderer, VisualElement oldElement)
public IVisualElementRenderer GetFreeRenderer(VisualElement view)
{
if (view == null)
throw new ArgumentNullException("view");
throw new ArgumentNullException(nameof(view));

var rendererType = Controls.Internals.Registrar.Registered.GetHandlerTypeForObject(view) ?? typeof(ViewRenderer);

Expand All @@ -49,7 +49,7 @@ public IVisualElementRenderer GetFreeRenderer(VisualElement view)
public void UpdateNewElement(VisualElement newElement)
{
if (newElement == null)
throw new ArgumentNullException("newElement");
throw new ArgumentNullException(nameof(newElement));

var sameChildrenTypes = true;

Expand Down
Expand Up @@ -568,9 +568,9 @@ void UpdateTranslucent()
void InsertPageBefore(Page page, Page before)
{
if (before == null)
throw new ArgumentNullException("before");
throw new ArgumentNullException(nameof(before));
if (page == null)
throw new ArgumentNullException("page");
throw new ArgumentNullException(nameof(page));

var pageContainer = CreateViewControllerForPage(page);
var target = Platform.GetRenderer(before).ViewController.ParentViewController;
Expand Down Expand Up @@ -610,7 +610,7 @@ void OnRemovedPageRequested(object sender, NavigationRequestedEventArgs e)
void RemovePage(Page page)
{
if (page == null)
throw new ArgumentNullException("page");
throw new ArgumentNullException(nameof(page));
if (page == Current)
throw new NotSupportedException(); // should never happen as NavPage protects against this

Expand Down
Expand Up @@ -703,7 +703,7 @@ class CustomWebViewNavigationDelegate : WKNavigationDelegate
public CustomWebViewNavigationDelegate(WkWebViewRenderer renderer)
{
if (renderer == null)
throw new ArgumentNullException("renderer");
throw new ArgumentNullException(nameof(renderer));
_renderer = renderer;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/iOS/VisualElementTracker.cs
Expand Up @@ -45,7 +45,7 @@ public VisualElementTracker(IVisualElementRenderer renderer) : this(renderer, tr

public VisualElementTracker(IVisualElementRenderer renderer, bool trackFrame)
{
Renderer = renderer ?? throw new ArgumentNullException("renderer");
Renderer = renderer ?? throw new ArgumentNullException(nameof(renderer));

_propertyChangedHandler = HandlePropertyChanged;
_sizeChangedEventHandler = HandleSizeChanged;
Expand Down