Fixes SonarQube's "Null checks should not be used with 'is'" / Code S…

…mell (dotnet#1059) * Fix SonarQube's "Null checks should not be used with 'is'" / Code Smell * Revert wrongly refactored "Null checks should not be used with 'is'"
lytico · Jun 8, 2021 · 22dacae · 22dacae
1 parent e82f99c
commit 22dacae
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Controls/src/Core/Accelerator.cs b/src/Controls/src/Core/Accelerator.cs
@@ -72,7 +72,7 @@ public override string ToString()
 
 		public override bool Equals(object obj)
 		{
-			return obj != null && obj is Accelerator && Equals((Accelerator)obj);
+			return obj is Accelerator && Equals((Accelerator)obj);
 		}
 
 		bool Equals(Accelerator other)

diff --git a/src/Controls/src/Core/TypedBinding.cs b/src/Controls/src/Core/TypedBinding.cs
@@ -191,7 +191,7 @@ internal override void Unapply(bool fromBindingContextChanged = false)
 		// ApplyCore  100000 (w/o INPC, w/o unnapply)	: 20ms.
 		internal void ApplyCore(object sourceObject, BindableObject target, BindableProperty property, bool fromTarget = false)
 		{
-			var isTSource = sourceObject != null && sourceObject is TSource;
+			var isTSource = sourceObject is TSource;
 			var mode = this.GetRealizedMode(property);
 			if ((mode == BindingMode.OneWay || mode == BindingMode.OneTime) && fromTarget)
 				return;

diff --git a/src/Core/src/Primitives/GridLength.cs b/src/Core/src/Primitives/GridLength.cs
@@ -53,7 +53,7 @@ public GridLength(double value, GridUnitType type)
 
 		public override bool Equals(object? obj)
 		{
-			return obj != null && obj is GridLength && Equals((GridLength)obj);
+			return obj is GridLength && Equals((GridLength)obj);
 		}
 
 		bool Equals(GridLength other)