Fix deconstruct and fully qualified types in async foreach (#68)

* Fix deconstruct and fully qualified types in async foreach

* Move tests

src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs

@@ -1026,12 +1026,20 @@ bool ShouldRemoveArgumentLocal(ArgumentSyntax arg, int index)
         var @base = (ForEachStatementSyntax)base.VisitForEachStatement(node)!;
         if (TypeAlreadyQualified(node.Type))
         {
-            return @base;
+            return @base.WithAwaitKeyword(default);
         }
 
         return @base.WithAwaitKeyword(default).WithType(ProcessType(node.Type)).WithTriviaFrom(@base);
     }
 
+    /// <inheritdoc/>
+    public override SyntaxNode? VisitForEachVariableStatement(ForEachVariableStatementSyntax node)
+    {
+        var @base = (ForEachVariableStatementSyntax)base.VisitForEachVariableStatement(node)!;
+
+        return @base.WithAwaitKeyword(default).WithTriviaFrom(@base);
+    }
+
     public override SyntaxNode? VisitParenthesizedLambdaExpression(ParenthesizedLambdaExpressionSyntax node)
     {
         var @base = (ParenthesizedLambdaExpressionSyntax)base.VisitParenthesizedLambdaExpression(node)!;

tests/Generator.Tests/Snapshots/SystemAsyncExtensionsTests.AsyncForEachDeconstruct#SumAsync.g.verified.cs

@@ -0,0 +1,12 @@
+//HintName: Test.Class.SumAsync.g.cs
+int Sum(global::System.Collections.Generic.IEnumerable<(int a, int b)> enumerable)
+{
+    int sum = 0;
+
+    foreach (var (a, b) in enumerable)
+    {
+        sum += a + b;
+    }
+
+    return sum;
+}

tests/Generator.Tests/Snapshots/SystemAsyncExtensionsTests.AsyncForEachQualified#SumAsync.g.verified.cs

@@ -0,0 +1,15 @@
+//HintName: Test.Class.SumAsync.g.cs
+int Sum(global::System.Collections.Generic.IEnumerable<int?> enumerable)
+{
+    int sum = 0;
+
+    foreach (int? i in enumerable)
+    {
+        if (i.HasValue)
+        {
+            sum += i.Value;
+        }
+    }
+
+    return sum;
+}

tests/Generator.Tests/SystemAsyncExtensionsTests.cs

@@ -58,4 +58,39 @@ public async Task InvokeAsync()
 }
 """.Verify(disableUnique: true, sourceType: SourceType.Full);
     }
+
+    [Fact]
+    public Task AsyncForEachQualified() => """
+[CreateSyncVersion]
+async Task<int> SumAsync(IAsyncEnumerable<int?> enumerable)
+{
+    int sum = 0;
+
+    await foreach (int? i in enumerable)
+    {
+        if (i.HasValue)
+        {
+            sum += i.Value;
+        }
+    }
+
+    return sum;
+}
+""".Verify();
+
+    [Fact]
+    public Task AsyncForEachDeconstruct() => """
+[CreateSyncVersion]
+async Task<int> SumAsync(IAsyncEnumerable<(int a, int b)> enumerable)
+{
+    int sum = 0;
+
+    await foreach (var (a, b) in enumerable)
+    {
+        sum += a + b;
+    }
+
+    return sum;
+}
+""".Verify();
 }