Cleaned up some more logic and handled IDictionary/IReadOnlyDictionary.

Author: MeltyPlayer

GenerateReadOnly Tests/generator/BuiltInTypeTests.cs

@@ -13,6 +13,9 @@ internal class BuiltInTypeTests {
   [TestCase("System.Collections.Generic.IList<int>",
             "System.Collections.Generic.IReadOnlyList<int>",
             true)]
+  [TestCase("System.Collections.Generic.IDictionary<int, int>",
+            "System.Collections.Generic.IReadOnlyDictionary<int, int>",
+            true)]
   public void TestSupportsEachBuiltInType(string mutable,
                                           string readOnly,
                                           bool needsToCast) {
@@ -51,6 +54,7 @@ public partial interface IReadOnlyWrapper {
   [TestCase("System.Span<int>")]
   [TestCase("System.Collections.Generic.ICollection<int>")]
   [TestCase("System.Collections.Generic.IList<int>")]
+  [TestCase("System.Collections.Generic.IDictionary<int, int>")]
   public void TestDoesNotConvertBuiltInsForMutableProperties(string mutable) {
     ReadOnlyGeneratorTestUtil.AssertGenerated(
         $$"""
@@ -84,6 +88,7 @@ public partial interface IReadOnlyWrapper {
   [TestCase("System.Span<int>")]
   [TestCase("System.Collections.Generic.ICollection<int>")]
   [TestCase("System.Collections.Generic.IList<int>")]
+  [TestCase("System.Collections.Generic.IDictionary<int, int>")]
   public void TestDoesNotConvertBuiltInsForMutableMethods(string mutable) {
     ReadOnlyGeneratorTestUtil.AssertGenerated(
         $$"""

GenerateReadOnly/src/generator/ReadOnlyTypeGenerator.cs

@@ -576,6 +576,12 @@ private static bool HasBuiltInReadOnlyType_(
       return true;
     }
 
+    if (symbol.IsType(typeof(IDictionary<,>))) {
+      readOnlyName = typeof(IReadOnlyDictionary<,>).GetCorrectName();
+      canImplicitlyConvert = false;
+      return true;
+    }
+
     readOnlyName = default;
     canImplicitlyConvert = false;
     return false;

GenerateReadOnly/src/util/symbols/IsExtensions.cs

@@ -123,36 +123,29 @@ public static bool IsTuple(this ISymbol symbol,
     return false;
   }
 
-  public static bool IsSequence(this ISymbol symbol,
-                                out ITypeSymbol elementType,
-                                out SequenceType sequenceType) {
+  public static bool IsSequence(this ISymbol symbol, out ITypeSymbol elementType) {
     if (symbol.IsArray(out elementType)) {
-      sequenceType = SequenceType.MUTABLE_ARRAY;
       return true;
     }
 
     if (symbol.Implements(typeof(ImmutableArray<>),
                           out var immutableArrayTypeV2)) {
       elementType = immutableArrayTypeV2.TypeArguments.ToArray()[0];
-      sequenceType = SequenceType.IMMUTABLE_ARRAY;
       return true;
     }
 
     if (symbol.Implements(typeof(List<>), out var listTypeV2)) {
       elementType = listTypeV2.TypeArguments.ToArray()[0];
-      sequenceType = SequenceType.MUTABLE_LIST;
       return true;
     }
 
     if (symbol.Implements(typeof(IReadOnlyList<>),
                           out var readonlyListTypeV2)) {
       elementType = readonlyListTypeV2.TypeArguments.ToArray()[0];
-      sequenceType = SequenceType.READ_ONLY_LIST;
       return true;
     }
 
     elementType = default;
-    sequenceType = default;
     return false;
   }
 }

GenerateReadOnly/src/util/types/SequenceType.cs

@@ -32,10 +32,7 @@ public static ParseStatus ParseMember(ISymbol memberSymbol) {
       return ParseStatus.SUCCESS;
     }
 
-    if (!GetTypeOfMember_(
-            memberSymbol,
-            out var memberTypeSymbol,
-            out var isReadonly)) {
+    if (!GetTypeOfMember_(memberSymbol, out var memberTypeSymbol)) {
       return ParseStatus.NOT_A_FIELD_OR_PROPERTY_OR_METHOD;
     }
 
@@ -45,10 +42,10 @@ public static ParseStatus ParseMember(ISymbol memberSymbol) {
       return ParseStatus.NOT_A_FIELD_OR_PROPERTY_OR_METHOD;
     }
 
-    return ParseTypeSymbol(memberTypeSymbol, isReadonly);
+    return ParseTypeSymbol(memberTypeSymbol);
   }
 
-  public static ParseStatus ParseTypeSymbol(ITypeSymbol typeSymbol, bool isReadonly) {
+  public static ParseStatus ParseTypeSymbol(ITypeSymbol typeSymbol) {
     ParseNullable_(ref typeSymbol);
 
     if (typeSymbol.IsPrimitive(out _)) {
@@ -59,10 +56,8 @@ public static ParseStatus ParseTypeSymbol(ITypeSymbol typeSymbol, bool isReadonl
       return ParseStatus.SUCCESS;
     }
 
-    if (typeSymbol.IsSequence(out var elementTypeV2, out var sequenceType)) {
-      var elementParseStatus = ParseTypeSymbol(
-          elementTypeV2,
-          sequenceType.IsReadOnly());
+    if (typeSymbol.IsSequence(out var elementTypeV2)) {
+      var elementParseStatus = ParseTypeSymbol(elementTypeV2);
       if (elementParseStatus != ParseStatus.SUCCESS) {
         return elementParseStatus;
       }
@@ -86,21 +81,17 @@ public static ParseStatus ParseTypeSymbol(ITypeSymbol typeSymbol, bool isReadonl
 
   private static bool GetTypeOfMember_(
       ISymbol memberSymbol,
-      out ITypeSymbol memberTypeSymbol,
-      out bool isMemberReadonly) {
+      out ITypeSymbol memberTypeSymbol) {
     switch (memberSymbol) {
       case IPropertySymbol propertySymbol: {
-        isMemberReadonly = propertySymbol.SetMethod == null;
         memberTypeSymbol = propertySymbol.Type;
         return true;
       }
       case IFieldSymbol fieldSymbol: {
-        isMemberReadonly = fieldSymbol.IsReadOnly;
         memberTypeSymbol = fieldSymbol.Type;
         return true;
       }
       default: {
-        isMemberReadonly = false;
         memberTypeSymbol = default;
         return false;
       }