MA0042 fixer creates generic method call if generic method was called

src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseBlockingCallInAsyncContextFixer.cs

@@ -125,7 +125,12 @@ private static async Task<Document> ReplaceWithMethodName(Document document, Syn
         if (nodeToReplace is null)
             return document;
 
-        var newNode = nodeToFix.ReplaceNode(nodeToReplace, generator.IdentifierName(methodName));
+        var newMethodName = nodeToReplace switch
+        {
+            GenericNameSyntax genericName => generator.GenericName(methodName, genericName.TypeArgumentList.Arguments),
+            _ => generator.IdentifierName(methodName),
+        };
+        var newNode = nodeToFix.ReplaceNode(nodeToReplace, newMethodName);
         var newExpression = generator.AwaitExpression(newNode).Parentheses();
         editor.ReplaceNode(nodeToFix, newExpression);
 

tests/Meziantou.Analyzer.Test/Rules/DoNotUseBlockingCallInAsyncContextAnalyzer_AsyncContextTests.cs

@@ -72,6 +72,50 @@ public async Task A()
               .ValidateAsync();
     }
 
+    [Fact]
+    public async Task FixerKeepsGenericArgument()
+    {
+        await CreateProjectBuilder()
+            .WithSourceCode(
+                @"using System.Threading.Tasks;
+class Buz
+{
+    private static async Task Do()
+    {
+        [||]Bar.Foo<int>();
+    }
+}
+
+class Bar
+{
+    public static T Foo<T>()
+        => default;
+
+    public static Task<T> FooAsync<T>()
+        => Task.FromResult(default(T));
+}")
+            .ShouldFixCodeWith(
+                @"using System.Threading.Tasks;
+class Buz
+{
+    private static async Task Do()
+    {
+        await Bar.FooAsync<int>();
+    }
+}
+
+class Bar
+{
+    public static T Foo<T>()
+        => default;
+
+    public static Task<T> FooAsync<T>()
+        => Task.FromResult(default(T));
+}")
+            .ValidateAsync();
+    }
+
+
     [Fact]
     public async Task Async_Wait_Int32_Diagnostic()
     {