Handle Types with multiple generic arguments

byme8 · Jul 14, 2024 · e6e1f3b · e6e1f3b
1 parent 1071214
commit e6e1f3b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/Dapper.Json.SourceGenerator/Utils.cs b/src/Dapper.Json.SourceGenerator/Utils.cs
@@ -155,6 +155,8 @@ public static string ToSafeGlobalName(this ISymbol symbol)
                 .Replace("[]", "Array")
                 .Replace("<", "Of")
                 .Replace(">", "")
+                .Replace(",", "And")
+                .Replace(" ", "")
                 .Replace(".", "");
         }
 

diff --git a/src/Dapper.Json.Tests/MainTest.TypeMappingForDictionariesAreGenerated.verified.txt b/src/Dapper.Json.Tests/MainTest.TypeMappingForDictionariesAreGenerated.verified.txt
@@ -0,0 +1,3 @@
+[
+  Dictionary`2
+]
diff --git a/src/Dapper.Json.Tests/MainTest.cs b/src/Dapper.Json.Tests/MainTest.cs
@@ -54,6 +54,17 @@ public async Task TypeMappingForTuplesAreGenerated()
 
         await Verify(handlers);
     }
+
+    [Fact]
+    public async Task TypeMappingForDictionariesAreGenerated()
+    {
+        var newProject = await TestProject.Project.ReplacePartsOfDocumentAsync("Program.cs",
+            ("public Json<string[]> Emails { get; set; }", "public Json<System.Collections.Generic.Dictionary<string,string>> Dict { get; set; }"));
+
+        var handlers = await Execute(newProject);
+
+        await Verify(handlers);
+    }
 
     [Fact]
     public async Task TypeMappingForGenericsAreIgnored()