Add pattern matching

JLdgu · JLdgu · commit d06ef3256ce4 · 2024-09-08T11:54:55.000+01:00
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintClippingGridConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintClippingGridConverter.cs
@@ -8,10 +8,7 @@ public class FloatingHintClippingGridConverter : IMultiValueConverter
 {
     public object? Convert(object?[] values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values is not [double actualWidth, double actualHeight, double floatingScale])
-        {
-            return null;
-        }
+        if (values is not [double actualWidth, double actualHeight, double floatingScale]) return null;        
 
         RectangleGeometry geometry = new(new Rect(new Point(0, 0), new Size(actualWidth, actualHeight * 2 * floatingScale)));
         geometry.Freeze();
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintContainerMarginConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintContainerMarginConverter.cs
@@ -9,17 +9,15 @@ public class FloatingHintContainerMarginConverter : IMultiValueConverter
 
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values is [double scale, Thickness floatingMargin, double floatingScale])
+        if (values is not [double scale, Thickness floatingMargin, double floatingScale]) return EmptyThickness;
+
+        return floatingMargin with
         {
-            return floatingMargin with
-            {
-                Left = (floatingMargin.Left * scale) / floatingScale,
-                Top = (floatingMargin.Top * scale) / floatingScale,
-                Right = (floatingMargin.Right * scale) / floatingScale,
-                Bottom = (floatingMargin.Bottom * scale) / floatingScale
-            };
-        }
-        return EmptyThickness;
+            Left = (floatingMargin.Left * scale) / floatingScale,
+            Top = (floatingMargin.Top * scale) / floatingScale,
+            Right = (floatingMargin.Right * scale) / floatingScale,
+            Bottom = (floatingMargin.Bottom * scale) / floatingScale
+        };
     }
 
     public object[]? ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintInitialHorizontalOffsetConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintInitialHorizontalOffsetConverter.cs
@@ -7,16 +7,24 @@ public class FloatingHintInitialHorizontalOffsetConverter : IMultiValueConverter
 {
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values is [double prefixWidth, Thickness prefixMargin, double suffixWidth, Thickness suffixMargin, PrefixSuffixVisibility prefixVisibility, PrefixSuffixVisibility suffixVisibility, PrefixSuffixHintBehavior prefixHintBehavior, PrefixSuffixHintBehavior suffixHintBehavior, HorizontalAlignment horizontalContentAlignment])
+        if (values is not
+            [   double prefixWidth,
+                Thickness prefixMargin,
+                double suffixWidth,
+                Thickness suffixMargin,
+                PrefixSuffixVisibility prefixVisibility,
+                PrefixSuffixVisibility suffixVisibility,
+                PrefixSuffixHintBehavior prefixHintBehavior,
+                PrefixSuffixHintBehavior suffixHintBehavior,
+                HorizontalAlignment horizontalContentAlignment
+            ]) return 0;
+
+        return horizontalContentAlignment switch
         {
-            return horizontalContentAlignment switch
-            {
-                HorizontalAlignment.Center => 0,
-                HorizontalAlignment.Right => GetRightOffset(),
-                _ => GetLeftOffset(),
-            };
-        }
-        return 0;
+            HorizontalAlignment.Center => 0,
+            HorizontalAlignment.Right => GetRightOffset(),
+            _ => GetLeftOffset(),
+        };
 
         double GetLeftOffset()
         {
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintInitialVerticalOffsetConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintInitialVerticalOffsetConverter.cs
@@ -7,11 +7,9 @@ public class FloatingHintInitialVerticalOffsetConverter : IMultiValueConverter
 {
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values is [double contentHostHeight, double hintHeight])
-        {
-            return (contentHostHeight - hintHeight) / 2;
-        }
-        return 0;
+        if (values is not [double contentHostHeight, double hintHeight]) return 0;
+
+        return (contentHostHeight - hintHeight) / 2;
     }
 
     public object?[] ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintMarginConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintMarginConverter.cs
@@ -20,10 +20,7 @@ public class FloatingHintMarginConverter : IMultiValueConverter
                 Thickness suffixMargin,
                 PrefixSuffixVisibility prefixVisibility,
                 PrefixSuffixVisibility suffixVisibility
