Merge pull request #919 from Cysharp/hotfix/UpdateKnownFormatterMapping

Fix missing Formatter mappings

Author: mayuki

src/MagicOnion.Client.SourceGenerator/CodeAnalysis/SerializationFormatterNameMapper.cs

@@ -83,18 +83,30 @@ class MessagePackWellKnownSerializationTypes : IWellKnownSerializationTypes
         public IReadOnlyDictionary<string, string> GenericFormattersMap { get; } = new Dictionary<string, string>
         {
             {"global::System.Nullable<>", "global::MessagePack.Formatters.NullableFormatter" },
+            // https://github.com/MessagePack-CSharp/MessagePack-CSharp/blob/v3.0.300/src/MessagePack/Resolvers/DynamicGenericResolver.cs#L52
             {"global::System.Collections.Generic.List<>", "global::MessagePack.Formatters.ListFormatter" },
+            {"global::System.Collections.Generic.LinkedList<>", "global::MessagePack.Formatters.LinkedListFormatter" },
+            {"global::System.Collections.Generic.Queue<>", "global::MessagePack.Formatters.QueueFormatter" },
+            //{"global::System.Collections.Generic.PriorityQueue<,>", "global::MessagePack.Formatters.PriorityQueueFormatter" },
+            {"global::System.Collections.Generic.Stack<>", "global::MessagePack.Formatters.StackFormatter" },
+            {"global::System.Collections.Generic.HashSet<>", "global::MessagePack.Formatters.HashSetFormatter" },
+            {"global::System.Collections.ObjectModel.ReadOnlyCollection<>", "global::MessagePack.Formatters.ReadOnlyCollectionFormatter" },
             {"global::System.Collections.Generic.IList<>", "global::MessagePack.Formatters.InterfaceListFormatter2" },
-            {"global::System.Collections.Generic.IReadOnlyList<>", "global::MessagePack.Formatters.InterfaceReadOnlyListFormatter" },
-            {"global::System.Collections.Generic.Dictionary<,>", "global::MessagePack.Formatters.DictionaryFormatter"},
-            {"global::System.Collections.Generic.IDictionary<,>", "global::MessagePack.Formatters.InterfaceDictionaryFormatter"},
-            {"global::System.Collections.Generic.IReadOnlyDictionary<,>", "global::MessagePack.Formatters.InterfaceReadOnlyDictionaryFormatter"},
             {"global::System.Collections.Generic.ICollection<>", "global::MessagePack.Formatters.InterfaceCollectionFormatter2" },
-            {"global::System.Collections.Generic.IReadOnlyCollection<>", "global::MessagePack.Formatters.InterfaceReadOnlyCollectionFormatter" },
             {"global::System.Collections.Generic.IEnumerable<>", "global::MessagePack.Formatters.InterfaceEnumerableFormatter" },
-            {"global::System.Collections.Generic.KeyValuePair<,>", "global::MessagePack.Formatters.KeyValuePairFormatter" },
+            {"global::System.Collections.Generic.Dictionary<,>", "global::MessagePack.Formatters.DictionaryFormatter"},
+            {"global::System.Collections.Generic.IDictionary<,>", "global::MessagePack.Formatters.InterfaceDictionaryFormatter"},
+            {"global::System.Collections.Generic.SortedDictionary<,>", "global::MessagePack.Formatters.SortedDictionaryFormatter"},
+            {"global::System.Collections.Generic.SortedList<,>", "global::MessagePack.Formatters.SortedListFormatter"},
             {"global::System.Linq.ILookup<,>", "global::MessagePack.Formatters.InterfaceLookupFormatter" },
             {"global::System.Linq.IGrouping<,>", "global::MessagePack.Formatters.InterfaceGroupingFormatter" },
+            {"global::System.Collections.Generic.IReadOnlyList<>", "global::MessagePack.Formatters.InterfaceReadOnlyListFormatter" },
+            {"global::System.Collections.Generic.IReadOnlyCollection<>", "global::MessagePack.Formatters.InterfaceReadOnlyCollectionFormatter" },
+            {"global::System.Collections.Generic.ISet<>", "global::MessagePack.Formatters.InterfaceSetFormatter" },
+            {"global::System.Collections.Generic.IReadOnlySet<>", "global::MessagePack.Formatters.InterfaceReadOnlySetFormatter" },
+            {"global::System.Collections.ObjectModel.ReadOnlyDictionary<,>", "global::MessagePack.Formatters.ReadOnlyDictionaryFormatter"},
+            {"global::System.Collections.Generic.IReadOnlyDictionary<,>", "global::MessagePack.Formatters.InterfaceReadOnlyDictionaryFormatter"},
+            {"global::System.Collections.Generic.KeyValuePair<,>", "global::MessagePack.Formatters.KeyValuePairFormatter" },
             {"global::System.Tuple<>", "global::MessagePack.Formatters.TupleFormatter" },
             {"global::System.Tuple<,>", "global::MessagePack.Formatters.TupleFormatter" },
             {"global::System.Tuple<,,>", "global::MessagePack.Formatters.TupleFormatter" },

tests/MagicOnion.Client.SourceGenerator.Tests/GenerateGenericsTest.cs

@@ -684,7 +684,9 @@ public async Task KnownFormatters()
     {
         var source = """
         using System;
+        using System.Collections;
         using System.Collections.Generic;
+        using System.Collections.ObjectModel;
         using System.Linq;
         using System.Threading.Tasks;
         using MessagePack;
@@ -695,20 +697,35 @@ namespace TempProject
         {
             public interface IMyService : IService<IMyService>
             {
+                // https://github.com/MessagePack-CSharp/MessagePack-CSharp/blob/v3.0.300/src/MessagePack/Resolvers/DynamicGenericResolver.cs#L52
                 UnaryResult<List<MyResponse>>                        MethodList(List<int> args);
+                UnaryResult<LinkedList<MyResponse>>                  MethodLinkedList(LinkedList<int> args);
+                UnaryResult<Queue<MyResponse>>                       MethodQueue();
+                //UnaryResult<PriorityQueue<int,MyResponse>>           MethodPriorityQueue();
+                UnaryResult<Stack<MyResponse>>                       MethodStack();
+                UnaryResult<HashSet<MyResponse>>                     MethodHashSet();
+                UnaryResult<ReadOnlyCollection<MyResponse>>          MethodROCollection();
+        
                 UnaryResult<IList<MyResponse>>                       MethodIList();
-                UnaryResult<IReadOnlyList<MyResponse>>               MethodIROList();
+                UnaryResult<ICollection<MyResponse>>                 MethodICollection();
+                UnaryResult<IEnumerable<MyResponse>>                 MethodIEnumerable();
         
                 UnaryResult<Dictionary<string, MyResponse>>          MethodDictionary();
                 UnaryResult<IDictionary<string, MyResponse>>         MethodIDictionary();
-                UnaryResult<IReadOnlyDictionary<string, MyResponse>> MethodIRODictionary();
-        
-                UnaryResult<IEnumerable<MyResponse>>                 MethodIEnumerable();
-                UnaryResult<ICollection<MyResponse>>                 MethodICollection();
-                UnaryResult<IReadOnlyCollection<MyResponse>>         MethodIROCollection();
+                UnaryResult<SortedDictionary<string, MyResponse>>    MethodSortedDictionary();
+                UnaryResult<SortedList<int, MyResponse>>             MethodSortedList();
         
                 UnaryResult<ILookup<int, MyResponse>>                MethodILookup();
                 UnaryResult<IGrouping<int, MyResponse>>              MethodIGrouping();
+        
+                UnaryResult<ISet<MyResponse>>                        MethodISet();
+                UnaryResult<IReadOnlySet<MyResponse>>                MethodIROSet();
+        
+                UnaryResult<IReadOnlyCollection<MyResponse>>         MethodIROCollection();
+                UnaryResult<IReadOnlyList<MyResponse>>               MethodIROList();
+                UnaryResult<IReadOnlyDictionary<string, MyResponse>> MethodIRODictionary();
+                UnaryResult<ReadOnlyDictionary<string, MyResponse>>  MethodRODictionary();
+        
             }
             public class MyResponse
             {