chore: rename AccessModifiers to DeclarationModifiers and add a more correct AccessModifiers

Author: davidkallesen

src/Atc.CodeGeneration.CSharp/Content/AccessModifiers.cs

@@ -7,51 +7,18 @@ public enum AccessModifiers
     [Description("public")]
     Public,
 
-    [Description("public async")]
-    PublicAsync,
-
-    [Description("public static")]
-    PublicStatic,
-
-    [Description("public static implicit operator")]
-    PublicStaticImplicitOperator,
-
-    [Description("public class")]
-    PublicClass,
-
-    [Description("public partial class")]
-    PublicPartialClass,
-
-    [Description("public static class")]
-    PublicStaticClass,
-
-    [Description("public sealed class")]
-    PublicSealedClass,
-
-    [Description("public interface")]
-    PublicInterface,
-
-    [Description("public partial interface")]
-    PublicPartialInterface,
-
-    [Description("public static interface")]
-    PublicStaticInterface,
-
-    [Description("public record")]
-    PublicRecord,
-
-    [Description("public record struct")]
-    PublicRecordStruct,
-
     [Description("private")]
     Private,
 
-    [Description("private async")]
-    PrivateAsync,
-
     [Description("protected")]
     Protected,
 
     [Description("internal")]
     Internal,
+
+    [Description("protected internal")]
+    ProtectedInternal,
+
+    [Description("private protected")]
+    PrivateProtected,
 }

src/Atc.CodeGeneration.CSharp/Content/DeclarationModifiers.cs

@@ -0,0 +1,63 @@
+namespace Atc.CodeGeneration.CSharp.Content;
+
+public enum DeclarationModifiers
+{
+    None,
+
+    [Description("public")]
+    Public,
+
+    [Description("public async")]
+    PublicAsync,
+
+    [Description("public static")]
+    PublicStatic,
+
+    [Description("public static implicit operator")]
+    PublicStaticImplicitOperator,
+
+    [Description("public class")]
+    PublicClass,
+
+    [Description("public partial class")]
+    PublicPartialClass,
+
+    [Description("public static class")]
+    PublicStaticClass,
+
+    [Description("public sealed class")]
+    PublicSealedClass,
+
+    [Description("public interface")]
+    PublicInterface,
+
+    [Description("public partial interface")]
+    PublicPartialInterface,
+
+    [Description("public static interface")]
+    PublicStaticInterface,
+
+    [Description("public record")]
+    PublicRecord,
+
+    [Description("public record struct")]
+    PublicRecordStruct,
+
+    [Description("public partial record")]
+    PublicPartialRecord,
+
+    [Description("public partial record struct")]
+    PublicPartialRecordStruct,
+
+    [Description("private")]
+    Private,
+
+    [Description("private async")]
+    PrivateAsync,
+
+    [Description("protected")]
+    Protected,
+
+    [Description("internal")]
+    Internal,
+}

src/Atc.CodeGeneration.CSharp/Content/Factories/ClassParametersFactory.cs

