Analyzer is using IDisallowDefaultValue for implementation of TTRE47 (VariableMustBeInitializedWithNonDefaultValue)

Author: PawelGerr

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

@@ -121,7 +121,7 @@ private static void MemberDisallowingDefaultValuesMustBeRequired(
       if (memberType.SpecialType != SpecialType.None || !memberType.IsValueType)
          return;
 
-      if (!memberType.Interfaces.Any(i => i.IsIDisallowDefaultValue()))
+      if (!memberType.ImplementsIDisallowDefaultValue())
          return;
 
       context.ReportDiagnostic(Diagnostic.Create(
@@ -177,7 +177,7 @@ private static void AnalyzeMethodWithUseDelegateFromConstructor(OperationAnalysi
       }
    }
 
-   private void AnalyzeObjectCreation(OperationAnalysisContext context)
+   private static void AnalyzeObjectCreation(OperationAnalysisContext context)
    {
       var operation = (IObjectCreationOperation)context.Operation;
 
@@ -186,14 +186,11 @@ private void AnalyzeObjectCreation(OperationAnalysisContext context)
           || operation.Arguments.Length > 0)
          return;
 
-      if (operation.Type.IsAdHocUnionType(out _)
-          || (operation.Type.IsValueObjectType(out var valueObjectAttributeBase) && !valueObjectAttributeBase.FindAllowDefaultStructs()))
-      {
+      if (operation.Type.ImplementsIDisallowDefaultValue())
          ReportDiagnostic(context, DiagnosticsDescriptors.VariableMustBeInitializedWithNonDefaultValue, operation.Syntax.GetLocation(), operation.Type);
-      }
    }
 
-   private void AnalyzeDefaultValueAssignment(OperationAnalysisContext context)
+   private static void AnalyzeDefaultValueAssignment(OperationAnalysisContext context)
    {
       var operation = (IDefaultValueOperation)context.Operation;
 
@@ -204,11 +201,8 @@ private void AnalyzeDefaultValueAssignment(OperationAnalysisContext context)
          return;
       }
 
-      if (operation.Type.IsAdHocUnionType(out _)
-          || (operation.Type.IsValueObjectType(out var valueObjectAttributeBase) && !valueObjectAttributeBase.FindAllowDefaultStructs()))
-      {
+      if (operation.Type.ImplementsIDisallowDefaultValue())
          ReportDiagnostic(context, DiagnosticsDescriptors.VariableMustBeInitializedWithNonDefaultValue, operation.Syntax.GetLocation(), operation.Type);
-      }
    }
 
    private static bool IsAssignmentOrInitialization(IOperation? operation)
@@ -527,7 +521,7 @@ private static void ValidateKeyedValueObject(
          {
             ReportDiagnostic(context, DiagnosticsDescriptors.AllowDefaultStructsCannotBeTrueIfValueObjectIsStructButKeyTypeIsClass, attribute.Syntax.GetLocation(), type, keyType);
          }
-         else if (keyType.AllInterfaces.Any(i => i.IsIDisallowDefaultValue()))
+         else if (keyType.ImplementsIDisallowDefaultValue())
          {
             ReportDiagnostic(context,
                              DiagnosticsDescriptors.AllowDefaultStructsCannotBeTrueIfSomeMembersDisallowDefaultValues,

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

@@ -127,7 +127,7 @@ private InstanceMemberInfo(
 
    private static bool IsDisallowingDefaultValue(ITypeSymbol type)
    {
-      if (type.AllInterfaces.Any(i => i.IsIDisallowDefaultValue()))
+      if (type.ImplementsIDisallowDefaultValue())
          return true;
 
       if (type.IsReferenceType

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

@@ -844,4 +844,17 @@ public static bool IsIDisallowDefaultValue(this ITypeSymbol? type)
    {
       return type is { Name: Constants.Interfaces.DisallowDefaultStructs.NAME, ContainingNamespace: { Name: Constants.Interfaces.DisallowDefaultStructs.NAMESPACE, ContainingNamespace.IsGlobalNamespace: true } };
    }
+
+   public static bool ImplementsIDisallowDefaultValue(this ITypeSymbol type)
+   {
+      for (var i = 0; i < type.AllInterfaces.Length; i++)
+      {
+         var @interface = type.AllInterfaces[i];
+
+         if (@interface.IsIDisallowDefaultValue())
+            return true;
+      }
+
+      return false;
+   }
 }

test/Thinktecture.Runtime.Extensions.Json.Tests/Text/Json/Serialization/ValueObjectJsonConverterFactoryTests/WriteJson.cs

@@ -35,7 +35,6 @@ public void Should_deserialize_enum_if_null_and_default()
       SerializeWithConverter<TestSmartEnum_Struct_IntBased_Validatable?, ValueObjectJsonConverterFactory<TestSmartEnum_Struct_IntBased_Validatable, int, ValidationError>>(null).Should().Be("null");
       SerializeWithConverter<TestSmartEnum_Struct_StringBased_Validatable?, ValueObjectJsonConverterFactory<TestSmartEnum_Struct_StringBased_Validatable, string, ValidationError>>(null).Should().Be("null");
       SerializeWithConverter<TestSmartEnum_Struct_IntBased_Validatable, ValueObjectJsonConverterFactory<TestSmartEnum_Struct_IntBased_Validatable, int, ValidationError>>(default).Should().Be("0");
-      SerializeWithConverter<TestSmartEnum_Struct_StringBased_Validatable, ValueObjectJsonConverterFactory<TestSmartEnum_Struct_StringBased_Validatable, string, ValidationError>>(default).Should().Be("null");
    }
 
    [Fact]

test/Thinktecture.Runtime.Extensions.Newtonsoft.Json.Tests/Json/ValueObjectNewtonsoftJsonConverterTests/WriteJson.cs

@@ -31,7 +31,6 @@ public void Should_deserialize_enum_if_null_and_default()
       SerializeNullableStruct<TestSmartEnum_Struct_IntBased_Validatable, int>(null).Should().Be("null");
       SerializeNullableStruct<TestSmartEnum_Struct_StringBased_Validatable, string>(null).Should().Be("null");
       SerializeStruct<TestSmartEnum_Struct_IntBased_Validatable, int>(default).Should().Be("0");
-      SerializeStruct<TestSmartEnum_Struct_StringBased_Validatable, string>(default).Should().Be("null");
    }
 
    [Fact]

test/Thinktecture.Runtime.Extensions.Tests/EnumTests/EnsureValid.cs

@@ -34,9 +34,6 @@ public void Should_throw_if_default_struct_is_invalid()
    {
       new StructIntegerEnum().Invoking(e => e.EnsureValid())
                              .Should().Throw<InvalidOperationException>().WithMessage($"The current enumeration item of type \"{nameof(StructIntegerEnum)}\" with identifier \"0\" is not valid.");
-
-      new StructStringEnum().Invoking(e => e.EnsureValid())
-                            .Should().Throw<InvalidOperationException>().WithMessage($"The current enumeration item of type \"{nameof(StructStringEnum)}\" with identifier \"\" is not valid.");
    }
 
    [Fact]