Check if foreach contains await (RCS1235)

dotnet · Mar 29, 2022 · ab1fd3a · ab1fd3a
1 parent db53df2
commit ab1fd3a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/src/Analyzers/CSharp/Analysis/OptimizeMethodCallAnalysis.cs b/src/Analyzers/CSharp/Analysis/OptimizeMethodCallAnalysis.cs
@@ -327,12 +327,8 @@ public static void OptimizeAdd(SyntaxNodeAnalysisContext context, in SimpleMembe
                 if (invocation.Parent.IsParentKind(SyntaxKind.ForEachStatement))
                 {
                     forEachStatement = (ForEachStatementSyntax)invocation.Parent.Parent;
-
-                    if (forEachStatement.AwaitKeyword.IsKind(SyntaxKind.AwaitKeyword))
-                        return;
                 }
-
-                if (invocation.Parent.IsParentKind(SyntaxKind.Block)
+                else if (invocation.Parent.IsParentKind(SyntaxKind.Block)
                     && invocation.Parent.Parent.IsParentKind(SyntaxKind.ForEachStatement))
                 {
                     block = (BlockSyntax)invocation.Parent.Parent;
@@ -342,7 +338,7 @@ public static void OptimizeAdd(SyntaxNodeAnalysisContext context, in SimpleMembe
                 }
             }
 
-            if (forEachStatement != null
+            if (forEachStatement?.AwaitKeyword.IsKind(SyntaxKind.AwaitKeyword) == false
                 && invocation.ArgumentList.Arguments[0].Expression is IdentifierNameSyntax identifierName
                 && identifierName.Identifier.ValueText == forEachStatement.Identifier.ValueText)
             {

diff --git a/src/Tests/Analyzers.Tests/RCS1235OptimizeMethodCallTests.cs b/src/Tests/Analyzers.Tests/RCS1235OptimizeMethodCallTests.cs
@@ -512,6 +512,30 @@ async Task M()
 ");
         }
 
+        [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.OptimizeMethodCall)]
+        public async Task TestNoDiagnostic_OptimizeAdd_Await2()
+        {
+            await VerifyNoDiagnosticAsync(@"
+using System.Threading.Tasks;
+using System.Collections.Generic;
+
+class C
+{
+    async Task M()
+    {
+        var items = new List<string>();
+        IAsyncEnumerable<string> items2 = null;
+
+        await foreach (var item in items2)
+        {
+            items.Add(item);
+        }
+
+    }
+}
+");
+        }
+
         [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.OptimizeMethodCall)]
         public async Task TestNoDiagnostic_CallCompareOrdinalInsteadOfCompare_NotStringComparisonOrdinal()
         {