Fix issue with extra Title property on Attribute not being setup properly from construction of attribute in source generator

Author: michael-hawker

common/CommunityToolkit.Labs.Core.SourceGenerators/GeneratorExtensions.cs

@@ -141,4 +141,30 @@ public static bool HasFullyQualifiedName(this ISymbol symbol, string name)
 
         return parameterTypedConstant.Value;
     }
+
+    //// From: https://github.com/CommunityToolkit/dotnet/blob/e6e09406745e2262f7946bcf8089a8f0ec4e074a/src/CommunityToolkit.Mvvm.SourceGenerators/Extensions/AttributeDataExtensions.cs#L67
+    /// <summary>
+    /// Tries to get a given named argument value from an <see cref="AttributeData"/> instance, if present.
+    /// </summary>
+    /// <typeparam name="T">The type of argument to check.</typeparam>
+    /// <param name="attributeData">The target <see cref="AttributeData"/> instance to check.</param>
+    /// <param name="name">The name of the argument to check.</param>
+    /// <param name="value">The resulting argument value, if present.</param>
+    /// <returns>Whether or not <paramref name="attributeData"/> contains an argument named <paramref name="name"/> with a valid value.</returns>
+    public static bool TryGetNamedArgument<T>(this AttributeData attributeData, string name, out T? value)
+    {
+        foreach (KeyValuePair<string, TypedConstant> properties in attributeData.NamedArguments)
+        {
+            if (properties.Key == name)
+            {
+                value = (T?)properties.Value.Value;
+
+                return true;
+            }
+        }
+
+        value = default;
+
+        return false;
+    }
 }

common/CommunityToolkit.Labs.Core.SourceGenerators/ToolkitSampleMetadataGenerator.Sample.cs

@@ -58,19 +58,33 @@ void Execute(IncrementalValuesProvider<ISymbol> types, bool skipDiagnostics = fa
             var generatedPaneOptions = allAttributeData
                 .Select(static (x, _) =>
                 {
-                    if (x.Item2.TryReconstructAs<ToolkitSampleBoolOptionAttribute>() is ToolkitSampleBoolOptionAttribute boolOptionAttribute)
-                        return (x.Item1, (ToolkitSampleOptionBaseAttribute)boolOptionAttribute);
-
-                    if (x.Item2.TryReconstructAs<ToolkitSampleMultiChoiceOptionAttribute>() is ToolkitSampleMultiChoiceOptionAttribute multiChoiceOptionAttribute)
-                        return (x.Item1, (ToolkitSampleOptionBaseAttribute)multiChoiceOptionAttribute);
-
-                    if (x.Item2.TryReconstructAs<ToolkitSampleNumericOptionAttribute>() is ToolkitSampleNumericOptionAttribute numericOptionAttribute)
-                        return (x.Item1, (ToolkitSampleOptionBaseAttribute)numericOptionAttribute);
+                    (ISymbol Symbol, ToolkitSampleOptionBaseAttribute Attribute) item = default;
 
-                    if (x.Item2.TryReconstructAs<ToolkitSampleTextOptionAttribute>() is ToolkitSampleTextOptionAttribute textOptionAttribute)
-                        return (x.Item1, (ToolkitSampleOptionBaseAttribute)textOptionAttribute);
-
-                    return default;
+                    // Try and get base attribute of whatever sample attribute types we support.
+                    if (x.Item2.TryReconstructAs<ToolkitSampleBoolOptionAttribute>() is ToolkitSampleBoolOptionAttribute boolOptionAttribute)
+                    {
+                        item = (x.Item1, boolOptionAttribute);
+                    }
+                    else if (x.Item2.TryReconstructAs<ToolkitSampleMultiChoiceOptionAttribute>() is ToolkitSampleMultiChoiceOptionAttribute multiChoiceOptionAttribute)
+                    {
+                        item = (x.Item1, multiChoiceOptionAttribute);
+                    }
+                    else if (x.Item2.TryReconstructAs<ToolkitSampleNumericOptionAttribute>() is ToolkitSampleNumericOptionAttribute numericOptionAttribute)
+                    {
+                        item = (x.Item1, numericOptionAttribute);
+                    }
+                    else if (x.Item2.TryReconstructAs<ToolkitSampleTextOptionAttribute>() is ToolkitSampleTextOptionAttribute textOptionAttribute)
+                    {
+                        item = (x.Item1, textOptionAttribute);
+                    }
+
+                    // Add extra property data, like Title back to Attribute
+                    if (item.Attribute != null && x.Item2.TryGetNamedArgument(nameof(ToolkitSampleOptionBaseAttribute.Title), out string? title) && !string.IsNullOrWhiteSpace(title))
+                    {
+                        item.Attribute.Title = title;
+                    }
+
+                    return item;
                 })
                 .Where(static x => x != default)
                 .Collect();