Merge branch 'releases/7.x.x'

PawelGerr · Sep 27, 2024 · f51e116 · f51e116
2 parents 1075911 + 6c26b5e
commit f51e116
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/...ensions.SourceGenerator/CodeAnalysis/Diagnostics/ThinktectureRuntimeExtensionsAnalyzer.cs b/...ensions.SourceGenerator/CodeAnalysis/Diagnostics/ThinktectureRuntimeExtensionsAnalyzer.cs
@@ -238,7 +238,7 @@ private static void AnalyzeSmartEnum(OperationAnalysisContext context)
       {
          context.ReportDiagnostic(Diagnostic.Create(DiagnosticsDescriptors.ErrorDuringCodeAnalysis,
                                                     Location.None,
-                                                    type.ToFullyQualifiedDisplayString(), ex.Message));
+                                                    type.ToFullyQualifiedDisplayString(), ex.ToString()));
       }
    }
 
@@ -274,7 +274,7 @@ private static void AnalyzeValueObject(OperationAnalysisContext context)
       {
          context.ReportDiagnostic(Diagnostic.Create(DiagnosticsDescriptors.ErrorDuringCodeAnalysis,
                                                     Location.None,
-                                                    type.ToFullyQualifiedDisplayString(), ex.Message));
+                                                    type.ToFullyQualifiedDisplayString(), ex.ToString()));
       }
    }
 
@@ -302,7 +302,7 @@ private static void AnalyzeUnion(OperationAnalysisContext context)
       {
          context.ReportDiagnostic(Diagnostic.Create(DiagnosticsDescriptors.ErrorDuringCodeAnalysis,
                                                     Location.None,
-                                                    type.ToFullyQualifiedDisplayString(), ex.Message));
+                                                    type.ToFullyQualifiedDisplayString(), ex.ToString()));
       }
    }
 

diff --git a/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/TypedMemberStateFactory.cs b/src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/TypedMemberStateFactory.cs
@@ -124,7 +124,8 @@ public ITypedMemberState Create(ITypeSymbol type)
          SpecialType.System_Double => _double,
          SpecialType.System_String => _string,
          SpecialType.System_DateTime => _dateTime,
-         _ => _statesByTokens.TryGetValue((type.ContainingModule.MetadataName, type.MetadataToken), out var states) ? states : default
+         // Array types have no ContainingModule
+         _ => _statesByTokens.TryGetValue((type.ContainingModule?.MetadataName ?? "<<no module>>", type.MetadataToken), out var states) ? states : default
       };
 
       if (cachedStates == default)

diff --git a/test/Thinktecture.Runtime.Extensions.Tests.Shared/TestEnums/TestEnumWithArrayType.cs b/test/Thinktecture.Runtime.Extensions.Tests.Shared/TestEnums/TestEnumWithArrayType.cs
@@ -0,0 +1,9 @@
+namespace Thinktecture.Runtime.Tests.TestEnums;
+
+[SmartEnum<int>]
+public partial class TestEnumWithArrayType
+{
+   private static readonly TestEnumWithArrayType[] InternalMaritalStatusWithPartner = [];
+
+   public static readonly TestEnumWithArrayType Item = new(1);
+}