Fixes

OctopBP · Mar 18, 2024 · a3fcef2 · a3fcef2
1 parent 8151e78
commit a3fcef2
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 35 deletions.
diff --git a/UnityAttributes/GenConstructor/GenConstructorGenerator.Attribute.cs b/UnityAttributes/GenConstructor/GenConstructorGenerator.Attribute.cs
@@ -1,16 +1,20 @@
-using UnityAttributes.Common;
-
 namespace UnityAttributes.GenConstructor;
 
-public partial class GenConstructorGenerator {
-  public const string AttributeName = "GenConstructorAttribute";
-  readonly string attributeText = @$"{Const.AUTO_GENERATED_TEXT}
+public partial class GenConstructorGenerator
+{
+  public const string ATTRIBUTE_NAME = "GenConstructorAttribute";
+  public const string ATTRIBUTE_TEXT =
+      $$"""
+        /// <auto-generated />
+
+        namespace UnityAttributes
+        {
+            [global::System.AttributeUsage(global::System.AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+            internal sealed class {{ATTRIBUTE_NAME}} : global::System.Attribute
+            {
+                public {{ATTRIBUTE_NAME}}() { }
+            }
+        }
 
-{generatedCodeAttribute}
-[global::System.AttributeUsage(global::System.AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
-internal sealed class {AttributeName} : global::System.Attribute
-{{
-  public {AttributeName}() {{ }}
-}}
-";
+        """;
 }
diff --git a/UnityAttributes/GenConstructor/GenConstructorGenerator.cs b/UnityAttributes/GenConstructor/GenConstructorGenerator.cs
@@ -18,7 +18,7 @@ public partial class GenConstructorGenerator : ISourceGenerator
     public void Initialize(GeneratorInitializationContext context)
     {
         context.RegisterForPostInitialization(i => { 
-            i.AddSource($"{AttributeName}.g.cs", attributeText);
+            i.AddSource($"{ATTRIBUTE_NAME}.g.cs", ATTRIBUTE_TEXT);
             i.AddSource($"{IgnoreAttributeName}.g.cs", ignoreAttributeText);
         });
         context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
@@ -116,7 +116,7 @@ public void OnVisitSyntaxNode(GeneratorSyntaxContext context)
 
         var haveAttribute =
             classSymbol?.GetAttributes().Any(ad =>
-                ad.AttributeClass?.ToDisplayString() == GenConstructorGenerator.AttributeName
+                ad.AttributeClass?.ToDisplayString() == GenConstructorGenerator.ATTRIBUTE_NAME
             ) ?? false;
 
         if (!haveAttribute) return;

diff --git a/UnityAttributes/MonoReadonly/MonoReadonlyGenerator.Attribute.cs b/UnityAttributes/MonoReadonly/MonoReadonlyGenerator.Attribute.cs
@@ -8,12 +8,14 @@ public partial class MonoReadonlyGenerator
 	static readonly string generatedCodeAttribute = typeof(MonoReadonlyGenerator).GeneratedCodeAttribute();
 
 	readonly string attributeText = @$"{Const.AUTO_GENERATED_TEXT}
-
-{generatedCodeAttribute}
-[global::System.AttributeUsage(global::System.AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
-internal class {AttributeName} : global::System.Attribute
+namespace UnityAttributes
 {{
-  public {AttributeName}() {{ }}
+    {generatedCodeAttribute}
+    [global::System.AttributeUsage(global::System.AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+    internal class {AttributeName} : global::System.Attribute
+    {{
+        public {AttributeName}() {{ }}
+    }}
 }}
 ";
 }
diff --git a/UnityAttributes/PublicAccessor/PublicAccessorAttribute.cs b/UnityAttributes/PublicAccessor/PublicAccessorAttribute.cs
@@ -8,11 +8,14 @@ public static class PublicAccessorAttribute
     public const string ATTRIBUTE_TEXT = 
         $$"""
           /// <auto-generated />
-
-          [global::System.AttributeUsage(global::System.AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
-          internal sealed class {{ATTRIBUTE_FULL_NAME}} : global::System.Attribute
+          
+          namespace UnityAttributes
           {
-              public {{ATTRIBUTE_FULL_NAME}}() { }
+              [global::System.AttributeUsage(global::System.AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+              internal sealed class {{ATTRIBUTE_FULL_NAME}} : global::System.Attribute
+              {
+                  public {{ATTRIBUTE_FULL_NAME}}() { }
+              }
           }
           """;
 }
diff --git a/UnityAttributes/PublicAccessor/PublicAccessorGenerator.cs b/UnityAttributes/PublicAccessor/PublicAccessorGenerator.cs
@@ -32,7 +32,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
     private static bool IsSyntaxTargetForGeneration(SyntaxNode node)
     {
-        return node is not ClassDeclarationSyntax;
+        return node is ClassDeclarationSyntax;
     }
 
     private static ClassToProcess? GetSemanticTargetForGeneration(GeneratorSyntaxContext ctx, CancellationToken token)
@@ -65,6 +65,11 @@ private static bool IsSyntaxTargetForGeneration(SyntaxNode node)
                 }
             }
         }
+
+        if (fieldToProcess.Count == 0)
+        {
+            return null;
+        }
 
         return new ClassToProcess(classTypeSymbol, fieldToProcess, classDeclarationSymbol.GetNamespace());
     }
