Merge pull request #160 from FmgLib/v8.8.8

gonultasmf · web-flow · commit f6cc2ad32a95 · 2024-12-07T22:43:33.000+03:00
V8.8.8
diff --git a/README.md b/README.md
@@ -1299,6 +1299,10 @@ Simply specify the control for which you want to create extension methods as `[M
 
 The constructor method of the `MauiMarkup()` attribute automatically generates extension methods for BindableProperties and Events found within the type provided as an argument. **You can provide a minimum of 1 type inside the constructor method, and there is no maximum limit.** **Multiple MauiMarkup attributes can be added to a single class.**
 
+**NOTE: Suppose that if a property inherited from base classes has been redefined with the `new` keyword in the class where you want to create a Fluent Method, the name of the new Fluent Method will be `PropertyName + New`.**
+
+For example, since the **Background** property in the **SfAvatarView** class is redefined with `new` and is the same as the **Background** in **VisualElement**, to prevent errors, the Fluent Method name for the **Background** property of the **SfAvatarView** class will be `BackgroundNew`.
+
 Let's look at an example:
 
 ```csharp
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.AnimateTo.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.AnimateTo.cs
@@ -7,10 +7,10 @@ void GenerateExtensionMethod_AnimateTo(PropInfo info, string transformationName)
 
         if (mainSymbol.IsSealed)
             builder.Append($@"
-    public static Task<bool> Animate{info.propertyName}To(this {info.MainSymbolName} self, {info.propertyTypeName} value, uint length = 250, Easing? easing = null)");
+    public static Task<bool> Animate{info.methodName}To(this {info.MainSymbolName} self, {info.propertyTypeName} value, uint length = 250, Easing? easing = null)");
         else
             builder.Append($@"
-    public static Task<bool> Animate{info.propertyName}To<T>(this T self, {info.propertyTypeName} value, uint length = 250, Easing? easing = null)
+    public static Task<bool> Animate{info.methodName}To<T>(this T self, {info.propertyTypeName} value, uint length = 250, Easing? easing = null)
         where T : {info.MainSymbolName}");
 
         var callBackSetValue = info.IsBindableProperty ? $"self.SetValue({info.BindablePropertyName}, actValue);" : $"self.{info.propertyName} = actValue;";
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.BindingBuilder.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.BindingBuilder.cs
@@ -13,7 +13,7 @@ void GenerateExtensionMethod_BindablePropertyBuilder(PropInfo info)
     void GenerateExtensionMethod_BindablePropertyBuilder_Sealed(PropInfo info)
     {
         builder.Append($@"
-    public static {info.MainSymbolName} {info.propertyName}(this {info.MainSymbolName} self, Func<PropertyContext<{info.propertyTypeName}>, IPropertyBuilder<{info.propertyTypeName}>> configure)
+    public static {info.MainSymbolName} {info.methodName}(this {info.MainSymbolName} self, Func<PropertyContext<{info.propertyTypeName}>, IPropertyBuilder<{info.propertyTypeName}>> configure)
     {{
         var context = new PropertyContext<{info.propertyTypeName}>(self, {info.BindablePropertyName});
         configure(context).Build();
@@ -25,7 +25,7 @@ void GenerateExtensionMethod_BindablePropertyBuilder_Sealed(PropInfo info)
     void GenerateExtensionMethod_BindablePropertyBuilder_Normal(PropInfo info)
     {
         builder.Append($@"
-    public static T {info.propertyName}<T>(this T self, Func<PropertyContext<{info.propertyTypeName}>, IPropertyBuilder<{info.propertyTypeName}>> configure)
+    public static T {info.methodName}<T>(this T self, Func<PropertyContext<{info.propertyTypeName}>, IPropertyBuilder<{info.propertyTypeName}>> configure)
         where T : {info.MainSymbolName}
     {{
         var context = new PropertyContext<{info.propertyTypeName}>(self, {info.BindablePropertyName});
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.ContentProp.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.ContentProp.cs
@@ -23,14 +23,14 @@ void GenerateExtensionMethod_ContentProp_List(PropInfo info, string elementTypeN
     void GenerateExtensionMethod_ContentProp_Single_Sealed(PropInfo info)
     {
         builder.Append($@"
-    public static {info.MainSymbolName} {info.propertyName}_ContentProp(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {info.methodName}_ContentProp(this {info.MainSymbolName} self,
         {info.propertyTypeName} {info.camelCaseName})
     {{
         self.{info.propertyName} = {info.camelCaseName};
         return self;
     }}
 
-    public static {info.MainSymbolName} {info.propertyName}_ContentProp(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {info.methodName}_ContentProp(this {info.MainSymbolName} self,
         Func<{info.propertyTypeName}> configure)
     {{
         var {info.camelCaseName} = configure();
@@ -43,15 +43,15 @@ void GenerateExtensionMethod_ContentProp_Single_Sealed(PropInfo info)
     void GenerateExtensionMethod_ContentProp_Single_Normal(PropInfo info)
     {
         builder.Append($@"
-    public static T {info.propertyName}_ContentProp<T>(this T self,
+    public static T {info.methodName}_ContentProp<T>(this T self,
         {info.propertyTypeName} {info.camelCaseName})
         where T : {info.MainSymbolName}
     {{
         self.{info.propertyName} = {info.camelCaseName};
         return self;
     }}
 
-    public static T {info.propertyName}_ContentProp<T>(this T self,
+    public static T {info.methodName}_ContentProp<T>(this T self,
         Func<{info.propertyTypeName}> configure)
         where T : {info.MainSymbolName}
     {{
@@ -68,23 +68,23 @@ void GenerateExtensionMethod_ContentProp_List_Sealed(PropInfo info, string eleme
     {
         var tail = info.propertyTypeName.EndsWith("?") ? "?" : "";
         builder.Append($@"
-    public static {info.MainSymbolName} {(string.IsNullOrEmpty(fluentMethodName) ? info.propertyName : fluentMethodName)}(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {(string.IsNullOrEmpty(fluentMethodName) ? info.methodName : fluentMethodName)}(this {info.MainSymbolName} self,
         IList<{elementTypeName}> {info.camelCaseName})
     {{
         foreach (var item in {info.camelCaseName})
             self.{info.propertyName}{tail}.Add(item);
         return self;
     }}
 
-    public static {info.MainSymbolName} {(string.IsNullOrEmpty(fluentMethodName) ? info.propertyName : fluentMethodName)}(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {(string.IsNullOrEmpty(fluentMethodName) ? info.methodName : fluentMethodName)}(this {info.MainSymbolName} self,
         params {elementTypeName}[] {info.camelCaseName})
     {{
         foreach (var item in {info.camelCaseName})
             self.{info.propertyName}{tail}.Add(item);
         return self;
     }}
 
-    public static {info.MainSymbolName} {(string.IsNullOrEmpty(fluentMethodName) ? info.propertyName : fluentMethodName)}(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {(string.IsNullOrEmpty(fluentMethodName) ? info.methodName : fluentMethodName)}(this {info.MainSymbolName} self,
         Func<{elementTypeName}[]> configure)
     {{
         var {info.camelCaseName} = configure();
@@ -99,7 +99,7 @@ void GenerateExtensionMethod_ContentProp_List_Normal(PropInfo info, string eleme
     {
         var tail = info.propertyTypeName.EndsWith("?") ? "?" : "";
         builder.Append($@"
-    public static T {(string.IsNullOrEmpty(fluentMethodName) ? info.propertyName : fluentMethodName)}<T>(this T self,
+    public static T {(string.IsNullOrEmpty(fluentMethodName) ? info.methodName : fluentMethodName)}<T>(this T self,
         IList<{elementTypeName}> {info.camelCaseName})
         where T : {info.MainSymbolName}
     {{
@@ -108,7 +108,7 @@ void GenerateExtensionMethod_ContentProp_List_Normal(PropInfo info, string eleme
         return self;
     }}
 
-    public static T {(string.IsNullOrEmpty(fluentMethodName) ? info.propertyName : fluentMethodName)}<T>(this T self,
+    public static T {(string.IsNullOrEmpty(fluentMethodName) ? info.methodName : fluentMethodName)}<T>(this T self,
         params {elementTypeName}[] {info.camelCaseName})
         where T : {info.MainSymbolName}
     {{
@@ -117,7 +117,7 @@ void GenerateExtensionMethod_ContentProp_List_Normal(PropInfo info, string eleme
         return self;
     }}
 
-    public static T {(string.IsNullOrEmpty(fluentMethodName) ? info.propertyName : fluentMethodName)}<T>(this T self,
+    public static T {(string.IsNullOrEmpty(fluentMethodName) ? info.methodName : fluentMethodName)}<T>(this T self,
         Func<{elementTypeName}[]> configure)
         where T : {info.MainSymbolName}
     {{
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.DataTemplate.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.DataTemplate.cs
@@ -13,7 +13,7 @@ void GenerateExtensionMethod_DataTemplate(PropInfo info)
     void GenerateExtensionMethod_DataTemplate_Sealed(PropInfo info)
     {
         builder.Append($@"
-    public static {info.MainSymbolName} {info.propertyName}<T>(this {info.MainSymbolName} self, System.Func<object> loadTemplate)
+    public static {info.MainSymbolName} {info.methodName}<T>(this {info.MainSymbolName} self, System.Func<object> loadTemplate)
     {{
         {info.dataTemplateAssignmentString}
         return self;
@@ -24,7 +24,7 @@ void GenerateExtensionMethod_DataTemplate_Sealed(PropInfo info)
     void GenerateExtensionMethod_DataTemplate_Normal(PropInfo info)
     {
         builder.Append($@"
-    public static T {info.propertyName}<T>(this T self, System.Func<object> loadTemplate)
+    public static T {info.methodName}<T>(this T self, System.Func<object> loadTemplate)
         where T : {info.MainSymbolName}
     {{
         {info.dataTemplateAssignmentString}
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.GetValue.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.GetValue.cs
@@ -13,7 +13,7 @@ void GenerateExtensionMethod_GetValue(PropInfo info)
     void GenerateExtensionMethod_GetValue_Sealed(PropInfo info)
     {
         builder.Append($@"
-    public static {info.propertyTypeName} Get{info.propertyName}Value<T>(this {info.MainSymbolName} self)
+    public static {info.propertyTypeName} Get{info.methodName}Value<T>(this {info.MainSymbolName} self)
     {{
         return ({info.propertyTypeName})self.GetValue({info.BindablePropertyName});
     }}
@@ -23,7 +23,7 @@ void GenerateExtensionMethod_GetValue_Sealed(PropInfo info)
     void GenerateExtensionMethod_GetValue_Normal(PropInfo info)
     {
         builder.Append($@"
-    public static {info.propertyTypeName} Get{info.propertyName}Value<T>(this T self)
+    public static {info.propertyTypeName} Get{info.methodName}Value<T>(this T self)
         where T : {info.MainSymbolName}
     {{
         return ({info.propertyTypeName})self.GetValue({info.BindablePropertyName});
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Lists.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Lists.cs
@@ -14,15 +14,15 @@ void GenerateExtensionMethod_List_Sealed(PropInfo info, string elementTypeName)
     {
         var tail = info.propertyTypeName.EndsWith("?") ? "?" : "";
         builder.Append($@"
-    public static {info.MainSymbolName} {info.propertyName}(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {info.methodName}(this {info.MainSymbolName} self,
         IList<{elementTypeName}> {info.camelCaseName})
     {{
         foreach (var item in {info.camelCaseName})
             {info.accessedWith}.{info.propertyName}{tail}.Add(item);
         return self;
     }}
 
-    public static {info.MainSymbolName} {info.propertyName}(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {info.methodName}(this {info.MainSymbolName} self,
         params {elementTypeName}[] {info.camelCaseName})
     {{
         foreach (var item in {info.camelCaseName})
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Setters.BindingBuilder.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Setters.BindingBuilder.cs
@@ -13,7 +13,7 @@ void GenerateExtensionMethod_SettersBuilder(PropInfo info)
     void GenerateExtensionMethod_SettersBuilder_Sealed(PropInfo info)
     {
         builder.Append($@"
-    public static SettersContext<{info.MainSymbolName}> {info.propertyName}(this SettersContext<{info.MainSymbolName}> self, Func<PropertySettersContext<{info.propertyTypeName}>, IPropertySettersBuilder<{info.propertyTypeName}>> configure)
+    public static SettersContext<{info.MainSymbolName}> {info.methodName}(this SettersContext<{info.MainSymbolName}> self, Func<PropertySettersContext<{info.propertyTypeName}>, IPropertySettersBuilder<{info.propertyTypeName}>> configure)
     {{
         var context = new PropertySettersContext<{info.propertyTypeName}>(self.XamlSetters, {info.BindablePropertyName});
         configure(context).Build();
@@ -25,7 +25,7 @@ void GenerateExtensionMethod_SettersBuilder_Sealed(PropInfo info)
     void GenerateExtensionMethod_SettersBuilder_Normal(PropInfo info)
     {
         builder.Append($@"
-    public static SettersContext<T> {info.propertyName}<T>(this SettersContext<T> self, Func<PropertySettersContext<{info.propertyTypeName}>, IPropertySettersBuilder<{info.propertyTypeName}>> configure)
+    public static SettersContext<T> {info.methodName}<T>(this SettersContext<T> self, Func<PropertySettersContext<{info.propertyTypeName}>, IPropertySettersBuilder<{info.propertyTypeName}>> configure)
         where T : {info.MainSymbolName}
     {{
         var context = new PropertySettersContext<{info.propertyTypeName}>(self.XamlSetters, {info.BindablePropertyName});
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Setters.Value.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Setters.Value.cs
@@ -13,7 +13,7 @@ void GenerateExtensionMethod_Setters(PropInfo info)
     void GenerateExtensionMethod_Setters_Sealed(PropInfo info)
     {
         builder.Append($@"
-    public static SettersContext<{info.MainSymbolName}> {info.propertyName}(this SettersContext<{info.MainSymbolName}> self,
+    public static SettersContext<{info.MainSymbolName}> {info.methodName}(this SettersContext<{info.MainSymbolName}> self,
         {info.propertyTypeName} {info.camelCaseName})
     {{
         self.XamlSetters.Add(new Setter {{ Property = {info.BindablePropertyName}, Value = {info.camelCaseName} }});
@@ -25,7 +25,7 @@ void GenerateExtensionMethod_Setters_Sealed(PropInfo info)
     void GenerateExtensionMethod_Setters_Normal(PropInfo info)
     {
         builder.Append($@"
-    public static SettersContext<T> {info.propertyName}<T>(this SettersContext<T> self,
+    public static SettersContext<T> {info.methodName}<T>(this SettersContext<T> self,
         {info.propertyTypeName} {info.camelCaseName})
         where T : {info.MainSymbolName}
     {{
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Value.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.Value.cs
@@ -13,14 +13,14 @@ void GenerateExtensionMethod_Value(PropInfo info)
     void GenerateExtensionMethod_Value_Sealed(PropInfo info)
     {
         builder.Append($@"
-    public static {info.MainSymbolName} {info.propertyName}(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {info.methodName}(this {info.MainSymbolName} self,
         {info.propertyTypeName} {info.camelCaseName})
     {{
         {info.valueAssignmentString}
         return self;
     }}
 
-    public static {info.MainSymbolName} {info.propertyName}(this {info.MainSymbolName} self,
+    public static {info.MainSymbolName} {info.methodName}(this {info.MainSymbolName} self,
         Func<{info.propertyTypeName}> configure)
     {{
         var {info.camelCaseName} = configure();
@@ -35,15 +35,15 @@ void GenerateExtensionMethod_Value_Sealed(PropInfo info)
     void GenerateExtensionMethod_Value_Normal(PropInfo info)
     {
         builder.Append($@"
-    public static T {info.propertyName}<T>(this T self,
+    public static T {info.methodName}<T>(this T self,
         {info.propertyTypeName} {info.camelCaseName})
         where T : {info.MainSymbolName}
     {{
         {info.valueAssignmentString}
         return self;
     }}
 
-    public static T {info.propertyName}<T>(this T self,
+    public static T {info.methodName}<T>(this T self,
         Func<{info.propertyTypeName}> configure)
         where T : {info.MainSymbolName}
     {{
diff --git a/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.cs b/src/FmgLib.MauiMarkup.Generator/Extensions/ExtensionGenerator.cs
@@ -18,6 +18,7 @@ public partial class ExtensionGenerator
     readonly AttachedModel attachedModel = null;
     IPropertySymbol childProp;
     List<string> bindablePropertyNames;
+    List<string> redefinedProperties;
 
     StringBuilder builder;
 
@@ -85,7 +86,36 @@ void GenerateClassExtensionBody()
             .Cast<IPropertySymbol>()
             .ToList();
 
-        var fieldesMap = mainSymbol
+        redefinedProperties = mainSymbol
+            .GetMembers()
+            .Where(_ => (_.ContainingType is INamedTypeSymbol namedTypeSymbol) && namedTypeSymbol.GetFullyQualifiedName() == mainSymbol.GetFullyQualifiedName())
+            .Where(_ => _.Kind == SymbolKind.Property &&
+                _.DeclaredAccessibility == Accessibility.Public &&
+                !_.GetAttributes().Any(_ => _.AttributeClass.EnsureNotNull().Name == "ObsoleteAttribute" || _.AttributeClass.EnsureNotNull().Name == "Obsolete"))
+            .OfType<IPropertySymbol>()
+            .Where(property =>
+            {
+                var isDefinedInDerived = property.ContainingType.Equals(mainSymbol, SymbolEqualityComparer.Default);
+
+                var baseType = property.ContainingType.BaseType;
+                while (baseType != null)
+                {
+                    var baseProperty = baseType.GetMembers(property.Name)
+                        .OfType<IPropertySymbol>()
+                        .FirstOrDefault();
+
+                    if (baseProperty != null)
+                        return isDefinedInDerived && !property.IsOverride;
+
+                    baseType = baseType.BaseType;
+                }
+
+                return false;
+            })
+            .Select(e => e.Name)
+            .ToList();
+
+        var fieldsMap = mainSymbol
             .GetMembers()
             .Where(_ => (_.ContainingType is INamedTypeSymbol namedTypeSymbol) && namedTypeSymbol.GetFullyQualifiedName() == mainSymbol.GetFullyQualifiedName())
             .Where(_ => _.Kind == SymbolKind.Field &&
@@ -94,7 +124,7 @@ void GenerateClassExtensionBody()
             .Cast<IFieldSymbol>()
             .ToList();
 
-        bindablePropertyNames = fieldesMap
+        bindablePropertyNames = fieldsMap
             .Where(_ => _.Type.GetFullyQualifiedName().Equals("Microsoft.Maui.Controls.BindableProperty") &&
                 _.IsStatic)
             .Select(_ => _.Name.Replace("PropertyKey", "").Replace("Property", ""))
@@ -201,7 +231,7 @@ void GenerateExtensionMethod(IPropertySymbol propertySymbol, bool isOnlyList = f
             PropertySymbol = propertySymbol,
             IsBindableProperty = bindablePropertyNames.Any(_ => _.Equals(propertySymbol.Name))
         };
-        info.Build();
+        info.Build(redefinedProperties);
 
         if (!Helpers.NotGenerateList.Contains(info.propertyName))
         {
diff --git a/src/FmgLib.MauiMarkup.Generator/Helpers/PropInfo.cs b/src/FmgLib.MauiMarkup.Generator/Helpers/PropInfo.cs
@@ -1,5 +1,6 @@
 ﻿using Microsoft.CodeAnalysis;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace FmgLib.MauiMarkup;
@@ -12,13 +13,14 @@ public class PropInfo
     public string BindablePropertyName { get; set; }
 
     public string propertyName;
+    public string methodName;
     public string propertyTypeName;
     public string accessedWith;
     public string camelCaseName;
     public string valueAssignmentString;
     public string dataTemplateAssignmentString;
 
-    public void Build()
+    public void Build(List<string> redefinedProperties = null)
     {
         propertyName = PropertySymbol.Name.Split(new[] { "." }, StringSplitOptions.None).Last();
         propertyName = propertyName.Equals("class", StringComparison.Ordinal) ? "@class" : propertyName;
@@ -40,5 +42,6 @@ public void Build()
             $@"self.SetValue({BindablePropertyName}, new DataTemplate(loadTemplate));" :
             $@"{accessedWith}.{propertyName} = new DataTemplate(loadTemplate);";
 
+        methodName = redefinedProperties == null || redefinedProperties.Count <= 0 || !redefinedProperties.Any(e => e == propertyName) ? propertyName : propertyName + "New";
     }
 }
diff --git a/src/FmgLib.MauiMarkup/FmgLib.MauiMarkup.csproj b/src/FmgLib.MauiMarkup/FmgLib.MauiMarkup.csproj
@@ -11,7 +11,7 @@
 		<PackageId>FmgLib.MauiMarkup</PackageId>
 		<Summary>FmgLib.MauiMarkup with C# Markup classes and fluent helper methods</Summary>
 		<Title>FmgLib.MauiMarkup</Title>
-		<Version>8.8.7</Version>
+		<Version>8.8.8</Version>
 		<Authors>FmgYazılım</Authors>
 		<Company>Fmg Yazılım</Company>
 		<Copyright>©2024</Copyright>
diff --git a/src/FmgLib.MauiMarkup/README.md b/src/FmgLib.MauiMarkup/README.md
