Add CompletedTaskAttribute support for VSTHRD003

Co-authored-by: drewnoakes <[email protected]>

Author: Copilot

src/Microsoft.VisualStudio.Threading.Analyzers.CSharp/VSTHRD003UseJtfRunAsyncAnalyzer.cs

@@ -73,6 +73,14 @@ public override void Initialize(AnalysisContext context)
 
     private static bool IsSymbolAlwaysOkToAwait(ISymbol? symbol)
     {
+        // Check if the symbol has the CompletedTaskAttribute
+        if (symbol?.GetAttributes().Any(attr =>
+            attr.AttributeClass?.Name == Types.CompletedTaskAttribute.TypeName &&
+            attr.AttributeClass.BelongsToNamespace(Types.CompletedTaskAttribute.Namespace)) == true)
+        {
+            return true;
+        }
+
         if (symbol is IFieldSymbol field)
         {
             // Allow the TplExtensions.CompletedTask and related fields.
@@ -288,6 +296,12 @@ private void AnalyzeAwaitExpression(SyntaxNodeAnalysisContext context)
 
                 break;
             case IMethodSymbol methodSymbol:
+                // Check if the method itself has the CompletedTaskAttribute
+                if (IsSymbolAlwaysOkToAwait(methodSymbol))
+                {
+                    return null;
+                }
+
                 if (Utils.IsTask(methodSymbol.ReturnType) && focusedExpression is InvocationExpressionSyntax invocationExpressionSyntax)
                 {
                     // Consider all arguments

src/Microsoft.VisualStudio.Threading.Analyzers.CodeFixes/buildTransitive/AdditionalFiles/CompletedTaskAttribute.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+#if !COMPLETEDTASKATTRIBUTE_INCLUDED
+
+namespace Microsoft.VisualStudio.Threading;
+
+/// <summary>
+/// Indicates that a property, method, or field returns a task that is already completed.
+/// This suppresses VSTHRD003 warnings when awaiting the returned task.
+/// </summary>
+/// <remarks>
+/// Apply this attribute to properties, methods, or fields that return cached, pre-completed tasks
+/// such as singleton instances with well-known immutable values.
+/// The VSTHRD003 analyzer will not report warnings when these members are awaited,
+/// as awaiting an already-completed task does not pose a risk of deadlock.
+/// </remarks>
+[System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Method | System.AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+internal sealed class CompletedTaskAttribute : System.Attribute
+{
+}
+
+#pragma warning disable SA1403 // File may only contain a single namespace
+#pragma warning disable SA1649 // File name should match first type name
+internal static class CompletedTaskAttributeDefinition
+{
+    internal const bool Included = true;
+}
+#pragma warning restore SA1649 // File name should match first type name
+#pragma warning restore SA1403 // File may only contain a single namespace
+
+#define COMPLETEDTASKATTRIBUTE_INCLUDED
+#endif

src/Microsoft.VisualStudio.Threading.Analyzers.CodeFixes/buildTransitive/Microsoft.VisualStudio.Threading.Analyzers.targets

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <AdditionalFiles Include="$(MSBuildThisFileDirectory)AdditionalFiles\**">
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)AdditionalFiles\*.txt">
       <Visible>false</Visible>
     </AdditionalFiles>
+    <Compile Include="$(MSBuildThisFileDirectory)AdditionalFiles\*.cs" Link="%(Filename)%(Extension)">
+      <Visible>false</Visible>
+    </Compile>
   </ItemGroup>
 </Project>

src/Microsoft.VisualStudio.Threading.Analyzers/Types.cs

@@ -246,4 +246,11 @@ public static class TypeLibTypeAttribute
 
         public static readonly ImmutableArray<string> Namespace = Namespaces.SystemRuntimeInteropServices;
     }
+
+    public static class CompletedTaskAttribute
+    {
+        public const string TypeName = "CompletedTaskAttribute";
+
+        public static readonly ImmutableArray<string> Namespace = Namespaces.MicrosoftVisualStudioThreading;
+    }
 }

test/Microsoft.VisualStudio.Threading.Analyzers.Tests/VSTHRD003UseJtfRunAsyncAnalyzerTests.cs

@@ -1453,6 +1453,195 @@ static async Task ListenAndWait()
         await CSVerify.VerifyAnalyzerAsync(test);
     }
 
