More renames

Author: andrewlock

src/StronglyTypedIds/SourceGenerationHelper.cs

@@ -6,20 +6,21 @@ namespace StronglyTypedIds
     internal static class SourceGenerationHelper
     {
         public static string CreateId(
-            string idNamespace,
+            string targetNamespace,
+            string targetName,
             string idName,
             ParentClass? parentClass,
             string template,
             bool addDefaultAttributes,
             bool addGeneratedCodeAttribute,
             StringBuilder? sb)
         {
-            if (string.IsNullOrEmpty(idName))
+            if (string.IsNullOrEmpty(targetName))
             {
-                throw new ArgumentException("Value cannot be null or empty.", nameof(idName));
+                throw new ArgumentException("Value cannot be null or empty.", nameof(targetName));
             }
 
-            var hasNamespace = !string.IsNullOrEmpty(idNamespace);
+            var hasNamespace = !string.IsNullOrEmpty(targetNamespace);
 
             var parentsCount = 0;
 
@@ -38,7 +39,7 @@ public static string CreateId(
             {
                 sb
                     .Append("namespace ")
-                    .Append(idNamespace)
+                    .Append(targetNamespace)
                     .AppendLine(@"
 {");
             }
@@ -85,6 +86,7 @@ public static string CreateId(
 
             sb.AppendLine(template);
 
+            sb.Replace("TARGETTYPE", targetName);
             sb.Replace("PLACEHOLDERID", idName);
 
             for (int i = 0; i < parentsCount; i++)

src/StronglyTypedIds/StronglyTypedIdGenerator.cs

@@ -85,9 +85,10 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
             // Output
             context.RegisterSourceOutput(idsWithDefaultsAndTemplates,
-                static (spc, source) => Execute(source.Left.Left, source.Left.Right, source.Right, spc));
+                static (spc, source) => GenerateIds(source.Left.Left, source.Left.Right, source.Right, spc));
         }
-        private static void Execute(
+
+        private static void GenerateIds(
             StructToGenerate idToGenerate,
             ImmutableArray<(string Path, string Name, string? Content)> templates,
             (EquatableArray<(string Name, string Content)>, bool IsValid, DiagnosticInfo? Diagnostic) defaults, 
@@ -99,7 +100,7 @@ private static void Execute(
                 context.ReportDiagnostic(diagnostic);
             }
 
-            if (!TryGetTemplateContent(idToGenerate, templates, defaults, in context, out var templateContents))
+            if (!TryGetTemplateContent(idToGenerate.Template, idToGenerate.TemplateNames, idToGenerate.TemplateLocation, templates, defaults, in context, out var templateContents))
             {
                 return;
             }
@@ -111,6 +112,7 @@ private static void Execute(
                 var result = SourceGenerationHelper.CreateId(
                     idToGenerate.NameSpace,
                     idToGenerate.Name,
+                    idToGenerate.Name, // same type
                     idToGenerate.Parent,
                     content,
                     addDefaultAttributes: string.IsNullOrEmpty(name),
@@ -190,26 +192,28 @@ private static (EquatableArray<(string Name, string Content)>, bool, DiagnosticI
         }
 
         private static bool TryGetTemplateContent(
-            in StructToGenerate idToGenerate,
+            Template? selectedTemplate,
+            EquatableArray<string> selectedTemplateNames,
+            LocationInfo? attributeLocation,
             in ImmutableArray<(string Path, string Name, string? Content)> templates,
             (EquatableArray<(string Name, string Content)> Contents, bool IsValid, DiagnosticInfo? Diagnostics) defaults,
             in SourceProductionContext context,
             [NotNullWhen(true)] out (string Name, string Content)[]? templateContents)
         {
             (string, string)? builtIn = null;
-            if (idToGenerate.Template is { } templateId)
+            if (selectedTemplate is { } templateId)
             {
                 // built-in template specified
                 var content = EmbeddedSources.GetTemplate(templateId);
                 builtIn = (string.Empty, content);
             }
 
-            if (idToGenerate.TemplateNames.GetArray() is {Length: > 0} templateNames)
+            if (selectedTemplateNames.GetArray() is {Length: > 0} templateNames)
             {
                 // custom template specified
                 if (GetContent(
                         templateNames,
-                        idToGenerate.TemplateLocation,
+                        attributeLocation,
                         builtIn.HasValue,
                         in templates,
                         out templateContents,