Merge pull request #1097 from AArnott/fixFeedbackTicket1645072

Fix VSTHRD110 failure to handle unobserved tasks in finalizers
microsoft · Oct 21, 2022 · 0a1c1b1 · 0a1c1b1
2 parents d575259 + 0f0921d
commit 0a1c1b1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/CSharpUtils.cs b/src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/CSharpUtils.cs
@@ -92,6 +92,12 @@ internal static ContainingFunctionData GetContainingFunction(CSharpSyntaxNode sy
                             BlockSyntax block => o.WithBody(block),
                             _ => throw new NotSupportedException(),
                         },
+                        DestructorDeclarationSyntax d => (CSharpSyntaxNode newBody) => newBody switch
+                        {
+                            ArrowExpressionClauseSyntax expr => d.WithExpressionBody(expr),
+                            BlockSyntax block => d.WithBody(block),
+                            _ => throw new NotSupportedException(),
+                        },
                         _ => throw new NotSupportedException(),
                     };
                     return new ContainingFunctionData(method, method.Modifiers.Any(SyntaxKind.AsyncKeyword), method.ParameterList, method.Body, bodyReplacement);

diff --git a/...VisualStudio.Threading.Analyzers.Tests/VSTHRD110ObserveResultOfAsyncCallsAnalyzerTests.cs b/...VisualStudio.Threading.Analyzers.Tests/VSTHRD110ObserveResultOfAsyncCallsAnalyzerTests.cs
@@ -402,6 +402,30 @@ async Task Foo(Test? tester)
             await Verify.VerifyAnalyzerAsync(test);
         }
 
+        [Fact]
+        public async Task TaskInFinalizer()
+        {
+            string test = @"
+using System;
+using System.Threading.Tasks;
+
+public class Test : IAsyncDisposable
+{
+    ~Test()
+    {
+        Task.[|Run|](async () => await DisposeAsync().ConfigureAwait(false));
+    }
+
+    public async ValueTask DisposeAsync()
+    {
+        await Task.Delay(5000);
+    }
+}
+";
+
+            await Verify.VerifyAnalyzerAsync(test);
+        }
+
         private DiagnosticResult CreateDiagnostic(int line, int column, int length)
             => Verify.Diagnostic().WithSpan(line, column, line, column + length);
     }