-            ])
-        {
-            return EmptyThickness;
-        }
+            ]) return EmptyThickness;
 
         double prefixTotalWidth = prefixWidth > 0 ? prefixWidth + prefixMargin.Right : 0;
         double suffixTotalWidth = suffixWidth > 0 ? suffixWidth + suffixMargin.Left : 0;
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintScaleTransformConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintScaleTransformConverter.cs
@@ -8,10 +8,7 @@ public class FloatingHintScaleTransformConverter : IMultiValueConverter
 {
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values is not [double scale, double lower, double upper])
-        {
-            return Transform.Identity;
-        }
+        if (values is not [double scale, double lower, double upper]) return Transform.Identity;        
 
         double scalePercentage = upper + (lower - upper) * scale;
         return new ScaleTransform(scalePercentage, scalePercentage);
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintTextBlockMarginConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintTextBlockMarginConverter.cs
@@ -11,12 +11,14 @@ internal class FloatingHintTextBlockMarginConverter : IMultiValueConverter
         if (values is not
             [
                 FloatingHintHorizontalAlignment restingAlignmentOverride,
-                FloatingHintHorizontalAlignment floatingAlignment, HorizontalAlignment restingAlignment,
-                double desiredWidth, double availableWidth, double scale, double lower, double upper
-            ])
-        {
-            return Transform.Identity;
-        }
+                FloatingHintHorizontalAlignment floatingAlignment,
+                HorizontalAlignment restingAlignment,
+                double desiredWidth,
+                double availableWidth,
+                double scale,
+                double lower,
+                double upper
+            ]) return Transform.Identity;        
 
         double scaleMultiplier = upper + (lower - upper) * scale;
 
diff --git a/src/MaterialDesignThemes.Wpf/Converters/FloatingHintTranslateTransformConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/FloatingHintTranslateTransformConverter.cs
@@ -8,10 +8,7 @@ public class FloatingHintTranslateTransformConverter : IMultiValueConverter
 {
     public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (values is not [double scale, double lower, double upper, SmartHint hint, Point floatingOffset, ..])
-        {
-            return Transform.Identity;
-        }
+        if (values is not [double scale, double lower, double upper, SmartHint hint, Point floatingOffset, ..]) return Transform.Identity;
 
         // Back-compatible behavior, fall back to using the non-nullable floatingOffset if it has a non-default value
         if (hint.FloatingTarget is null || floatingOffset != HintAssist.DefaultFloatingOffset)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/HorizontalThicknessConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/HorizontalThicknessConverter.cs
@@ -7,11 +7,9 @@ internal class HorizontalThicknessConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        if (value is Thickness thickness)
-        {
-            return new Thickness(thickness.Left, 0, thickness.Right, 0);
-        }
-        return Binding.DoNothing;
+        if (value is not Thickness thickness) return Binding.DoNothing;
+
+        return new Thickness(thickness.Left, 0, thickness.Right, 0);
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/HsbLinearGradientConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/HsbLinearGradientConverter.cs
@@ -9,9 +9,9 @@ public class HsbLinearGradientConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        var v = (double)value;
+        if (value is not double hue) return Binding.DoNothing;
 
-        return new LinearGradientBrush(Colors.White, new Hsb(v, 1, 1).ToColor(), 0);
+        return new LinearGradientBrush(Colors.White, new Hsb(hue, 1, 1).ToColor(), 0);
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/HsbToColorConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/HsbToColorConverter.cs
@@ -9,23 +9,23 @@ public class HsbToColorConverter : IValueConverter, IMultiValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        if (value is Hsb hsb) return new SolidColorBrush(hsb.ToColor());
-        return Binding.DoNothing;
+        if (value is not Hsb hsb) return Binding.DoNothing;
+
+        return new SolidColorBrush(hsb.ToColor());        
     }
 
     public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
     {
-        if (value is SolidColorBrush brush) return brush.Color.ToHsb();
-        return Binding.DoNothing;
+        if (value is not SolidColorBrush brush) return Binding.DoNothing;
+
+        return brush.Color.ToHsb();        
     }
 
     public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
     {
-        var h = (double)values[0];
-        var s = (double)values[1];
-        var b = (double)values[2];
+        if (values is not [double hue, double saturation, double brightness]) return Binding.DoNothing;
 
-        return new SolidColorBrush(new Hsb(h, s, b).ToColor());
+        return new SolidColorBrush(new Hsb(hue, saturation, brightness).ToColor());
     }
 
     public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/ListViewItemContainerStyleConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/ListViewItemContainerStyleConverter.cs
@@ -28,12 +28,9 @@ public class ListViewGridViewConverter : IValueConverter
     /// <returns></returns>
     public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
     {
-        if (value is ListView listView)
-        {
-            return listView.View != null ? ViewValue : DefaultValue;
-        }
+        if (value is not ListView listView) return value is ViewBase ? ViewValue : DefaultValue;
 
-        return value is ViewBase ? ViewValue : DefaultValue;
+        return listView.View != null ? ViewValue : DefaultValue;
     }
 
     public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/MathConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/MathConverter.cs
