ValueObjectMemberSettings is not required for smart enums

Author: PawelGerr

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/Diagnostics/ThinktectureRuntimeExtensionsAnalyzer.cs

@@ -181,7 +181,7 @@ private static void ValidateValueObject(
       TypeMustNotBeGeneric(context, type, locationOfFirstDeclaration, "Value Object");
       StructMustBeReadOnly(context, type, locationOfFirstDeclaration);
 
-      var assignableMembers = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, false, context.CancellationToken, context.ReportDiagnostic)
+      var assignableMembers = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, false, true, context.CancellationToken, context.ReportDiagnostic)
                                   .Where(m => !m.IsStatic)
                                   .ToList();
 
@@ -320,7 +320,7 @@ private static void ValidateEnum(
       if (isValidatable)
          ValidateCreateInvalidItem(context, enumType, keyType, locationOfFirstDeclaration);
 
-      enumType.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, false, context.CancellationToken, context.ReportDiagnostic).Enumerate();
+      enumType.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, false, false, context.CancellationToken, context.ReportDiagnostic).Enumerate();
       var baseClass = enumType.BaseType;
 
       while (!baseClass.IsNullOrObject())

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/InstanceMemberInfo.cs

@@ -52,27 +52,29 @@ private InstanceMemberInfo(
    public static InstanceMemberInfo? CreateOrNull(
       TypedMemberStateFactory factory,
       IFieldSymbol field,
+      bool populateValueObjectMemberSettings,
       bool allowedCaptureSymbols)
    {
       if (field.Type.Kind == SymbolKind.ErrorType)
          return null;
 
       var symbol = allowedCaptureSymbols ? field : null;
-      var settings = ValueObjectMemberSettings.Create(field, field.Type, allowedCaptureSymbols);
+      var settings = populateValueObjectMemberSettings ? ValueObjectMemberSettings.Create(field, field.Type, allowedCaptureSymbols) : ValueObjectMemberSettings.None;
 
       return new(factory.Create(field.Type), settings, field.Name, (symbol, null), field.IsStatic);
    }
 
    public static InstanceMemberInfo? CreateOrNull(
       TypedMemberStateFactory factory,
       IPropertySymbol property,
+      bool populateValueObjectMemberSettings,
       bool allowedCaptureSymbols)
    {
       if (property.Type.Kind == SymbolKind.ErrorType)
          return null;
 
       var symbol = allowedCaptureSymbols ? property : null;
-      var settings = ValueObjectMemberSettings.Create(property, property.Type, allowedCaptureSymbols);
+      var settings = populateValueObjectMemberSettings ? ValueObjectMemberSettings.Create(property, property.Type, allowedCaptureSymbols) : ValueObjectMemberSettings.None;
 
       return new(factory.Create(property.Type), settings, property.Name, (null, symbol), property.IsStatic);
    }

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/SmartEnums/EnumSourceGeneratorState.cs

@@ -54,7 +54,7 @@ public EnumSourceGeneratorState(
       BaseType = type.GetBaseType(factory);
       HasKeyComparerImplementation = HasHasKeyComparerImplementation(type);
       ItemNames = type.EnumerateEnumItems().Select(i => i.Name).ToList();
-      AssignableInstanceFieldsAndProperties = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, true, cancellationToken).ToList();
+      AssignableInstanceFieldsAndProperties = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, true, false, cancellationToken).ToList();
    }
 
    private static bool HasHasKeyComparerImplementation(INamedTypeSymbol enumType)

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/ValueObjectMemberSettings.cs

@@ -4,7 +4,7 @@ namespace Thinktecture.CodeAnalysis.ValueObjects;
 
 public sealed class ValueObjectMemberSettings : IEquatable<ValueObjectMemberSettings>
 {
-   private static readonly ValueObjectMemberSettings _none = new(false);
+   public static readonly ValueObjectMemberSettings None = new(false);
    private static readonly ValueObjectMemberSettings _noneForString = new(false, null, Constants.ComparerAccessor.ORDINAL_IGNORE_CASE, false, null, Constants.ComparerAccessor.ORDINAL_IGNORE_CASE, false);
 
    private readonly SyntaxReference? _equalityComparerAttr;
@@ -47,7 +47,7 @@ public static ValueObjectMemberSettings Create(ISymbol member, ITypeSymbol type,
       var comparerAttr = member.FindAttribute(static type => type.Name == "ValueObjectMemberComparerAttribute" && type.ContainingNamespace is { Name: "Thinktecture", ContainingNamespace.IsGlobalNamespace: true });
 
       if (equalityComparerAttr is null && comparerAttr is null)
-         return type.SpecialType == SpecialType.System_String ? _noneForString : _none;
+         return type.SpecialType == SpecialType.System_String ? _noneForString : None;
 
       var equalityComparerGenericTypes = equalityComparerAttr?.GetComparerTypes();
       var equalityComparerAccessorType = equalityComparerGenericTypes?.ComparerType?.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat) ?? (type.SpecialType == SpecialType.System_String ? Constants.ComparerAccessor.ORDINAL_IGNORE_CASE : null);

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/ValueObjectSourceGeneratorState.cs

@@ -42,7 +42,7 @@ public ValueObjectSourceGeneratorState(
       TypeFullyQualifiedNullAnnotated = type.IsReferenceType ? TypeFullyQualifiedNullable : TypeFullyQualified;
       TypeMinimallyQualified = type.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat);
       IsReferenceType = type.IsReferenceType;
-      AssignableInstanceFieldsAndProperties = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, true, cancellationToken).ToList();
+      AssignableInstanceFieldsAndProperties = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, true, true, cancellationToken).ToList();
       EqualityMembers = GetEqualityMembers();
 
       var factoryValidationReturnType = type.GetMembers()

src/Thinktecture.Runtime.Extensions.SourceGenerator/Extensions/TypeSymbolExtensions.cs

@@ -460,6 +460,7 @@ public static IEnumerable<InstanceMemberInfo> GetAssignableFieldsAndPropertiesAn
       this ITypeSymbol type,
       TypedMemberStateFactory factory,
       bool instanceMembersOnly,
+      bool populateValueObjectMemberSettings,
       CancellationToken cancellationToken,
       Action<Diagnostic>? reportDiagnostic = null)
    {
@@ -470,8 +471,8 @@ public static IEnumerable<InstanceMemberInfo> GetAssignableFieldsAndPropertiesAn
                          {
                             return tuple switch
                             {
-                               ({ } field, _) => InstanceMemberInfo.CreateOrNull(factory, field, allowedCaptureSymbols),
-                               (_, { } property) => InstanceMemberInfo.CreateOrNull(factory, property, allowedCaptureSymbols),
+                               ({ } field, _) => InstanceMemberInfo.CreateOrNull(factory, field, populateValueObjectMemberSettings, allowedCaptureSymbols),
+                               (_, { } property) => InstanceMemberInfo.CreateOrNull(factory, property, populateValueObjectMemberSettings, allowedCaptureSymbols),
                                _ => throw new Exception("Either field or property must be set.")
                             };
                          })