Switch all remaining models to EquatableArray<T>

Author: Sergio0694

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs

@@ -50,7 +50,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             .Where(static item => item.Hierarchy is not null);
 
         // Output the diagnostics
-        context.ReportDiagnostics(propertyInfoWithErrors.Select(static (item, _) => item.Info.Errors));
+        context.ReportDiagnostics(propertyInfoWithErrors.Select(static (item, _) => item.Info.Errors.AsImmutableArray()));
 
         // Get the filtered sequence to enable caching
         IncrementalValuesProvider<(HierarchyInfo Hierarchy, Result<PropertyInfo> Info)> propertyInfo =
@@ -60,8 +60,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
         // Split and group by containing type
         IncrementalValuesProvider<(HierarchyInfo Hierarchy, ImmutableArray<PropertyInfo> Properties)> groupedPropertyInfo =
             propertyInfo
-            .GroupBy(HierarchyInfo.Comparer.Default, static item => item.Value)
-            .WithComparers(HierarchyInfo.Comparer.Default, EqualityComparer<PropertyInfo>.Default.ForImmutableArray());
+            .GroupBy(EqualityComparer<HierarchyInfo>.Default, static item => item.Value)
+            .WithComparers(EqualityComparer<HierarchyInfo>.Default, EqualityComparer<PropertyInfo>.Default.ForImmutableArray());
 
         // Generate the requested properties and methods
         context.RegisterSourceOutput(groupedPropertyInfo, static (context, item) =>

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs

@@ -92,7 +92,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             .Where(static item => item is not null)!;
 
         // Emit the diagnostic, if needed
-        context.ReportDiagnostics(generationInfoWithErrors.Select(static (item, _) => item.Errors));
+        context.ReportDiagnostics(generationInfoWithErrors.Select(static (item, _) => item.Errors.AsImmutableArray()));
 
         // Get the filtered sequence to enable caching
         IncrementalValuesProvider<(HierarchyInfo Hierarchy, bool IsSealed, TInfo Info)> generationInfo =

CommunityToolkit.Mvvm.SourceGenerators/Input/RelayCommandGenerator.cs

@@ -48,7 +48,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             .Where(static item => item.Hierarchy is not null)!;
 
         // Output the diagnostics
-        context.ReportDiagnostics(commandInfoWithErrors.Select(static (item, _) => item.Info.Errors));
+        context.ReportDiagnostics(commandInfoWithErrors.Select(static (item, _) => item.Info.Errors.AsImmutableArray()));
 
         // Get the filtered sequence to enable caching
         IncrementalValuesProvider<(HierarchyInfo Hierarchy, Result<CommandInfo> Info)> commandInfo =

CommunityToolkit.Mvvm.SourceGenerators/Models/DiagnosticInfo.cs

@@ -27,14 +27,8 @@ internal sealed record DiagnosticInfo(
     DiagnosticDescriptor Descriptor,
     SyntaxTree? SyntaxTree,
     TextSpan TextSpan,
-    ImmutableArray<string> Arguments)
+    EquatableArray<string> Arguments)
 {
-    /// <inheritdoc/>
-    public bool Equals(DiagnosticInfo? obj) => Comparer.Default.Equals(this, obj);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => Comparer.Default.GetHashCode(this);
-
     /// <summary>
     /// Creates a new <see cref="Diagnostic"/> instance with the state from this model.
     /// </summary>
@@ -76,29 +70,4 @@ public static DiagnosticInfo Create(DiagnosticDescriptor descriptor, SyntaxNode
 
         return new(descriptor, location.SourceTree, location.SourceSpan, args.Select(static arg => arg.ToString()).ToImmutableArray());
     }
-
-    /// <summary>
-    /// An <see cref="IEqualityComparer{T}"/> implementation for <see cref="DiagnosticInfo"/>.
-    /// </summary>
-    private sealed class Comparer : Comparer<DiagnosticInfo, Comparer>
-    {
-        /// <inheritdoc/>
-        protected override void AddToHashCode(ref HashCode hashCode, DiagnosticInfo obj)
-        {
-            hashCode.Add(obj.Descriptor);
-            hashCode.Add(obj.SyntaxTree);
-            hashCode.Add(obj.TextSpan);
-            hashCode.AddRange(obj.Arguments);
-        }
-
-        /// <inheritdoc/>
-        protected override bool AreEqual(DiagnosticInfo x, DiagnosticInfo y)
-        {
-            return
-                x.Descriptor.Equals(y.Descriptor) &&
-                x.SyntaxTree == y.SyntaxTree &&
-                x.TextSpan.Equals(y.TextSpan) &&
-                x.Arguments.SequenceEqual(y.Arguments);
-        }
-    }
 }

