feat: remove warnings.

irihitech · Jul 30, 2024 · d7be559 · d7be559
1 parent 00497f6
commit d7be559
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 49 deletions.
diff --git a/sample/Sample/MainWindow.axaml.cs b/sample/Sample/MainWindow.axaml.cs
@@ -1,7 +1,4 @@
-using System.Linq;
 using Avalonia.Controls;
-using Avalonia.Media;
-using Irihi.Avalonia.Shared.Helpers;
 
 namespace Sample;
 

diff --git a/src/Irihi.Avalonia.Shared.Public/Common/IRIHI_CommandBase.cs b/src/Irihi.Avalonia.Shared.Public/Common/IRIHI_CommandBase.cs
@@ -25,12 +25,12 @@ public IRIHI_CommandBase(Action execute, Func<bool> canExecute)
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public bool CanExecute(object parameter)
+    public bool CanExecute(object? parameter)
     {
         return _canExecute is null || _canExecute.Invoke();
     }
 
-    public void Execute(object parameter)
+    public void Execute(object? parameter)
     {
         _execute.Invoke();
     }

diff --git a/src/Irihi.Avalonia.Shared.Public/Common/IRIHI_CommandBase`T.cs b/src/Irihi.Avalonia.Shared.Public/Common/IRIHI_CommandBase`T.cs
@@ -30,7 +30,7 @@ public bool CanExecute(T? parameter)
         return _canExecute is null || _canExecute.Invoke(parameter);
     }
 
