Merge pull request #69 from wwwDayDream/feat_allow-public-fields

Added public field option that defaults to false
wwwDayDream · May 20, 2024 · d06ca4a · d06ca4a
2 parents ef3a9d8 + 3204156
commit d06ca4a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CessilCellsCeaChells/CeaChore/Attributes.cs b/CessilCellsCeaChells/CeaChore/Attributes.cs
@@ -5,7 +5,7 @@
 namespace CessilCellsCeaChells.CeaChore;
 
 public class RequiresFieldAttribute : RequiresAttribute {
-    [UsedImplicitly] public RequiresFieldAttribute(Type targetType, string fieldName, Type fieldType) {}
+    [UsedImplicitly] public RequiresFieldAttribute(Type targetType, string fieldName, Type fieldType, bool isPublic = false) {}
 }
 
 public class RequiresPropertyAttribute : RequiresAttribute {

diff --git a/CessilCellsCeaChells/Merges/FieldMerge.cs b/CessilCellsCeaChells/Merges/FieldMerge.cs
@@ -9,6 +9,7 @@ namespace CessilCellsCeaChells.Merges;
 internal class FieldMerge(CustomAttribute attribute) : CessilMerge((TypeReference)attribute.ConstructorArguments[0].Value) {
     private readonly string FieldName = (string)attribute.ConstructorArguments[1].Value;
     private readonly TypeReference FieldType = (TypeReference)attribute.ConstructorArguments[2].Value;
+    private readonly bool IsPublic = attribute.ConstructorArguments.Count > 3 && (bool)attribute.ConstructorArguments[3].Value;
 
     internal override CustomAttribute ConvertToAttribute(AssemblyDefinition into)
     {
@@ -19,15 +20,17 @@ internal override CustomAttribute ConvertToAttribute(AssemblyDefinition into)
             ConstructorArguments = {
                 new CustomAttributeArgument(typeTypeRef, targetTypeRef),
                 new CustomAttributeArgument(into.MainModule.TypeSystem.String, FieldName),
-                new CustomAttributeArgument(typeTypeRef, fieldTypeTypeRef)
+                new CustomAttributeArgument(typeTypeRef, fieldTypeTypeRef),
+                new CustomAttributeArgument(into.MainModule.TypeSystem.Boolean, IsPublic)
             }
         };
     }
 
     internal override bool TryMergeInto(TypeDefinition typeDefinition, out IMemberDefinition? memberDefinition)
     {
         memberDefinition = default;
-        var didCreate = CessilHelper.TryCreateField(typeDefinition, FieldName, GetOrImportTypeReference(typeDefinition.Module, FieldType), out var fieldDefinition);
+        var didCreate = CessilHelper.TryCreateField(typeDefinition, FieldName, GetOrImportTypeReference(typeDefinition.Module, FieldType), 
+            out var fieldDefinition, IsPublic ? FieldAttributes.Public : FieldAttributes.Private);
         if (didCreate)
             memberDefinition = fieldDefinition;
         return didCreate;