Update [BindableProperty] Support for Additional Scenarios, Add CommunityToolkit.Maui.SourceGenerators.Internal.UnitTests, Implement [BindableProperty] for Behaviors

src/CommunityToolkit.Maui.Core/Primitives/Defaults/ProgressBarAnimationBehaviorDefaults.cs

@@ -0,0 +1,8 @@
+namespace CommunityToolkit.Maui.Core;
+
+static class ProgressBarAnimationBehaviorDefaults
+{
+	public const double Progress = 0.0;
+	public const uint Length = 500;
+	public static Easing Easing { get; } = Easing.Linear;
+}

src/CommunityToolkit.Maui.Core/Primitives/Defaults/UserStoppedTypingBehaviorDefaults.cs

@@ -0,0 +1,8 @@
+namespace CommunityToolkit.Maui.Core;
+
+static class UserStoppedTypingBehaviorDefaults
+{
+	public const int StoppedTypingTimeThreshold = 1000;
+	public const int MinimumLengthThreshold = 0;
+	public const bool ShouldDismissKeyboardAutomatically = false;
+}

src/CommunityToolkit.Maui.SourceGenerators.Internal/BindablePropertyAttributeSourceGenerator.cs → src/CommunityToolkit.Maui.SourceGenerators.Internal/Generators/BindablePropertyAttributeSourceGenerator.cs

@@ -6,6 +6,7 @@
 using CommunityToolkit.Maui.SourceGenerators.Internal.Helpers;
 using CommunityToolkit.Maui.SourceGenerators.Internal.Models;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
 
@@ -17,47 +18,45 @@ public class BindablePropertyAttributeSourceGenerator : IIncrementalGenerator
 	static readonly SemanticValues emptySemanticValues = new(default, []);
 
 	const string bpFullName = "global::Microsoft.Maui.Controls.BindableProperty";
-	const string bindingModeFullName = "global::Microsoft.Maui.Controls.";
 
 	const string bpAttribute =
 		/* language=C#-test */
 		//lang=csharp
 		$$"""
-		// <auto-generated>
-		// See: CommunityToolkit.Maui.SourceGenerators.Internal.BindablePropertyAttributeSourceGenerator
-		
-		#pragma warning disable
-		#nullable enable
-		namespace CommunityToolkit.Maui;
-
-		[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
-		[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
-		sealed partial class BindablePropertyAttribute : Attribute
-		{
-			public string? PropertyName { get; }
-			public Type? DeclaringType { get; set; }
-			public object? DefaultValue { get; set; }
-			public string DefaultBindingMode { get; set; } = string.Empty;
-			public string ValidateValueMethodName { get; set; } = string.Empty;
-			public string PropertyChangedMethodName { get; set; } = string.Empty;
-			public string PropertyChangingMethodName { get; set; } = string.Empty;
-			public string CoerceValueMethodName { get; set; } = string.Empty;
-			public string DefaultValueCreatorMethodName { get; set; } = string.Empty;
-		
-			public BindablePropertyAttribute(string propertyName)
-			{
-				PropertyName = propertyName;
-			}
-
-			public BindablePropertyAttribute()
-			{
-			}
-		}
-		""";
+		  // <auto-generated>
+		  // See: CommunityToolkit.Maui.SourceGenerators.Internal.BindablePropertyAttributeSourceGenerator
+
+		  #pragma warning disable
+		  #nullable enable
+		  namespace CommunityToolkit.Maui;
+
+		  [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+		  [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = false)]
+		  sealed partial class BindablePropertyAttribute : Attribute
+		  {
+		  	public string? PropertyName { get; }
+		  	public Type? DeclaringType { get; set; }
+		  	public object? DefaultValue { get; set; }
+		  	public BindingMode DefaultBindingMode { get; set; }
+		  	public string ValidateValueMethodName { get; set; } = string.Empty;
+		  	public string PropertyChangedMethodName { get; set; } = string.Empty;
+		  	public string PropertyChangingMethodName { get; set; } = string.Empty;
+		  	public string CoerceValueMethodName { get; set; } = string.Empty;
+		  	public string DefaultValueCreatorMethodName { get; set; } = string.Empty;
+
+		  	public BindablePropertyAttribute(string propertyName)
+		  	{
+		  		PropertyName = propertyName;
+		  	}
+
+		  	public BindablePropertyAttribute()
+		  	{
+		  	}
+		  }
+		  """;
 
 	public void Initialize(IncrementalGeneratorInitializationContext context)
 	{
-
 #if DEBUG
 
 		if (!Debugger.IsAttached)
@@ -82,8 +81,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 	static void ExecuteAllValues(SourceProductionContext context, ImmutableArray<SemanticValues> semanticValues)
 	{
 		var groupedValues = semanticValues
-		.GroupBy(static sv => (sv.ClassInformation.ClassName, sv.ClassInformation.ContainingNamespace))
-		.ToDictionary(static d => d.Key, static d => d.ToArray());
+			.GroupBy(static sv => (sv.ClassInformation.ClassName, sv.ClassInformation.ContainingNamespace))
+			.ToDictionary(static d => d.Key, static d => d.ToArray());
 
 		foreach (var keyValuePair in groupedValues)
 		{
@@ -117,6 +116,10 @@ static string GenerateSource(SemanticValues value)
 			$$"""
 
 			  // <auto-generated>