-    public bool CanExecute(object parameter)
+    public bool CanExecute(object? parameter)
     {
         if (!TryGetCommandArgument(parameter, out var result))
         {
@@ -45,7 +45,7 @@ public void Execute(T? parameter)
         _execute(parameter);
     }
 
-    public void Execute(object parameter)
+    public void Execute(object? parameter)
     {
         if (!TryGetCommandArgument(parameter, out var result))
         {
@@ -59,23 +59,23 @@ internal static bool TryGetCommandArgument(object? parameter, out T? result)
     {
         if (parameter is null && default(T) is null)
         {
-            result = default(T);
+            result = default;
             return true;
         }
         if (parameter is T obj)
         {
             result = obj;
             return true;
         }
-        result = default (T);
+        result = default;
         return false;
     }
 
     public void NotifyCanExecuteChanged()
     {
-        EventHandler canExecuteChanged = this.CanExecuteChanged;
+        EventHandler? canExecuteChanged = this.CanExecuteChanged;
         if (canExecuteChanged is null)
             return;
-        canExecuteChanged((object) this, EventArgs.Empty);
+        canExecuteChanged(this, EventArgs.Empty);
     }
 }
diff --git a/src/Irihi.Avalonia.Shared.Public/Common/IRIHI_ObservableBase.cs b/src/Irihi.Avalonia.Shared.Public/Common/IRIHI_ObservableBase.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
 namespace Irihi.Avalonia.Shared.Common;
@@ -17,7 +16,7 @@ public class IRIHI_ObservableBase: INotifyPropertyChanged, INotifyPropertyChangi
 
     protected virtual void OnPropertyChanged(PropertyChangedEventArgs e)
     {
-        PropertyChanged ?.Invoke((object) this, e);
+        PropertyChanged ?.Invoke(this, e);
     }
 
     protected void OnPropertyChanged([CallerMemberName] string? propertyName = null)

diff --git a/src/Irihi.Avalonia.Shared.Public/Helpers/MathHelpers.cs b/src/Irihi.Avalonia.Shared.Public/Helpers/MathHelpers.cs
@@ -1,6 +1,3 @@
-using Avalonia.Controls.Platform;
-using Avalonia.Utilities;
-
 namespace Irihi.Avalonia.Shared.Helpers;
 
 public static class MathHelpers

diff --git a/src/Irihi.Avalonia.Shared.Public/Helpers/ObservableExtension.cs b/src/Irihi.Avalonia.Shared.Public/Helpers/ObservableExtension.cs
@@ -1,6 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Reactive;
+using Avalonia.Reactive;
 
 namespace Irihi.Avalonia.Shared.Helpers;
 

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Common/IRIHI_CommandBaseGenericTests.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Common/IRIHI_CommandBaseGenericTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Xunit;
-
 namespace Irihi.Avalonia.Shared.Common.Tests;
 
 public class IRIHI_CommandBaseGenericTests
@@ -57,7 +54,7 @@ public void NotifyCanExecuteChangedRaisesEvent()
     {
         var command = new IRIHI_CommandBase<object>(_ => { });
         bool eventRaised = false;
-        command.CanExecuteChanged += (sender, e) => eventRaised = true;
+        command.CanExecuteChanged += (_, _) => eventRaised = true;
 
         command.NotifyCanExecuteChanged();
 
@@ -87,7 +84,7 @@ public void UnsubscribingFromCanExecuteChangedEventWorks()
         var command = new IRIHI_CommandBase<object>(_ => { });
         bool eventRaised = false;
 
-        EventHandler handler = (sender, e) => eventRaised = true;
+        EventHandler handler = (_, _) => eventRaised = true;
         command.CanExecuteChanged += handler;
         command.CanExecuteChanged -= handler;
 

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Common/IRIHI_CommandBaseTests.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Common/IRIHI_CommandBaseTests.cs
@@ -1,6 +1,3 @@
-using System;
-using Xunit;
-
 namespace Irihi.Avalonia.Shared.Common.Tests;
 
 public class IRIHI_CommandBaseTests
@@ -41,7 +38,7 @@ public void NotifyCanExecuteChangedRaisesEvent()
     {
         var command = new IRIHI_CommandBase(() => { });
         bool eventRaised = false;
-        command.CanExecuteChanged += (sender, e) => eventRaised = true;
+        command.CanExecuteChanged += (_, _) => eventRaised = true;
 
         command.NotifyCanExecuteChanged();
 

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Common/IRIHI_ObservableBaseTests.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Common/IRIHI_ObservableBaseTests.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using Xunit;
 
 namespace Irihi.Avalonia.Shared.Common.Tests;
 
@@ -32,7 +30,7 @@ public void PropertyChangedEventFiresOnPropertyChange()
     {
         var testObject = new TestObservable();
         bool eventFired = false;
-        testObject.PropertyChanged += (sender, e) =>
+        testObject.PropertyChanged += (_, e) =>
         {
             if (e.PropertyName == nameof(TestObservable.TestProperty))
                 eventFired = true;
@@ -49,7 +47,7 @@ public void PropertyChangedEventDoesNotFireWhenValueIsUnchanged()
         var testObject = new TestObservable();
         testObject.TestProperty = "Initial Value";
         bool eventFired = false;
-        testObject.PropertyChanged += (sender, e) => eventFired = true;
+        testObject.PropertyChanged += (_, _) => eventFired = true;
 
         testObject.TestProperty = "Initial Value";
 

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/BindingExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/BindingExtensionTest.cs
@@ -1,8 +1,6 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 using Avalonia.Media;
 using Irihi.Avalonia.Shared.Helpers;
-using Irihi.Avalonia.Shared.Reactive;
 
 namespace Irihi.Avalonia.Shared.UnitTest.Helpers;
 

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/LogicalHelpersTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/LogicalHelpersTest.cs
@@ -17,8 +17,8 @@ public void CalculateDistanceFromLogicalParent_Default()
         var parent = new StackPanel();
         var child = new Button();
         parent.Children.Add(child);
-        Assert.Equal(1, child.CalculateDistanceFromLogicalParent<StackPanel>(-1));
-        Assert.Equal(-1, child.CalculateDistanceFromLogicalParent<Grid>(-1));
+        Assert.Equal(1, child.CalculateDistanceFromLogicalParent<StackPanel>());
+        Assert.Equal(-1, child.CalculateDistanceFromLogicalParent<Grid>());
     }
 
     [Fact]

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/ObservableExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/ObservableExtensionTest.cs
@@ -12,7 +12,7 @@ public void Subscribe_Action_Success()
         bool called = false;
         var textBlock = new TextBlock();
         IObservable<string?> observable = textBlock.GetObservable(TextBlock.TextProperty);
-        IDisposable disposable = observable.Subscribe(i => called = true);
+        IDisposable disposable = observable.Subscribe(_ => called = true);
         textBlock.Text = "Hello, World!";
         disposable.Dispose();
         Assert.True(called);

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Helpers/RoutedEventExtensionTest.cs
@@ -1,5 +1,4 @@
 using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Irihi.Avalonia.Shared.Helpers;
@@ -18,7 +17,7 @@ void Handler(object? sender, RoutedEventArgs args)
             count++;
         }
         Button.ClickEvent.AddHandler(Handler, button);
-        button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
+        button.RaiseEvent(new RoutedEventArgs { Source = button, RoutedEvent = Button.ClickEvent});
         Assert.Equal(1, count);
     }
 
@@ -146,7 +145,6 @@ void Handler(object? sender, RoutedEventArgs args)
         }
         var result = Button.ClickEvent.AddDisposableHandler(Handler, button, button2, button3);
         result.Dispose();
-        ;
         button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
         button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
         button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
@@ -304,7 +302,7 @@ void Handler(object? sender, RoutedEventArgs args)
         {
             count++;
         }
-        var disposables = Button.ClickEvent.AddDisposableHandler(Handler, new Button[]{button, button2, button3}, RoutingStrategies.Bubble, true);
+        var disposables = Button.ClickEvent.AddDisposableHandler(Handler, new[]{button, button2, button3}, RoutingStrategies.Bubble, true);
         button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
         button2.RaiseEvent(new RoutedEventArgs(){ Source = button2, RoutedEvent = Button.ClickEvent});
         button3.RaiseEvent(new RoutedEventArgs(){ Source = button3, RoutedEvent = Button.ClickEvent});
@@ -410,14 +408,13 @@ void Handler(object? sender, GotFocusEventArgs args)
     public void EventHandler_AddHandler_Multi_Type_List_Success()
     {
         var button = new Button();
-        var panel = new Panel();
         var button2 = new Button();
         int count = 0;
         void Handler(object? sender, RoutedEventArgs args)
         {
             count++;
         }
-        Button.ClickEvent.AddDisposableHandler<RoutedEventArgs, Button>(Handler, RoutingStrategies.Bubble, false, button, button2);
+        Button.ClickEvent.AddDisposableHandler(Handler, RoutingStrategies.Bubble, false, button, button2);
         button.RaiseEvent(new RoutedEventArgs(){ Source = button, RoutedEvent = Button.ClickEvent});
 
         Assert.Equal(1, count);

diff --git a/test/Irihi.Avalonia.Shared.UnitTest.Public/Shapes/PureRingTest.cs b/test/Irihi.Avalonia.Shared.UnitTest.Public/Shapes/PureRingTest.cs
@@ -1,9 +1,4 @@
-using System.ComponentModel;
-using System.Net.Http.Headers;
 using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using Avalonia.Media;
 using Irihi.Avalonia.Shared.Shapes;
 
 namespace Irihi.Avalonia.Shared.UnitTest.Shapes;