+    [Fact]
+    public async Task DoNotReportWarningWhenAwaitingPropertyWithCompletedTaskAttribute()
+    {
+        var test = @"
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.Threading
+{
+    [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Method | System.AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    internal sealed class CompletedTaskAttribute : System.Attribute
+    {
+    }
+}
+
+class Tests
+{
+    [Microsoft.VisualStudio.Threading.CompletedTask]
+    private static Task MyCompletedTask { get; } = Task.CompletedTask;
+
+    async Task GetTask()
+    {
+        await MyCompletedTask;
+    }
+}
+";
+        await CSVerify.VerifyAnalyzerAsync(test);
+    }
+
+    [Fact]
+    public async Task DoNotReportWarningWhenAwaitingFieldWithCompletedTaskAttribute()
+    {
+        var test = @"
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.Threading
+{
+    [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Method | System.AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    internal sealed class CompletedTaskAttribute : System.Attribute
+    {
+    }
+}
+
+class Tests
+{
+    [Microsoft.VisualStudio.Threading.CompletedTask]
+    private static readonly Task MyCompletedTask = Task.CompletedTask;
+
+    async Task GetTask()
+    {
+        await MyCompletedTask;
+    }
+}
+";
+        await CSVerify.VerifyAnalyzerAsync(test);
+    }
+
+    [Fact]
+    public async Task DoNotReportWarningWhenAwaitingMethodWithCompletedTaskAttribute()
+    {
+        var test = @"
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.Threading
+{
+    [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Method | System.AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    internal sealed class CompletedTaskAttribute : System.Attribute
+    {
+    }
+}
+
+class Tests
+{
+    [Microsoft.VisualStudio.Threading.CompletedTask]
+    private static Task GetCompletedTask() => Task.CompletedTask;
+
+    async Task TestMethod()
+    {
+        await GetCompletedTask();
+    }
+}
+";
+        await CSVerify.VerifyAnalyzerAsync(test);
+    }
+
+    [Fact]
+    public async Task DoNotReportWarningWhenReturningPropertyWithCompletedTaskAttribute()
+    {
+        var test = @"
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.Threading
+{
+    [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Method | System.AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    internal sealed class CompletedTaskAttribute : System.Attribute
+    {
+    }
+}
+
+class Tests
+{
+    [Microsoft.VisualStudio.Threading.CompletedTask]
+    private static Task MyCompletedTask { get; } = Task.CompletedTask;
+
+    Task GetTask() => MyCompletedTask;
+}
+";
+        await CSVerify.VerifyAnalyzerAsync(test);
+    }
+
+    [Fact]
+    public async Task ReportWarningWhenAwaitingPropertyWithoutCompletedTaskAttribute()
+    {
+        var test = @"
+using System.Threading.Tasks;
+
+class Tests
+{
+    private static Task MyTask { get; } = Task.Run(() => {});
+
+    async Task GetTask()
+    {
+        await [|MyTask|];
+    }
+}
+";
+        await CSVerify.VerifyAnalyzerAsync(test);
+    }
+
+    [Fact]
+    public async Task DoNotReportWarningWhenAwaitingTaskGenericPropertyWithCompletedTaskAttribute()
+    {
+        var test = @"
+using System.Threading.Tasks;
+
+namespace Microsoft.VisualStudio.Threading
+{
+    [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Method | System.AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    internal sealed class CompletedTaskAttribute : System.Attribute
+    {
+    }
+}
+
+class Tests
+{
+    [Microsoft.VisualStudio.Threading.CompletedTask]
+    private static Task<int> MyCompletedTask { get; } = Task.FromResult(42);
+
+    async Task<int> GetResult()
+    {
+        return await MyCompletedTask;
+    }
+}
+";
+        await CSVerify.VerifyAnalyzerAsync(test);
+    }
+
+    [Fact]
+    public async Task DoNotReportWarningWhenAwaitingPropertyWithCompletedTaskAttributeInJtfRun()
+    {
+        var test = @"
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Threading;
+
+namespace Microsoft.VisualStudio.Threading
+{
+    [System.AttributeUsage(System.AttributeTargets.Property | System.AttributeTargets.Method | System.AttributeTargets.Field, Inherited = false, AllowMultiple = false)]
+    internal sealed class CompletedTaskAttribute : System.Attribute
+    {
+    }
+}
+
+class Tests
+{
+    [Microsoft.VisualStudio.Threading.CompletedTask]
+    private static Task MyCompletedTask { get; } = Task.CompletedTask;
+
+    void TestMethod()
+    {
+        JoinableTaskFactory jtf = null;
+        jtf.Run(async delegate
+        {
+            await MyCompletedTask;
+        });
+    }
+}
+";
+        await CSVerify.VerifyAnalyzerAsync(test);
+    }
+
     private DiagnosticResult CreateDiagnostic(int line, int column, int length) =>
         CSVerify.Diagnostic().WithSpan(line, column, line, column + length);
 }