MA0100 detects using statements

meziantou · Sep 21, 2024 · ee4866d · ee4866d
1 parent 423b37f
commit ee4866d
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 0 deletions.
diff --git a/src/Meziantou.Analyzer/Rules/AwaitTaskBeforeDisposingResourcesAnalyzer.cs b/src/Meziantou.Analyzer/Rules/AwaitTaskBeforeDisposingResourcesAnalyzer.cs
@@ -73,6 +73,18 @@ private static bool IsInUsingOperation(IOperation operation)
 
                 if (parent is IUsingOperation)
                     return true;
+
+                if (parent is IBlockOperation block)
+                {
+                    foreach (var blockOperation in block.Operations)
+                    {
+                        if (blockOperation == parent)
+                            break;
+
+                        if (blockOperation is IUsingDeclarationOperation)
+                            return true;
+                    }
+                }
             }
 
             return false;

diff --git a/tests/Meziantou.Analyzer.Test/Rules/AwaitTaskBeforeDisposingResourcesAnalyzerTests.cs b/tests/Meziantou.Analyzer.Test/Rules/AwaitTaskBeforeDisposingResourcesAnalyzerTests.cs
@@ -465,4 +465,47 @@ await CreateProjectBuilder()
                 .WithSourceCode(originalCode)
                 .ValidateAsync();
     }
+
+    [Fact]
+    public async Task ReturnInUsingStatement()
+    {
+        var originalCode = """
+            class TestClass
+            {
+                System.Threading.Tasks.Task Test()
+                {
+                    using var disposable = (System.IDisposable)null;
+                    [||]return System.Threading.Tasks.Task.Delay(1);
+                }
+            }
+            """;
+
+        await CreateProjectBuilder()
+                .WithSourceCode(originalCode)
+                .WithLanguageVersion(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp8)
+                .ValidateAsync();
+    }
+
+    [Fact]
+    public async Task UsingBlockBeforeAReturn()
+    {
+        var originalCode = """
+            class TestClass
+            {
+                System.Threading.Tasks.Task Test()
+                {
+                    using (var disposable = (System.IDisposable)null)
+                    {
+                    }
+
+                    return System.Threading.Tasks.Task.Delay(1);
+                }
+            }
+            """;
+
+        await CreateProjectBuilder()
+                .WithSourceCode(originalCode)
+                .WithLanguageVersion(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp8)
+                .ValidateAsync();
+    }
 }