Fix mixed callbacks codegen

Sergio0694 · Sergio0694 · commit e8f26b07b1e2 · 2025-01-27T19:58:26.000-08:00
diff --git a/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/DependencyPropertyGenerator.Execute.cs b/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.SourceGenerators/DependencyPropertyGenerator.Execute.cs
@@ -1053,7 +1053,7 @@ public static void WriteAdditionalTypes(EquatableArray<DependencyPropertyInfo> p
                     if (propertyInfo.IsSharedPropertyChangedCallbackImplemented)
                     {
                         writer.IncreaseIndent();
-                        writer.WriteLine($"PropertyChangedUnsafeAccessors.On{propertyInfo.PropertyName}PropertyChanged(__this, e);");
+                        writer.WriteLine("PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);");
                         writer.DecreaseIndent();
                     }
 
diff --git a/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.Tests/Test_DependencyPropertyGenerator.cs b/components/DependencyPropertyGenerator/CommunityToolkit.DependencyPropertyGenerator.Tests/Test_DependencyPropertyGenerator.cs
@@ -1454,7 +1454,7 @@ private void OnNumberPropertyChanged(DependencyObject d, DependencyPropertyChang
                         global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;
 
                         PropertyChangedUnsafeAccessors.OnNumberPropertyChanged(__this, e);
-                        PropertyChangedUnsafeAccessors.OnNumberPropertyChanged(__this, e);
+                        PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);
                     }
                 }
 
@@ -3272,7 +3272,7 @@ private void OnFirstNamePropertyChanged(DependencyObject d, DependencyPropertyCh
                         global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;
 
                         PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);
-                        PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);
+                        PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);
                     }
 
                     /// <inheritdoc cref="cref="global::MyNamespace.MyControl.OnPropertyChanged""/>
@@ -3555,7 +3555,7 @@ private void OnFirstNamePropertyChanged(DependencyObject d, DependencyPropertyCh
                         global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;
 
                         PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);
-                        PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);
+                        PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);
                     }
 
                     /// <inheritdoc cref="cref="global::MyNamespace.MyControl.OnPropertyChanged""/>
@@ -3564,7 +3564,7 @@ private void OnLastNamePropertyChanged(DependencyObject d, DependencyPropertyCha
                         global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;
 
                         PropertyChangedUnsafeAccessors.OnLastNamePropertyChanged(__this, e);
-                        PropertyChangedUnsafeAccessors.OnLastNamePropertyChanged(__this, e);
+                        PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -1053,7 +1053,7 @@ public static void WriteAdditionalTypes(EquatableArray<DependencyPropertyInfo> p`
`1053`	`1053`	`if (propertyInfo.IsSharedPropertyChangedCallbackImplemented)`
`1054`	`1054`	`{`
`1055`	`1055`	`writer.IncreaseIndent();`
`1056`		`- writer.WriteLine($"PropertyChangedUnsafeAccessors.On{propertyInfo.PropertyName}PropertyChanged(__this, e);");`
	`1056`	`+ writer.WriteLine("PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);");`
`1057`	`1057`	`writer.DecreaseIndent();`
`1058`	`1058`	`}`
`1059`	`1059`
Original file line number	Diff line number	Diff line change
`@@ -1454,7 +1454,7 @@ private void OnNumberPropertyChanged(DependencyObject d, DependencyPropertyChang`
`1454`	`1454`	`global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;`
`1455`	`1455`
`1456`	`1456`	`PropertyChangedUnsafeAccessors.OnNumberPropertyChanged(__this, e);`
`1457`		`- PropertyChangedUnsafeAccessors.OnNumberPropertyChanged(__this, e);`
	`1457`	`+ PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);`
`1458`	`1458`	`}`
`1459`	`1459`	`}`
`1460`	`1460`
`@@ -3272,7 +3272,7 @@ private void OnFirstNamePropertyChanged(DependencyObject d, DependencyPropertyCh`
`3272`	`3272`	`global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;`
`3273`	`3273`
`3274`	`3274`	`PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);`
`3275`		`- PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);`
	`3275`	`+ PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);`
`3276`	`3276`	`}`
`3277`	`3277`
`3278`	`3278`	`/// <inheritdoc cref="cref="global::MyNamespace.MyControl.OnPropertyChanged""/>`
`@@ -3555,7 +3555,7 @@ private void OnFirstNamePropertyChanged(DependencyObject d, DependencyPropertyCh`
`3555`	`3555`	`global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;`
`3556`	`3556`
`3557`	`3557`	`PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);`
`3558`		`- PropertyChangedUnsafeAccessors.OnFirstNamePropertyChanged(__this, e);`
	`3558`	`+ PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);`
`3559`	`3559`	`}`
`3560`	`3560`
`3561`	`3561`	`/// <inheritdoc cref="cref="global::MyNamespace.MyControl.OnPropertyChanged""/>`
`@@ -3564,7 +3564,7 @@ private void OnLastNamePropertyChanged(DependencyObject d, DependencyPropertyCha`
`3564`	`3564`	`global::MyNamespace.MyControl __this = (global::MyNamespace.MyControl)d;`
`3565`	`3565`
`3566`	`3566`	`PropertyChangedUnsafeAccessors.OnLastNamePropertyChanged(__this, e);`
`3567`		`- PropertyChangedUnsafeAccessors.OnLastNamePropertyChanged(__this, e);`
	`3567`	`+ PropertyChangedUnsafeAccessors.OnPropertyChanged(__this, e);`
`3568`	`3568`	`}`
`3569`	`3569`	`}`
`3570`	`3570`