@@ -10,24 +10,17 @@ public sealed class MathConverter : IValueConverter
 
     public object? Convert(object? value, Type? targetType, object? parameter, CultureInfo? culture)
     {
-        try
-        {
-            double value1 = System.Convert.ToDouble(value, CultureInfo.InvariantCulture);
-            double value2 = System.Convert.ToDouble(parameter, CultureInfo.InvariantCulture);
-            return Operation switch
-            {
-                MathOperation.Add => value1 + value2 + Offset,
-                MathOperation.Divide => value1 / value2 + Offset,
-                MathOperation.Multiply => value1 * value2 + Offset,
-                MathOperation.Subtract => value1 - value2 + Offset,
-                MathOperation.Pow => Math.Pow(value1, value2) + Offset,
-                _ => Binding.DoNothing,
-            };
-        }
-        catch (FormatException)
+        if (value is not double value1 || parameter is not double value2) return Binding.DoNothing;
+
+        return Operation switch
         {
-            return Binding.DoNothing;
-        }
+            MathOperation.Add => value1 + value2 + Offset,
+            MathOperation.Divide => value1 / value2 + Offset,
+            MathOperation.Multiply => value1 * value2 + Offset,
+            MathOperation.Subtract => value1 - value2 + Offset,
+            MathOperation.Pow => Math.Pow(value1, value2) + Offset,
+            _ => Binding.DoNothing,
+        };
     }
 
     public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
diff --git a/src/MaterialDesignThemes.Wpf/Converters/MathMultipleConverter.cs b/src/MaterialDesignThemes.Wpf/Converters/MathMultipleConverter.cs
@@ -9,10 +9,7 @@ public sealed class MathMultipleConverter : IMultiValueConverter
 
     public object? Convert(object?[]? value, Type? targetType, object? parameter, CultureInfo? culture)
     {
-        if (value is null || value.Length < 2 || value[0] is null || value[1] is null) return Binding.DoNothing;
-
-        if (!double.TryParse(value[0]!.ToString(), out double value1) || !double.TryParse(value[1]!.ToString(), out double value2))
-            return 0;
+        if (value is not [double value1, double value2]) return Binding.DoNothing;
 
         return Operation switch
         {

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,7 @@ public class FloatingHintClippingGridConverter : IMultiValueConverter`
`8`	`8`	`{`
`9`	`9`	`public object? Convert(object?[] values, Type targetType, object? parameter, CultureInfo culture)`
`10`	`10`	`{`
`11`		`- if (values is not [double actualWidth, double actualHeight, double floatingScale])`
`12`		`- {`
`13`		`- return null;`
`14`		`- }`
	`11`	`+ if (values is not [double actualWidth, double actualHeight, double floatingScale]) return null;`
`15`	`12`
`16`	`13`	`RectangleGeometry geometry = new(new Rect(new Point(0, 0), new Size(actualWidth, actualHeight * 2 * floatingScale)));`
`17`	`14`	`geometry.Freeze();`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,9 @@ public class FloatingHintInitialVerticalOffsetConverter : IMultiValueConverter`
`7`	`7`	`{`
`8`	`8`	`public object? Convert(object?[]? values, Type targetType, object? parameter, CultureInfo culture)`
`9`	`9`	`{`
`10`		`- if (values is [double contentHostHeight, double hintHeight])`
`11`		`- {`
`12`		`- return (contentHostHeight - hintHeight) / 2;`
`13`		`- }`
`14`		`- return 0;`
	`10`	`+ if (values is not [double contentHostHeight, double hintHeight]) return 0;`
	`11`	`+`
	`12`	`+ return (contentHostHeight - hintHeight) / 2;`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`public object?[] ConvertBack(object? value, Type[] targetTypes, object? parameter, CultureInfo culture)`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,9 @@ internal class HorizontalThicknessConverter : IValueConverter`
`7`	`7`	`{`
`8`	`8`	`public object Convert(object value, Type targetType, object parameter, CultureInfo culture)`
`9`	`9`	`{`
`10`		`- if (value is Thickness thickness)`
`11`		`- {`
`12`		`- return new Thickness(thickness.Left, 0, thickness.Right, 0);`
`13`		`- }`
`14`		`- return Binding.DoNothing;`
	`10`	`+ if (value is not Thickness thickness) return Binding.DoNothing;`
	`11`	`+`
	`12`	`+ return new Thickness(thickness.Left, 0, thickness.Right, 0);`
`15`	`13`	`}`
`16`	`14`
`17`	`15`	`public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ public class HsbLinearGradientConverter : IValueConverter`
`9`	`9`	`{`
`10`	`10`	`public object Convert(object value, Type targetType, object parameter, CultureInfo culture)`
`11`	`11`	`{`
`12`		`- var v = (double)value;`
	`12`	`+ if (value is not double hue) return Binding.DoNothing;`
`13`	`13`
`14`		`- return new LinearGradientBrush(Colors.White, new Hsb(v, 1, 1).ToColor(), 0);`
	`14`	`+ return new LinearGradientBrush(Colors.White, new Hsb(hue, 1, 1).ToColor(), 0);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)`