Fixed enum list handling

Mutagen-Modding · Oct 22, 2024 · b3ab5dd · b3ab5dd
1 parent 408012e
commit b3ab5dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Mutagen.Bethesda.Serialization.SourceGenerator/Serialization/Fields/AListFieldGenerator.cs b/Mutagen.Bethesda.Serialization.SourceGenerator/Serialization/Fields/AListFieldGenerator.cs
@@ -71,7 +71,8 @@ public static string GetCountAccessor(ITypeSymbol t)
             {
                 if (t is IArrayTypeSymbol arr)
                 {
-                    if (arr.ElementType.Name.StartsWith("IFormLink"))
+                    if (arr.ElementType.Name.StartsWith("IFormLink")
+                        || EnumFieldGenerator.IsApplicable(arr.ElementType))
                     {
                         return LengthAccess;
                     }

diff --git a/Mutagen.Bethesda.Serialization.SourceGenerator/Serialization/Fields/EnumFieldGenerator.cs b/Mutagen.Bethesda.Serialization.SourceGenerator/Serialization/Fields/EnumFieldGenerator.cs
@@ -16,18 +16,22 @@ public IEnumerable<string> RequiredNamespaces(
         return Enumerable.Empty<string>();
     }
 
+    public static bool IsApplicable(ITypeSymbol typeSymbol)
+    {
+        typeSymbol = typeSymbol.PeelNullable();
+        return typeSymbol.TypeKind == TypeKind.Enum
+                  || (typeSymbol.BaseType is { Name: "Enum" } 
+                      && typeSymbol.BaseType.ContainingNamespace.ToString() == "System");
+    }
+
     public bool Applicable(
         LoquiTypeSet obj, 
         CompilationUnit compilation,
         ITypeSymbol typeSymbol, 
         string? fieldName,
         bool isInsideCollection)
     {
-        typeSymbol = typeSymbol.PeelNullable();
-        var ret = typeSymbol.TypeKind == TypeKind.Enum
-            || (typeSymbol.BaseType is { Name: "Enum" } 
-                && typeSymbol.BaseType.ContainingNamespace.ToString() == "System");
-        if (ret) return true;
+        if (IsApplicable(typeSymbol)) return true;
 
         if (obj.Getter is INamedTypeSymbol namedTypeSymbol)
         {