Move location of attribute in nested types (#122)

andrewlock · Dec 4, 2023 · a274ba0 · a274ba0
1 parent abc8c7b
commit a274ba0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/src/StronglyTypedIds/SourceGenerationHelper.cs b/src/StronglyTypedIds/SourceGenerationHelper.cs
@@ -44,11 +44,6 @@ internal static class SourceGenerationHelper
             }
 
             var hasGenericParent = false;
-            if (addGeneratedCodeAttribute && parentClass is not null)
-            {
-                addGeneratedCodeAttribute = false;
-                AddGeneratedCodeAttribute(sb);
-            }
 
             while (parentClass is { } parent)
             {
@@ -85,7 +80,7 @@ internal static class SourceGenerationHelper
 
             if (addGeneratedCodeAttribute)
             {
-                AddGeneratedCodeAttribute(sb);
+                sb.AppendLine($"""    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "{Constants.StronglyTypedIdsVersion}")]""");
             }
 
             sb.AppendLine(template);
@@ -103,11 +98,6 @@ internal static class SourceGenerationHelper
             }
 
             return sb.ToString();
-
-            static void AddGeneratedCodeAttribute(StringBuilder sb)
-            {
-                sb.AppendLine($"""    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "{Constants.StronglyTypedIdsVersion}")]""");
-            }
         }
 
         internal static string CreateSourceName(StringBuilder sb, string nameSpace, ParentClass? parent, string name, string template)

diff --git a/...nglyTypedIdGeneratorTests.CanGenerateGenericVeryNestedIdInFileScopeNamespace.verified.txt b/...nglyTypedIdGeneratorTests.CanGenerateGenericVeryNestedIdInFileScopeNamespace.verified.txt
@@ -12,13 +12,13 @@
 #nullable enable
 namespace SomeNamespace
 {
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "1.0.0-beta6")]
     public partial class ParentClass<T> where T: new()
     {
     internal partial record InnerClass<TKey, TValue> 
     {
     public partial struct InnerStruct 
     {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "1.0.0-beta6")]
     partial struct MyId :
 #if NET6_0_OR_GREATER
         global::System.ISpanFormattable,

diff --git a/...pshots/StronglyTypedIdGeneratorTests.CanGenerateNestedIdInFileScopeNamespace.verified.txt b/...pshots/StronglyTypedIdGeneratorTests.CanGenerateNestedIdInFileScopeNamespace.verified.txt
@@ -12,11 +12,11 @@
 #nullable enable
 namespace SomeNamespace
 {
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "1.0.0-beta6")]
     public partial class ParentClass 
     {
     [global::System.ComponentModel.TypeConverter(typeof(MyIdTypeConverter))]
     [global::System.Text.Json.Serialization.JsonConverter(typeof(MyIdSystemTextJsonConverter))]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "1.0.0-beta6")]
     partial struct MyId :
 #if NET6_0_OR_GREATER
         global::System.ISpanFormattable,

diff --git a/...ts/StronglyTypedIdGeneratorTests.CanGenerateVeryNestedIdInFileScopeNamespace.verified.txt b/...ts/StronglyTypedIdGeneratorTests.CanGenerateVeryNestedIdInFileScopeNamespace.verified.txt
@@ -12,7 +12,6 @@
 #nullable enable
 namespace SomeNamespace
 {
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "1.0.0-beta6")]
     public partial class ParentClass 
     {
     internal partial record InnerClass 
@@ -21,6 +20,7 @@ namespace SomeNamespace
     {
     [global::System.ComponentModel.TypeConverter(typeof(MyIdTypeConverter))]
     [global::System.Text.Json.Serialization.JsonConverter(typeof(MyIdSystemTextJsonConverter))]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("StronglyTypedId", "1.0.0-beta6")]
     partial struct MyId :
 #if NET6_0_OR_GREATER
         global::System.ISpanFormattable,