Improved filenames for generated files

Author: Sergio0694

Microsoft.Toolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs

@@ -15,6 +15,7 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Microsoft.Toolkit.Mvvm.SourceGenerators.Diagnostics;
+using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 using static Microsoft.CodeAnalysis.SymbolDisplayTypeQualificationStyle;
 
@@ -164,7 +165,7 @@ private void OnExecute(
                 .ToFullString();
 
             // Add the partial type
-            context.AddSource($"[{typeof(TAttribute).Name}]_[{classDeclaration.Identifier.Text}].cs", SourceText.From(source, Encoding.UTF8));
+            context.AddSource($"[{typeof(TAttribute).Name}]_[{classDeclarationSymbol.GetFullMetadataNameForFileName()}].cs", SourceText.From(source, Encoding.UTF8));
         }
 
         /// <summary>

Microsoft.Toolkit.Mvvm.SourceGenerators/Extensions/INamedTypeSymbolExtensions.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.Contracts;
+using System.Text;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions
@@ -12,6 +13,42 @@ namespace Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions
     /// </summary>
     internal static class INamedTypeSymbolExtensions
     {
+        /// <summary>
+        /// Gets the full metadata name for a given <see cref="INamedTypeSymbol"/> instance.
+        /// </summary>
+        /// <param name="symbol">The input <see cref="INamedTypeSymbol"/> instance.</param>
+        /// <returns>The full metadata name for <paramref name="symbol"/>.</returns>
+        [Pure]
+        public static string GetFullMetadataName(this INamedTypeSymbol symbol)
+        {
+            static StringBuilder BuildFrom(ISymbol? symbol, StringBuilder builder)
+            {
+                return symbol switch
+                {
+                    INamespaceSymbol ns when ns.IsGlobalNamespace => builder,
+                    INamespaceSymbol ns when ns.ContainingNamespace is { IsGlobalNamespace: false }
+                        => BuildFrom(ns.ContainingNamespace, builder.Insert(0, $".{ns.MetadataName}")),
+                    ITypeSymbol ts when ts.ContainingType is ISymbol pt => BuildFrom(pt, builder.Insert(0, $"+{ts.MetadataName}")),
+                    ITypeSymbol ts when ts.ContainingNamespace is ISymbol pn => BuildFrom(pn, builder.Insert(0, $".{ts.MetadataName}")),
+                    ISymbol => BuildFrom(symbol.ContainingSymbol, builder.Insert(0, symbol.MetadataName)),
+                    _ => builder
+                };
+            }
+
+            return BuildFrom(symbol, new StringBuilder(256)).ToString();
+        }
+
+        /// <summary>
+        /// Gets a valid filename for a given <see cref="INamedTypeSymbol"/> instance.
+        /// </summary>
+        /// <param name="symbol">The input <see cref="INamedTypeSymbol"/> instance.</param>
+        /// <returns>The full metadata name for <paramref name="symbol"/> that is also a valid filename.</returns>
+        [Pure]
+        public static string GetFullMetadataNameForFileName(this INamedTypeSymbol symbol)
+        {
+            return symbol.GetFullMetadataName().Replace('`', '-').Replace('+', '.');
+        }
+
         /// <summary>
         /// Checks whether or not a given <see cref="INamedTypeSymbol"/> inherits from a specified type.
         /// </summary>

Microsoft.Toolkit.Mvvm.SourceGenerators/Messaging/IMessengerRegisterAllGenerator.cs

@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Text;
+using Microsoft.Toolkit.Mvvm.SourceGenerators.Extensions;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace Microsoft.Toolkit.Mvvm.SourceGenerators
@@ -55,9 +56,6 @@ from classDeclaration in syntaxTree.GetRoot().DescendantNodes().OfType<ClassDecl
                         Literal("This type is not intended to be used directly by user code"))))))
             };
 
-            // Local counter to avoid filename conflicts in case of different types with the same name
-            int i = 0;
-
             foreach (INamedTypeSymbol classSymbol in classSymbols)
             {
                 // Create a static method to register all messages for a given recipient type.
@@ -154,7 +152,7 @@ from classDeclaration in syntaxTree.GetRoot().DescendantNodes().OfType<ClassDecl
                 classAttributes = Array.Empty<AttributeListSyntax>();
 
                 // Add the partial type
-                context.AddSource($"[IRecipient{{T}}]_[{classSymbol.Name}]_[{i++}].cs", SourceText.From(source, Encoding.UTF8));
+                context.AddSource($"[IRecipient{{T}}]_[{classSymbol.GetFullMetadataNameForFileName()}].cs", SourceText.From(source, Encoding.UTF8));
             }
         }
 
@@ -176,10 +174,10 @@ private static IEnumerable<StatementSyntax> EnumerateRegistrationStatements(INam
 
                 // This enumerator produces a sequence of statements as follows:
                 //
-                // messenger.Register<<TYPE_0>, TToken>(recipient);
-                // messenger.Register<<TYPE_1>, TToken>(recipient);
+                // messenger.Register<<TYPE_0>>(recipient);
+                // messenger.Register<<TYPE_1>>(recipient);
                 // // ...
-                // messenger.Register<<TYPE_N>, TToken>(recipient);
+                // messenger.Register<<TYPE_N>>(recipient);
                 yield return
                     ExpressionStatement(
                         InvocationExpression(