Fix #47 Translate FromResult<T> properly when type parameter is speci…

…fied explicitly
zompinc · Jan 21, 2024 · 0a03982 · 0a03982
1 parent 23e00d5
commit 0a03982
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs b/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs
@@ -433,7 +433,14 @@ bool IsValidParameter(ParameterSyntax ps)
             return UnwrapExtension(@base, isMemory, reducedFrom, memberAccess.Expression);
         }
 
-        if (memberAccess.Name is not IdentifierNameSyntax { Identifier.ValueText: { } name })
+        var name = memberAccess.Name switch
+        {
+            IdentifierNameSyntax ins2 => ins2.Identifier.ValueText,
+            GenericNameSyntax gns => gns.Identifier.ValueText,
+            _ => null,
+        };
+
+        if (name is null)
         {
             return @base;
         }

diff --git a/tests/Generator.Tests/UnitTests.cs b/tests/Generator.Tests/UnitTests.cs
@@ -167,14 +167,16 @@ public async Task MyFuncAsync<T>()
 }
 """.Verify();
 
-    [Fact]
-    public Task TaskOfT() => """
+    [Theory]
+    [InlineData(true)]
+    [InlineData(false)]
+    public Task TaskOfT(bool explicitType) => $$"""
 [CreateSyncVersion]
 public static async Task<Point> GetPointAsync()
 {
-    return await Task.FromResult(new Point(1, 2));
+    return await Task.FromResult{{(explicitType ? "<Point>" : string.Empty)}}(new Point(1, 2));
 }
-""".Verify();
+""".Verify(disableUnique: true);
 
     [Fact]
     public Task TaskOfTArray() => """