@@ -90,7 +95,7 @@ private static string GenerateCode(ClassToProcess classToProcess)
             builder.OpenBrackets();
         }
 
-        builder.AppendIdent().Append(methodVisibility).Append(" partial class ").Append(classToProcess.FieldSymbol.Name);
+        builder.AppendIdent().Append(methodVisibility).Append(" partial class ").AppendLine(classToProcess.FieldSymbol.Name);
         builder.OpenBrackets();
 
         foreach (var field in classToProcess.Fields)

diff --git a/UnityAttributes/Readonly/ReadonlyGenerator.Attribute.cs b/UnityAttributes/Readonly/ReadonlyGenerator.Attribute.cs
@@ -8,12 +8,14 @@ public partial class ReadonlyGenerator
 	static readonly string generatedCodeAttribute = typeof(ReadonlyGenerator).GeneratedCodeAttribute();
 
 	readonly string attributeText = @$"{Const.AUTO_GENERATED_TEXT}
-
-{generatedCodeAttribute}
-[global::System.AttributeUsage(global::System.AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
-internal class {AttributeName} : global::System.Attribute
+namespace UnityAttributes
 {{
-  public {AttributeName}() {{ }}
+    {generatedCodeAttribute}
+    [global::System.AttributeUsage(global::System.AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+    internal class {AttributeName} : global::System.Attribute
+    {{
+        public {AttributeName}() {{ }}
+    }}
 }}
 ";
 }
diff --git a/UnityAttributes/Singleton/SingletonGenerator.Attribute.cs b/UnityAttributes/Singleton/SingletonGenerator.Attribute.cs
@@ -6,11 +6,14 @@ public partial class SingletonGenerator {
   public const string AttributeName = "SingletonAttribute";
   readonly string attributeText = @$"{Const.AUTO_GENERATED_TEXT}
 
-{generatedCodeAttribute}
-[global::System.AttributeUsage(global::System.AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
-internal sealed class {AttributeName} : global::System.Attribute
+namespace UnityAttributes
 {{
-  public {AttributeName}() {{ }}
+    {generatedCodeAttribute}
+    [global::System.AttributeUsage(global::System.AttributeTargets.Class, Inherited = true, AllowMultiple = false)]
+    internal sealed class {AttributeName} : global::System.Attribute
+    {{
+        public {AttributeName}() {{ }}
+    }}
 }}
 ";
 }
diff --git a/UnityAttributes/UnityAttributes.csproj b/UnityAttributes/UnityAttributes.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <Version>1.3.0.0</Version>
+        <Version>1.3.1</Version>
         <TargetFramework>netstandard2.0</TargetFramework>
         <RootNamespace>UnityAttributes</RootNamespace>
         <LangVersion>latest</LangVersion>