Fix rewriter when the sync method is in the same extensions class (#110)

Pull request #108 fixed EF Core async to sync generation. EF Core async methods are found in the `EntityFrameworkQueryableExtensions` class, so a mapping from EntityFrameworkQueryableExtensions to System.Linq.Queryable was added.

Unfortunately, this was not enough. The `EntityFrameworkQueryableExtensions` class also contains extension methods that have both an async and a sync method. For example: `ExecuteDeleteAsync` and `ExecuteDelete`.

This commit fixes the translation for those methods where both the async and sync methods are in the same extension class.

Author: 0xced

src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs

@@ -1844,7 +1844,18 @@ private InvocationExpressionSyntax UnwrapExtension(InvocationExpressionSyntax ie
         var newName = reducedFrom.Name;
         newName = changeMemoryToSpan ? GetNewName(reducedFrom) : RemoveAsync(newName);
 
-        var fullyQualifiedName = $"{MakeType(reducedFrom.ContainingType)}.{newName}";
+        var newNameExistsInContainingType = semanticModel.Compilation.References
+            .Select(semanticModel.Compilation.GetAssemblyOrModuleSymbol)
+            .Append(semanticModel.Compilation.Assembly)
+            .OfType<IAssemblySymbol>()
+            .Select(assemblySymbol => assemblySymbol.GetTypeByMetadataName(reducedFrom.ContainingType.ToString()))
+            .OfType<INamedTypeSymbol>()
+            .SelectMany(symbol => symbol.GetMembers(newName))
+            .Any();
+
+        var fullyQualifiedName = newNameExistsInContainingType
+            ? $"{reducedFrom.ContainingType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)}.{newName}"
+            : $"{MakeType(reducedFrom.ContainingType)}.{newName}";
 
         var es = (ies.Expression switch
         {

tests/GenerationSandbox.Tests/EntityFrameworkQueryableExtensions.cs

@@ -1,8 +1,7 @@
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Zomp.SyncMethodGenerator.IntegrationTests;
+namespace GenerationSandbox.Tests;
 
 using Microsoft.EntityFrameworkCore;
 
@@ -14,12 +13,18 @@ public partial class EntityFrameworkQueryableExtensions
     /// <summary>
     /// Test method.
     /// </summary>
-    /// <param name="source">The source.</param>
+    /// <param name="dbContext">The db context.</param>
     /// <param name="cancellationToken">The cancellation token.</param>
     /// <returns>The result.</returns>
     [Zomp.SyncMethodGenerator.CreateSyncVersion]
-    public async Task<bool> QueryableExtensionAsync(IQueryable<object> source, CancellationToken cancellationToken)
+    public async Task<int> QueryableExtensionAsync(DbContext dbContext, CancellationToken cancellationToken)
     {
-        return await source.AnyAsync(cancellationToken);
+        var dbSet = dbContext.Set<object>();
+        if (await dbSet.AnyAsync(cancellationToken))
+        {
+            return await dbSet.ExecuteDeleteAsync(cancellationToken);
+        }
+
+        return 0;
     }
 }

tests/Generator.Tests/ExtensionMethodTests.cs

@@ -122,7 +122,6 @@ public async IAsyncEnumerable<T> WhereLessThan(T threshold)
 
     [Fact]
     public Task EntityFrameworkQueryableExtensions() => """
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -133,9 +132,15 @@ namespace Zomp.SyncMethodGenerator.IntegrationTests
     public partial class EntityFrameworkQueryableExtensions
     {
         [Zomp.SyncMethodGenerator.CreateSyncVersion]
-        public async Task<bool> QueryableExtensionAsync(IQueryable<object> source, CancellationToken cancellationToken)
+        public async Task<int> QueryableExtensionAsync(DbContext dbContext, CancellationToken cancellationToken)
         {
-            return await source.AnyAsync(cancellationToken);
+            var dbSet = dbContext.Set<object>();
+            if (await dbSet.AnyAsync(cancellationToken))
+            {
+                return await dbSet.ExecuteDeleteAsync(cancellationToken);
+            }
+            
+            return 0;
         }
     }
 }

tests/Generator.Tests/Snapshots/ExtensionMethodTests.EntityFrameworkQueryableExtensions#Zomp.SyncMethodGenerator.IntegrationTests.EntityFrameworkQueryableExtensions.QueryableExtensionAsync.g.verified.cs

@@ -5,9 +5,15 @@ namespace Zomp.SyncMethodGenerator.IntegrationTests
 {
     public partial class EntityFrameworkQueryableExtensions
     {
-        public bool QueryableExtension(global::System.Linq.IQueryable<object> source)
+        public int QueryableExtension(global::Microsoft.EntityFrameworkCore.DbContext dbContext)
         {
-            return global::System.Linq.Queryable.Any(source);
+            var dbSet = dbContext.Set<object>();
+            if (global::System.Linq.Queryable.Any(dbSet))
+            {
+                return global::Microsoft.EntityFrameworkCore.EntityFrameworkQueryableExtensions.ExecuteDelete(dbSet);
+            }
+            
+            return 0;
         }
     }
 }