CommunityToolkit.Mvvm.SourceGenerators/Models/HierarchyInfo.cs

@@ -23,7 +23,7 @@ namespace CommunityToolkit.Mvvm.SourceGenerators.Models;
 /// <param name="MetadataName">The metadata name for the current type.</param>
 /// <param name="Namespace">Gets the namespace for the current type.</param>
 /// <param name="Hierarchy">Gets the sequence of type definitions containing the current type.</param>
-internal sealed partial record HierarchyInfo(string FilenameHint, string MetadataName, string Namespace, ImmutableArray<TypeInfo> Hierarchy)
+internal sealed partial record HierarchyInfo(string FilenameHint, string MetadataName, string Namespace, EquatableArray<TypeInfo> Hierarchy)
 {
     /// <summary>
     /// Creates a new <see cref="HierarchyInfo"/> instance from a given <see cref="INamedTypeSymbol"/>.
@@ -50,29 +50,4 @@ public static HierarchyInfo From(INamedTypeSymbol typeSymbol)
             typeSymbol.ContainingNamespace.ToDisplayString(new(typeQualificationStyle: NameAndContainingTypesAndNamespaces)),
             hierarchy.ToImmutable());
     }
-
-    /// <summary>
-    /// An <see cref="IEqualityComparer{T}"/> implementation for <see cref="HierarchyInfo"/>.
-    /// </summary>
-    public sealed class Comparer : Comparer<HierarchyInfo, Comparer>
-    {
-        /// <inheritdoc/>
-        protected override void AddToHashCode(ref HashCode hashCode, HierarchyInfo obj)
-        {
-            hashCode.Add(obj.FilenameHint);
-            hashCode.Add(obj.MetadataName);
-            hashCode.Add(obj.Namespace);
-            hashCode.AddRange(obj.Hierarchy);
-        }
-
-        /// <inheritdoc/>
-        protected override bool AreEqual(HierarchyInfo x, HierarchyInfo y)
-        {
-            return
-                x.FilenameHint == y.FilenameHint &&
-                x.MetadataName == y.MetadataName &&
-                x.Namespace == y.Namespace &&
-                x.Hierarchy.SequenceEqual(y.Hierarchy);
-        }
-    }
 }

CommunityToolkit.Mvvm.SourceGenerators/Models/Result.cs

@@ -20,33 +20,5 @@ namespace CommunityToolkit.Mvvm.SourceGenerators.Models;
 /// <typeparam name="TValue">The type of the wrapped value.</typeparam>
 /// <param name="Value">The wrapped value for the current result.</param>
 /// <param name="Errors">The associated diagnostic errors, if any.</param>
-internal sealed record Result<TValue>(TValue Value, ImmutableArray<DiagnosticInfo> Errors)
-    where TValue : IEquatable<TValue>?
-{
-    /// <inheritdoc/>
-    public bool Equals(Result<TValue>? obj) => Comparer.Default.Equals(this, obj);
-
-    /// <inheritdoc/>
-    public override int GetHashCode() => Comparer.Default.GetHashCode(this);
-
-    /// <summary>
-    /// An <see cref="IEqualityComparer{T}"/> implementation for <see cref="Result{TValue}"/>.
-    /// </summary>
-    private sealed class Comparer : Comparer<Result<TValue>, Comparer>
-    {
-        /// <inheritdoc/>
-        protected override void AddToHashCode(ref HashCode hashCode, Result<TValue> obj)
-        {
-            hashCode.Add(obj.Value);
-            hashCode.AddRange(obj.Errors);
-        }
-
-        /// <inheritdoc/>
-        protected override bool AreEqual(Result<TValue> x, Result<TValue> y)
-        {
-            return
-                EqualityComparer<TValue>.Default.Equals(x.Value, y.Value) &&
-                x.Errors.SequenceEqual(y.Errors);
-        }
-    }
-}
+internal sealed record Result<TValue>(TValue Value, EquatableArray<DiagnosticInfo> Errors)
+    where TValue : IEquatable<TValue>?;