Merge pull request #5313 from jp2masa/static-method-to-command

Fixed static method to command conversion
AvaloniaUI · Jan 21, 2021 · 15c175e · 15c175e
2 parents f87464e + 2ffe89d
commit 15c175e
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/src/Avalonia.Base/Data/Converters/MethodToCommandConverter.cs b/src/Avalonia.Base/Data/Converters/MethodToCommandConverter.cs
@@ -63,7 +63,7 @@ public MethodToCommandConverter(Delegate action)
             }
         }
 
-        void OnPropertyChanged(object sender,PropertyChangedEventArgs args)
+        void OnPropertyChanged(object sender, PropertyChangedEventArgs args)
         {
             if (string.IsNullOrWhiteSpace(args.PropertyName)
                                || dependencyProperties?.Contains(args.PropertyName) == true)
@@ -88,12 +88,7 @@ void OnPropertyChanged(object sender,PropertyChangedEventArgs args)
 
             var parameter = Expression.Parameter(typeof(object), "parameter");
 
-            var instance = Expression.Convert
-            (
-                Expression.Constant(target),
-                method.DeclaringType
-            );
-
+            var instance = ConvertTarget(target, method);
 
             var call = Expression.Call
             (
@@ -114,11 +109,7 @@ void OnPropertyChanged(object sender,PropertyChangedEventArgs args)
 
             var parameter = Expression.Parameter(typeof(object), "parameter");
 
-            var instance = Expression.Convert
-            (
-                Expression.Constant(target),
-                method.DeclaringType
-            );
+            var instance = ConvertTarget(target, method);
 
             Expression body;
 
@@ -167,11 +158,7 @@ void OnPropertyChanged(object sender,PropertyChangedEventArgs args)
             , System.Reflection.MethodInfo method)
         {
             var parameter = Expression.Parameter(typeof(object), "parameter");
-            var instance = Expression.Convert
-            (
-                Expression.Constant(target),
-                method.DeclaringType
-            );
+            var instance = ConvertTarget(target, method);
             var call = Expression.Call
             (
                 instance,
@@ -183,6 +170,8 @@ void OnPropertyChanged(object sender,PropertyChangedEventArgs args)
                 .Compile();
         }
 
+        private static Expression? ConvertTarget(object? target, MethodInfo method) =>
+            target is null ? null : Expression.Convert(Expression.Constant(target), method.DeclaringType);
 
         internal class WeakPropertyChangedProxy
         {
@@ -224,7 +213,7 @@ void OnPropertyChanged(object sender, PropertyChangedEventArgs e)
                 else
                     Unsubscribe();
             }
-           
+
         }
     }
 }