Refactor syntax fixup handling and GeneratedType model

Removed IsPublicAccessibilityRequired from GeneratedType and moved accessibility and embedded attribute handling to SyntaxFixupType flags. Updated PolyfillsGenerator to use new flags for source adjustments, improving flexibility and maintainability of syntax fixup logic.

Author: Sergio0694

src/PolySharp.SourceGenerators/Models/GeneratedType.cs

@@ -4,9 +4,5 @@ namespace PolySharp.SourceGenerators.Models;
 /// A model to hold information on a type to generate.
 /// </summary>
 /// <param name="FullyQualifiedMetadataName">The fully qualified type name of the type to generate.</param>
-/// <param name="IsPublicAccessibilityRequired">Whether to use public accessibility for the generated type.</param>
 /// <param name="FixupType">The types of syntax fixups to apply.</param>
-internal sealed record GeneratedType(
-    string FullyQualifiedMetadataName,
-    bool IsPublicAccessibilityRequired,
-    SyntaxFixupType FixupType);
+internal sealed record GeneratedType(string FullyQualifiedMetadataName, SyntaxFixupType FixupType);

src/PolySharp.SourceGenerators/Models/SyntaxFixupType.cs

@@ -13,25 +13,35 @@ internal enum SyntaxFixupType
     /// </summary>
     None = 0,
 
+    /// <summary>
+    /// Uses the <see langword="public"/> accessibility modifier (instead of <see langword="internal"/>).
+    /// </summary>
+    UsePublicAccessibilityModifier = 1 << 0,
+
+    /// <summary>
+    /// Remove all <c>[Embedded]</c> attributes.
+    /// </summary>
+    RemoveEmbeddedAttributes = 1 << 1,
+
     /// <summary>
     /// Remove all <c>[MethodImpl]</c> attributes.
     /// </summary>
-    RemoveMethodImplAttributes = 1 << 0,
+    RemoveMethodImplAttributes = 1 << 2,
 
     /// <summary>
     /// Remove all <c>[ExcludeFromCodeCoverage]</c> attributes.
     /// </summary>
-    RemoveExcludeFromCodeCoverageAttributes = 1 << 1,
+    RemoveExcludeFromCodeCoverageAttributes = 1 << 3,
 
     /// <summary>
     /// Generates the <c>[UnmanagedCallersOnly]</c> type in the <c>InteropServices2</c> dummy namespace.
     /// </summary>
     /// <remarks>This is needed when methods annotated with the attribute have to be assigned to delegates, which Roslyn will otherwise block.</remarks>
-    UseInteropServices2ForUnmanagedCallersOnlyAttribute = 1 << 2,
+    UseInteropServices2ForUnmanagedCallersOnlyAttribute = 1 << 4,
 
     /// <summary>
     /// Generates a global using for the <c>[InlineArray]</c> type in the dummy namespace.
     /// </summary>
     /// <remarks>This is always needed when the type is used, as the usage is entirely blocked in the normal namespace.</remarks>
-    EmitGlobalUsingForInlineArrayAttribute = 1 << 3
+    EmitGlobalUsingForInlineArrayAttribute = 1 << 5
 }

src/PolySharp.SourceGenerators/PolyfillsGenerator.Polyfills.cs

@@ -247,7 +247,11 @@ static SyntaxFixupType GetSyntaxFixupType(AvailableType availableType, Generatio
         // Combine the syntax type with any analyzer options
         SyntaxFixupType fixupType = info.AvailableType.FixupType | GetSyntaxFixupType(info.AvailableType, info.Options);
 
-        return new(info.AvailableType.FullyQualifiedMetadataName, info.Options.UsePublicAccessibilityForGeneratedTypes, fixupType);
+        // Also combine additional flags from project settings
+        fixupType |= info.Options.UsePublicAccessibilityForGeneratedTypes ? SyntaxFixupType.UsePublicAccessibilityModifier : SyntaxFixupType.None;
+        fixupType |= !info.Options.UseEmbeddedAttributeForGeneratedTypes ? SyntaxFixupType.RemoveEmbeddedAttributes : SyntaxFixupType.None;
+
+        return new(info.AvailableType.FullyQualifiedMetadataName, fixupType);
     }
 
     /// <summary>
@@ -285,8 +289,8 @@ private void EmitGeneratedType(SourceProductionContext context, GeneratedType ty
 
             using Stream stream = typeof(PolyfillsGenerator).Assembly.GetManifestResourceStream(resourceName);
 
-            // If public accessibility has been requested or a syntax fixup is needed, we need to update the loaded source files
-            if (type is { IsPublicAccessibilityRequired: true } or { FixupType: not SyntaxFixupType.None })
+            // If a syntax fixup is needed, we need to update the loaded source files
+            if (type is { FixupType: not SyntaxFixupType.None })
             {
                 string adjustedSource;
 
@@ -295,7 +299,7 @@ private void EmitGeneratedType(SourceProductionContext context, GeneratedType ty
                     adjustedSource = reader.ReadToEnd();
                 }
 
-                if (type.IsPublicAccessibilityRequired)
+                if ((type.FixupType & SyntaxFixupType.UsePublicAccessibilityModifier) != 0)
                 {
                     // After reading the file, replace all internal keywords with public. Use a space before and after the identifier
                     // to avoid potential false positives. This could also be done by loading the source tree and using a syntax
@@ -306,6 +310,12 @@ private void EmitGeneratedType(SourceProductionContext context, GeneratedType ty
                     // If types are public, we also need to strip the '[Embedded]' attributes, as it's not allowed on public types
                     adjustedSource = EmbeddedAttributeRegex.Replace(adjustedSource, "");
                 }
+                else if ((type.FixupType & SyntaxFixupType.RemoveEmbeddedAttributes) != 0)
+                {
+                    // Remove the '[Embedded]' attributes as above, if requested. We only need this check if types
+                    // are not public, or these attributes would've already been stripped by the previous branch.
+                    adjustedSource = EmbeddedAttributeRegex.Replace(adjustedSource, "");
+                }
 
                 if ((type.FixupType & SyntaxFixupType.RemoveMethodImplAttributes) != 0)
                 {
@@ -344,7 +354,7 @@ namespace System.Runtime.CompilerServices2
             }
             else
             {
-                // If the default accessibility is used, we can load the source directly
+                // Otherwise if no fixups are needed, we can load the source directly
                 sourceText = SourceText.From(stream, Encoding.UTF8, canBeEmbedded: true);
             }