@@ -13,7 +13,7 @@ public static ClassParameters Create(
             Namespace: @namespace,
             DocumentationTags: null,
             Attributes: new List<AttributeParameters> { attribute },
-            usePartialClass ? AccessModifiers.PublicPartialClass : AccessModifiers.PublicClass,
+            usePartialClass ? DeclarationModifiers.PublicPartialClass : DeclarationModifiers.PublicClass,
             ClassTypeName: classTypeName,
             GenericTypeName: null,
             InheritedClassTypeName: null,

src/Atc.CodeGeneration.CSharp/Content/Factories/EnumParametersFactory.cs

@@ -14,7 +14,7 @@ public static EnumParameters Create(
             Namespace: @namespace,
             DocumentationTags: documentationTags,
             Attributes: attributes,
-            AccessModifier: AccessModifiers.Public,
+            DeclarationModifier: DeclarationModifiers.Public,
             EnumTypeName: enumTypeName,
             UseFlags: false,
             EnumValuesParametersFactory.Create(enumNames));
@@ -31,7 +31,7 @@ public static EnumParameters Create(
             Namespace: @namespace,
             DocumentationTags: documentationTags,
             Attributes: attributes,
-            AccessModifier: AccessModifiers.Public,
+            DeclarationModifier: DeclarationModifiers.Public,
             EnumTypeName: enumTypeName,
             UseFlags: DetermineIfFlagsAttributeShouldBeUsed(enumNameValues),
             EnumValuesParametersFactory.Create(enumNameValues));

src/Atc.CodeGeneration.CSharp/Content/Factories/InterfaceParametersFactory.cs

@@ -12,7 +12,7 @@ public static InterfaceParameters Create(
             Namespace: @namespace,
             DocumentationTags: null,
             Attributes: new List<AttributeParameters> { attribute },
-            AccessModifiers.Public,
+            DeclarationModifiers.Public,
             InterfaceTypeName: interfaceTypeName,
             InheritedInterfaceTypeName: null,
             Properties: null,
@@ -28,7 +28,7 @@ public static InterfaceParameters Create(
             Namespace: @namespace,
             DocumentationTags: null,
             Attributes: attributes,
-            AccessModifiers.PublicInterface,
+            DeclarationModifiers.PublicInterface,
             InterfaceTypeName: interfaceTypeName,
             InheritedInterfaceTypeName: null,
             Properties: null,

src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForClass.cs

@@ -27,7 +27,7 @@ public string Generate()
                 parameters.DocumentationTags,
                 parameters.Attributes));
 
-        sb.Append($"{parameters.AccessModifier.GetDescription()} {parameters.ClassTypeName}");
+        sb.Append($"{parameters.DeclarationModifier.GetDescription()} {parameters.ClassTypeName}");
         if (!string.IsNullOrEmpty(parameters.GenericTypeName))
         {
             sb.Append($"<{parameters.GenericTypeName}>");

src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForEnum.cs

@@ -34,7 +34,7 @@ public string Generate()
             sb.AppendLine("[JsonConverter(typeof(JsonStringEnumConverter))]");
         }
 
-        sb.Append($"{parameters.AccessModifier.GetDescription()} enum ");
+        sb.Append($"{parameters.DeclarationModifier.GetDescription()} enum ");
         sb.AppendLine($"{parameters.EnumTypeName}");
 
         sb.AppendLine("{");

src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForInterface.cs

@@ -26,7 +26,7 @@ public string Generate()
                 parameters.DocumentationTags,
                 parameters.Attributes));
 
-        sb.Append($"{parameters.AccessModifier.GetDescription()} ");
+        sb.Append($"{parameters.DeclarationModifier.GetDescription()} ");
         if (string.IsNullOrEmpty(parameters.InheritedInterfaceTypeName))
         {
             sb.AppendLine($"{parameters.InterfaceTypeName}");

src/Atc.CodeGeneration.CSharp/Content/Generators/GenerateContentForRecords.cs

@@ -34,11 +34,11 @@ public string Generate()
                 recordParameters.Parameters.Any(x => x.IsGenericListType &&
                                                      x.TypeName.Equals("T", StringComparison.Ordinal)))
             {
-                sb.Append($"{recordParameters.AccessModifier.GetDescription()} {recordParameters.Name}<T>");
+                sb.Append($"{recordParameters.DeclarationModifier.GetDescription()} {recordParameters.Name}<T>");
             }
             else
             {
-                sb.Append($"{recordParameters.AccessModifier.GetDescription()} {recordParameters.Name}");
+                sb.Append($"{recordParameters.DeclarationModifier.GetDescription()} {recordParameters.Name}");
             }
 
             if (recordParameters.Parameters is null ||

src/Atc.CodeGeneration.CSharp/Content/Generators/Internal/GenerateContentWriter.cs

@@ -53,7 +53,7 @@ public string GenerateConstructor(
 
         var sb = new StringBuilder();
 
-        sb.AppendAccessModifier(4, parameters.AccessModifier);
+        sb.AppendDeclarationModifier(4, parameters.DeclarationModifier);
 
         if (string.IsNullOrEmpty(parameters.GenericTypeName))
         {
@@ -181,9 +181,9 @@ public string GenerateProperty(
         }
 
         sb.Append("    ");
-        if (parameters.AccessModifier != AccessModifiers.None)
+        if (parameters.DeclarationModifier != DeclarationModifiers.None)
         {
-            sb.AppendAccessModifier(parameters.AccessModifier);
+            sb.AppendDeclarationModifier(parameters.DeclarationModifier);
         }
 
         sb.AppendTypeAndName(parameters.GenericTypeName, parameters.TypeName, parameters.IsNullableType, parameters.Name);
@@ -261,9 +261,9 @@ public string GenerateMethod(
         }
 
         sb.Append("    ");
-        if (parameters.AccessModifier != AccessModifiers.None)
+        if (parameters.DeclarationModifier != DeclarationModifiers.None)
         {
-            sb.AppendAccessModifier(parameters.AccessModifier);
+            sb.AppendDeclarationModifier(parameters.DeclarationModifier);
         }
 
         if (string.IsNullOrEmpty(parameters.ReturnTypeName))
@@ -306,7 +306,7 @@ public string GenerateMethod(
                     useCommaForEndChar);
             }
 
-            if (parameters.AccessModifier == AccessModifiers.None)
+            if (parameters.DeclarationModifier == DeclarationModifiers.None)
             {
                 sb.Append(';');
             }