From d0e3e765c39abb000b7e905bc9a02c4c31bb091b Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sat, 28 Jun 2025 01:58:38 +1000 Subject: [PATCH] remove some redundant returns (#19137) Co-authored-by: Julien Lebosquain --- src/Avalonia.Base/Animation/Animators/BoolAnimator.cs | 2 -- .../Peers/SelectingItemsControlAutomationPeer.cs | 2 -- .../AvaloniaXamlIlLanguageParseIntrinsics.cs | 7 ++----- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs b/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs index 25cdeca3e3..87cd89b2ba 100644 --- a/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs +++ b/src/Avalonia.Base/Animation/Animators/BoolAnimator.cs @@ -10,8 +10,6 @@ { if(progress >= 1d) return newValue; - if(progress >= 0) - return oldValue; return oldValue; } } diff --git a/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs index 11480fcb34..8ee2734a9e 100644 --- a/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs +++ b/src/Avalonia.Controls/Automation/Peers/SelectingItemsControlAutomationPeer.cs @@ -48,8 +48,6 @@ namespace Avalonia.Automation.Peers } } } - - return result; } return result; diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs index 93a4b3146c..69cdec68c8 100644 --- a/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs +++ b/src/Markup/Avalonia.Markup.Xaml.Loader/CompilerExtensions/AvaloniaXamlIlLanguageParseIntrinsics.cs @@ -421,7 +421,7 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions return ReturnOnParseError($"x:Array element {element.Type.GetClrType().Name} is not assignable to the array element type {elementType.Name}", out result); } } - + if (types.AvaloniaList.MakeGenericType(elementType).IsAssignableFrom(type)) { result = new AvaloniaXamlIlAvaloniaListConstantAstNode(node, types, type, elementType, nodes); @@ -439,11 +439,8 @@ namespace Avalonia.Markup.Xaml.XamlIl.CompilerExtensions result = new AvaloniaXamlIlArrayConstantAstNode(node, listType, elementType, nodes); return true; } - - result = null; - return false; } - + result = null; return false; }