Fix #72 Drop configurewAwait from and await using from IAsyncDisposable

zompinc · Apr 11, 2024 · 692f3ca · 692f3ca
1 parent 2bc3cc9
commit 692f3ca
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -15,7 +15,7 @@
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Runtime.Experimental" Version="6.0.2" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
-    <PackageVersion Include="Verify.XUnit" Version="23.5.2" />
+    <PackageVersion Include="Verify.XUnit" Version="23.7.2" />
     <PackageVersion Include="xunit" Version="2.7.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
   </ItemGroup>

diff --git a/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs b/src/Zomp.SyncMethodGenerator/AsyncToSyncRewriter.cs
@@ -24,6 +24,7 @@ internal sealed class AsyncToSyncRewriter(SemanticModel semanticModel) : CSharpS
     private const string ConfiguredTaskAwaitable = "System.Runtime.CompilerServices.ConfiguredTaskAwaitable";
     private const string ConfiguredValueTaskAwaitable = "System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable";
     private const string ConfiguredCancelableAsyncEnumerable = "System.Runtime.CompilerServices.ConfiguredCancelableAsyncEnumerable";
+    private const string ConfiguredAsyncDisposable = "System.Runtime.CompilerServices.ConfiguredAsyncDisposable";
     private const string IAsyncEnumerator = "System.Collections.Generic.IAsyncEnumerator";
     private const string FromResult = "FromResult";
     private const string AsTask = "AsTask";
@@ -485,6 +486,12 @@ List<SyntaxTrivia> RemoveFirstEndIf(SyntaxTriviaList list)
         return @base;
     }
 
+    public override SyntaxNode? VisitUsingStatement(UsingStatementSyntax node)
+    {
+        var @base = (UsingStatementSyntax)base.VisitUsingStatement(node)!;
+        return @base.WithAwaitKeyword(default);
+    }
+
     /// <inheritdoc/>
     public override SyntaxNode? VisitInvocationExpression(InvocationExpressionSyntax node)
     {
@@ -1539,7 +1546,10 @@ private static ExpressionSyntax RemoveParentheses(ExpressionSyntax condition)
     private static bool IsTaskExtension(IMethodSymbol methodSymbol)
     {
         var returnType = GetNameWithoutTypeParams(methodSymbol.ReturnType);
-        return returnType is ConfiguredTaskAwaitable or ConfiguredValueTaskAwaitable or ConfiguredCancelableAsyncEnumerable;
+        return returnType is ConfiguredTaskAwaitable
+            or ConfiguredValueTaskAwaitable
+            or ConfiguredCancelableAsyncEnumerable
+            or ConfiguredAsyncDisposable;
     }
 
     private static bool CanDropEmptyStatement(StatementSyntax statement)

diff --git a/tests/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj b/tests/GenerationSandbox.Tests/GenerationSandbox.Tests.csproj
@@ -6,7 +6,7 @@
     <NoWarn>$(NoWarn);CS0219;CS0162;CS1998;CS8603;CS8619</NoWarn>
     <NoWarn>$(NoWarn);IDE0035</NoWarn>
     <NoWarn>$(NoWarn);RS1035</NoWarn>
-    <NoWarn>$(NoWarn);SA1201;SA1402;SA1404</NoWarn>
+    <NoWarn>$(NoWarn);SA1201;SA1400;SA1402;SA1404</NoWarn>
     <ImplicitUsings>false</ImplicitUsings>
     <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>

diff --git a/tests/Generator.Tests/UnitTests.cs b/tests/Generator.Tests/UnitTests.cs
@@ -311,6 +311,25 @@ public static async Task WriteAllTextAsync(string file, string contents,
 """.Verify();
 #endif
 
+    [Fact]
+    public Task PassIAsyncDisposable() => """
+
+class ImplementsBothDisposables : IDisposable, IAsyncDisposable
+{
+    public void Dispose() => throw new NotImplementedException();
+
+    public ValueTask DisposeAsync() => throw new NotImplementedException();
+}
+
+[CreateSyncVersion]
+async Task MethodAsync(ImplementsBothDisposables a)
+{
+    await using (a.ConfigureAwait(false))
+    {
+    }
+}
+""".Verify();
+
     [Fact]
     public Task CallWithTypeParameters() => """
 [CreateSyncVersion]