Prevent OnChanged property name to clash with partial method generation

rrmanzano · Apr 21, 2023 · cb23721 · cb23721
1 parent 3a94d20
commit cb23721
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/Maui.BindableProperty.Generator/Core/BindableProperty/AutoBindablePropertyGenerator.cs b/src/Maui.BindableProperty.Generator/Core/BindableProperty/AutoBindablePropertyGenerator.cs
@@ -232,9 +232,6 @@ private void ProcessBindableProperty(
             }
         }
 
-        w._($@"partial void On{propertyName}Changed({declaringType.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)} value);");
-        w._($@"partial void On{propertyName}Changing({declaringType.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)} value);");
-
         this.ProcessImplementationLogic(w);
     }
 

diff --git a/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/PropertyChanged.cs b/src/Maui.BindableProperty.Generator/Core/BindableProperty/Implementation/PropertyChanged.cs
@@ -62,7 +62,7 @@ public void ProcessImplementationLogic(CodeWriter w)
         using (w.B(methodDefinition))
         {
             w._($@"var ctrl = ({this.ClassSymbol.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)})bindable;");
-            this.OnChangedProperty.GetValue<string>((customMethodName) =>
+            if (this.OnChangedProperty.Value is string customMethodName)
             {
                 var methods = this.GetMethodsToCall(customMethodName);
                 if (methods.Any())
@@ -78,9 +78,15 @@ public void ProcessImplementationLogic(CodeWriter w)
                             w._($@"ctrl.{customMethodName}(({this.FieldSymbol.Type})oldValue, ({this.FieldSymbol.Type})newValue);");
                     });
                 }
-                return default;
-            });
-            w._($@"ctrl.{methodName}(({this.FieldSymbol.Type})newValue);");
+            }
+            if (this.OnChangedProperty.Value is not string clashingCustomName || clashingCustomName != methodName)
+            {
+                w._($@"ctrl.{methodName}(({this.FieldSymbol.Type.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)})newValue);");
+            }
+        }
+        if (this.OnChangedProperty.Value is not string clashingCustomCallName || clashingCustomCallName != methodName)
+        {
+            w._($@"partial void {methodName}({this.FieldSymbol.Type.ToDisplayString(CommonSymbolDisplayFormat.DefaultFormat)} value);");
         }
     }