+			  // See: CommunityToolkit.Maui.SourceGenerators.Internal.BindablePropertyAttributeSourceGenerator
+
+			  #pragma warning disable
+			  #nullable enable
 			  // Test2 : {{DateTime.Now}}
 
 			  namespace {{value.ClassInformation.ContainingNamespace}};
@@ -137,6 +140,9 @@ namespace {{value.ClassInformation.ContainingNamespace}};
 
 		static void GenerateBindableProperty(StringBuilder sb, BindablePropertyModel info)
 		{
+			// Sanitize the Return Type and Declaring Type because Nullable Reference Types cannot be used in the `typeof()` operator
+			var sanitizedReturnType = GetNonNullableType(info.ReturnType);
+
 			/*
 			/// <summary>
 			/// Backing BindableProperty for the <see cref="PropertyName"/> property.
@@ -150,10 +156,10 @@ static void GenerateBindableProperty(StringBuilder sb, BindablePropertyModel inf
 			sb.AppendLine($"public static readonly {bpFullName} {info.PropertyName}Property = ")
 				.Append($"{bpFullName}.Create(")
 				.Append($"\"{info.PropertyName}\", ")
-				.Append($"typeof({info.ReturnType}), ")
+				.Append($"typeof({sanitizedReturnType}), ")
 				.Append($"typeof({info.DeclaringType}), ")
 				.Append($"{info.DefaultValue}, ")
-				.Append($"{bindingModeFullName}{info.DefaultBindingMode}, ")
+				.Append($"{info.DefaultBindingMode}, ")
 				.Append($"{info.ValidateValueMethodName}, ")
 				.Append($"{info.PropertyChangedMethodName}, ")
 				.Append($"{info.PropertyChangingMethodName}, ")
@@ -174,8 +180,7 @@ static void GenerateProperty(StringBuilder sb, BindablePropertyModel info)
 			//		set => SetValue(TextProperty, value);
 			//	}
 			//
-
-			sb.AppendLine($"public partial {info.ReturnType} {info.PropertyName}")
+			sb.AppendLine($"public {info.NewKeywordText}partial {info.ReturnType} {info.PropertyName}")
 				.AppendLine("{")
 				.Append("get => (")
 				.Append(info.ReturnType)
@@ -191,7 +196,7 @@ static SemanticValues SemanticTransform(GeneratorAttributeSyntaxContext context,
 	{
 		var propertyDeclarationSyntax = Unsafe.As<PropertyDeclarationSyntax>(context.TargetNode);
 		var semanticModel = context.SemanticModel;
-		var propertySymbol = (IPropertySymbol?)semanticModel.GetDeclaredSymbol(propertyDeclarationSyntax, cancellationToken);
+		var propertySymbol = (IPropertySymbol?)ModelExtensions.GetDeclaredSymbol(semanticModel, propertyDeclarationSyntax, cancellationToken);
 
 		if (propertySymbol is null)
 		{
@@ -207,13 +212,15 @@ static SemanticValues SemanticTransform(GeneratorAttributeSyntaxContext context,
 
 		var bindablePropertyModels = new List<BindablePropertyModel>(context.Attributes.Length);
 
+		var doesContainNewKeyword = propertyDeclarationSyntax.Modifiers.Any(static x => x.IsKind(SyntaxKind.NewKeyword));
+
 		var attributeData = context.Attributes[0];
-		bindablePropertyModels.Add(CreateBindablePropertyModel(attributeData, propertySymbol.Type.ToDisplayString(), propertySymbol.Name, returnType));
+		bindablePropertyModels.Add(CreateBindablePropertyModel(attributeData, propertySymbol.ContainingType, propertySymbol.Name, returnType, doesContainNewKeyword));
 
 		return new(propertyInfo, bindablePropertyModels.ToImmutableArray());
 	}
 
-	static BindablePropertyModel CreateBindablePropertyModel(in AttributeData attributeData, in string declaringTypeString, in string defaultName, in ITypeSymbol returnType)
+	static BindablePropertyModel CreateBindablePropertyModel(in AttributeData attributeData, in INamedTypeSymbol declaringType, in string defaultName, in ITypeSymbol returnType, in bool doesContainNewKeyword)
 	{
 		if (attributeData.AttributeClass is null)
 		{
@@ -222,27 +229,34 @@ static BindablePropertyModel CreateBindablePropertyModel(in AttributeData attrib
 
 		var defaultValue = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.DefaultValue));
 		var coerceValueMethodName = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.CoerceValueMethodName));
-		var defaultBindingMode = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.DefaultBindingMode), "BindingMode.OneWay");
+		var defaultBindingMode = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.DefaultBindingMode), "Microsoft.Maui.Controls.BindingMode.OneWay");
 		var defaultValueCreatorMethodName = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.DefaultValueCreatorMethodName));
-		var declaringType = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.DeclaringType), declaringTypeString);
 		var propertyChangedMethodName = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.PropertyChangedMethodName));
 		var propertyChangingMethodName = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.PropertyChangingMethodName));
 		var propertyName = attributeData.GetConstructorArgumentsAttributeValueByNameAsString(defaultName);
 		var validateValueMethodName = attributeData.GetNamedArgumentsAttributeValueByNameAsString(nameof(BindablePropertyModel.ValidateValueMethodName));
+		var newKeywordText = doesContainNewKeyword ? "new " : string.Empty;
+
+		return new BindablePropertyModel(propertyName, returnType, declaringType, defaultValue, defaultBindingMode, validateValueMethodName, propertyChangedMethodName, propertyChangingMethodName, coerceValueMethodName, defaultValueCreatorMethodName, newKeywordText);
+	}
+
+	static ITypeSymbol GetNonNullableType(ITypeSymbol typeSymbol)
+	{
+		// Check for Nullable<T>
+		if (typeSymbol is INamedTypeSymbol namedTypeSymbol && namedTypeSymbol.IsGenericType && namedTypeSymbol.ConstructedFrom.SpecialType is SpecialType.System_Nullable_T)
+		{
+			return typeSymbol;
+		}
 
-		return new BindablePropertyModel
+		// Check for Nullable Reference Type
+		if (typeSymbol.NullableAnnotation == NullableAnnotation.Annotated)
 		{
-			CoerceValueMethodName = coerceValueMethodName,
-			DefaultBindingMode = defaultBindingMode,
-			DefaultValue = defaultValue,
-			DefaultValueCreatorMethodName = defaultValueCreatorMethodName,
-			DeclaringType = declaringType,
-			PropertyChangedMethodName = propertyChangedMethodName,
-			PropertyChangingMethodName = propertyChangingMethodName,
-			PropertyName = propertyName,
-			ReturnType = returnType,
-			ValidateValueMethodName = validateValueMethodName
-		};
+			// For reference types, NullableAnnotation.None indicates non-nullable.
+			return typeSymbol.WithNullableAnnotation(NullableAnnotation.None);
+		}
+
+		// Handle other cases if necessary (e.g., NotAnnotated, which might depend on context)
+		return typeSymbol;
 	}
 
 	static bool SyntaxPredicate(SyntaxNode node, CancellationToken cancellationToken) =>

src/CommunityToolkit.Maui.SourceGenerators.Internal/Helpers/AttributeExtensions.cs

@@ -14,6 +14,19 @@ public static string GetNamedArgumentsAttributeValueByNameAsString(this Attribut
 	{
 		var data = attribute.NamedArguments.SingleOrDefault(kvp => kvp.Key == name).Value;
 
+		// true.ToString() => "True" and false.ToString() => "False", but we want "true" and "false"
+		if (data.Kind is TypedConstantKind.Primitive && data.Type?.SpecialType is SpecialType.System_Boolean)
+		{
+			return data.Value is null ? placeholder : data.Value.ToString().ToLowerInvariant();
+		}
+
+		if (data.Kind is TypedConstantKind.Enum && data.Type is not null && data.Value is not null)
+		{
+			var members = data.Type.GetMembers();
+
+			return members[(int)data.Value].ToString();
+		}
+
 		return data.Value is null ? placeholder : data.Value.ToString();
 	}
 
@@ -26,6 +39,12 @@ public static string GetConstructorArgumentsAttributeValueByNameAsString(this At
 
 		var data = attribute.ConstructorArguments[0];
 
+		// true.ToString() => "True" and false.ToString() => "False", but we want "true" and "false"
+		if (data.Kind is TypedConstantKind.Primitive && data.Type?.SpecialType is SpecialType.System_Boolean)
+		{
+			return data.Value is null ? placeholder : data.Value.ToString().ToLowerInvariant();
+		}
+
 		return data.Value is null ? placeholder : data.Value.ToString();
 	}
 

src/CommunityToolkit.Maui.SourceGenerators.Internal/Models/Records.cs

@@ -3,19 +3,7 @@
 
 namespace CommunityToolkit.Maui.SourceGenerators.Internal.Models;
 
-record BindablePropertyModel
-{
-	public string PropertyName { get; set; } = string.Empty;
-	public ITypeSymbol? ReturnType { get; set; }
-	public string DeclaringType { get; set; } = string.Empty;
-	public string DefaultValue { get; set; } = string.Empty;
-	public string DefaultBindingMode { get; set; } = string.Empty;
-	public string ValidateValueMethodName { get; set; } = string.Empty;
-	public string PropertyChangedMethodName { get; set; } = string.Empty;
-	public string PropertyChangingMethodName { get; set; } = string.Empty;
-	public string CoerceValueMethodName { get; set; } = string.Empty;
-	public string DefaultValueCreatorMethodName { get; set; } = string.Empty;
-}
+record BindablePropertyModel(string PropertyName, ITypeSymbol ReturnType, ITypeSymbol DeclaringType, string DefaultValue, string DefaultBindingMode, string ValidateValueMethodName, string PropertyChangedMethodName, string PropertyChangingMethodName, string CoerceValueMethodName, string DefaultValueCreatorMethodName, string NewKeywordText);
 
 record SemanticValues(ClassInformation ClassInformation, EquatableArray<BindablePropertyModel> BindableProperties);
 

src/CommunityToolkit.Maui.SourceGenerators.Internal/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Profile 1": {
+      "commandName": "DebugRoslynComponent",
+      "targetProject": "..\\CommunityToolkit.Maui\\CommunityToolkit.Maui.csproj"
+    }
+  }
+}