Fixes to accomodate generated ToolkitSampleButtonAction

Author: Arlodotexe

CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleGeneratedPaneTests.cs

@@ -208,7 +208,6 @@ public class UserControl {{ }}
         result.AssertDiagnosticsAre(DiagnosticDescriptors.SamplePaneOptionWithBadName, DiagnosticDescriptors.SampleNotReferencedInMarkdown);
     }
 
-
     [TestMethod]
     public void PaneOptionWithConflictingPropertyName()
     {
@@ -432,7 +431,7 @@ public static class ToolkitSampleRegistry
         {
             public static System.Collections.Generic.Dictionary<string, CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata> Listing
             { get; } = new() {
-                ["Sample"] = new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata("Sample", "Test Sample", "", typeof(MyApp.Sample), () => new MyApp.Sample(), null, null, new CommunityToolkit.Tooling.SampleGen.Metadata.IGeneratedToolkitSampleOptionViewModel[] { new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleNumericOptionMetadataViewModel(name: "TextSize", initial: 12, min: 8, max: 48, step: 2, showAsNumberBox: false, title: "FontSize") })
+                ["Sample"] = new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata("Sample", "Test Sample", "", typeof(MyApp.Sample), () => new MyApp.Sample(), null, null, new CommunityToolkit.Tooling.SampleGen.Metadata.IGeneratedToolkitSampleOptionViewModel[] { new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleButtonActionMetadataViewModel(name: "RaiseNotification", label: "Raise notification", title: "") })
             };
         }
         """, "Unexpected code generated");

CommunityToolkit.Tooling.SampleGen/GeneratorExtensions.cs

@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 
 namespace CommunityToolkit.Tooling.SampleGen;
 
@@ -14,15 +16,29 @@ public static class GeneratorExtensions
     /// <returns>A flattened enumerable of <see cref="INamedTypeSymbol"/>s.</returns>
     public static IEnumerable<ISymbol> CrawlForAllSymbols(this INamespaceSymbol namespaceSymbol)
     {
-        foreach (var member in namespaceSymbol.GetMembers())
+        foreach (var member in namespaceSymbol.GetNamespaceMembers())
         {
             if (member is INamespaceSymbol nestedNamespace)
             {
                 foreach (var item in CrawlForAllSymbols(nestedNamespace))
+                {
                     yield return item;
+                }
             }
+        }
+
+        // Get all classes and methods
+        foreach (var item in namespaceSymbol.GetTypeMembers())
+        {
+            yield return item;
 
-            yield return member;
+            foreach (var itemMember in item.GetMembers())
+            {
+                if (itemMember.Kind == SymbolKind.Method)
+                {
+                    yield return itemMember;
+                }
+            }
         }
     }
 

CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Sample.cs

@@ -29,8 +29,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             .Select(static (x, _) => x!);
 
         var symbolsInReferencedAssemblies = context.CompilationProvider
-                              .SelectMany((x, _) => x.SourceModule.ReferencedAssemblySymbols)
-                              .SelectMany((asm, _) => asm.GlobalNamespace.CrawlForAllSymbols().Where(x => x.Kind is SymbolKind.NamedType or SymbolKind.Method));
+            .SelectMany((x, _) => x.SourceModule.ReferencedAssemblySymbols)
+            .SelectMany((asm, _) => asm.GlobalNamespace.CrawlForAllSymbols());
 
         var markdownFiles = context.AdditionalTextsProvider
             .Where(static file => file.Path.EndsWith(".md"))
@@ -80,7 +80,7 @@ void Execute(IncrementalValuesProvider<ISymbol> types, bool skipDiagnostics = fa
                         // Auto-assign the attached method name as the generated property name.
                         buttonActionAttribute.Name = x.Item1.Name;
 
-                        item = (x.Item1, buttonActionAttribute);
+                        item = (x.Item1.ContainingSymbol, buttonActionAttribute);
                     }
 
                     // Add extra property data, like Title, back to Attribute
@@ -138,7 +138,7 @@ void Execute(IncrementalValuesProvider<ISymbol> types, bool skipDiagnostics = fa
                                 sample.Attribute.Description,
                                 sample.AttachedQualifiedTypeName,
                                 optionsPaneAttribute.FirstOrDefault(x => x.Item1?.SampleId == sample.Attribute.Id).Item2?.ToString(),
-                                generatedOptionPropertyData.Where(x => ReferenceEquals(x.Item1, sample.Symbol)).Select(x => x.Item2)
+                                generatedOptionPropertyData.Where(x => Equals(x.Symbol, sample.Symbol)).Select(x => x.Item2)
                             )
                     );
 
@@ -256,7 +256,9 @@ private static void ReportDiagnosticsGeneratedOptionsPane(SourceProductionContex
             ctx.ReportDiagnostic(Diagnostic.Create(DiagnosticDescriptors.SamplePaneOptionWithDuplicateName, item.SelectMany(x => x.Item1.Locations).FirstOrDefault(), item.Key));
 
         // Check for generated options that conflict with an existing property name
-        var generatedOptionsWithConflictingPropertyNames = generatedOptionPropertyData.Where(x => x.Item1 is INamedTypeSymbol sym && GetAllMembers(sym).Any(y => x.Item2.Name == y.Name));
+        var generatedOptionsWithConflictingPropertyNames = generatedOptionPropertyData
+            .Where(x => x.Item2 is not ToolkitSampleButtonActionAttribute)
+            .Where(x => x.Item1 is INamedTypeSymbol sym && GetAllMembers(sym).Any(y => x.Item2.Name == y.Name));
 
         foreach (var item in generatedOptionsWithConflictingPropertyNames)
             ctx.ReportDiagnostic(Diagnostic.Create(DiagnosticDescriptors.SamplePaneOptionWithConflictingName, item.Item1.Locations.FirstOrDefault(), item.Item2.Name));