Fix RCS1261 (#1374)

dotnet · Jan 23, 2024 · 301a51a · 301a51a
1 parent 72d8f0c
commit 301a51a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix analyzer [RCS1055](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1055) ([PR](https://github.com/dotnet/roslynator/pull/1361))
+- Fix analyzer [RCS1261](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1261) ([PR](https://github.com/dotnet/roslynator/pull/1374))
 
 ## [4.9.0] - 2024-01-10
 

diff --git a/src/Analyzers/CSharp/Analysis/DisposeResourceAsynchronouslyAnalyzer.cs b/src/Analyzers/CSharp/Analysis/DisposeResourceAsynchronouslyAnalyzer.cs
@@ -107,6 +107,10 @@ private static void Analyze(SyntaxNodeAnalysisContext context, StatementSyntax s
                 Analyze(context, anonymousMethod.Modifiers, usingKeyword, anonymousMethod);
                 break;
             }
+            else if (node is LockStatementSyntax)
+            {
+                return;
+            }
         }
     }
 

diff --git a/src/Tests/Analyzers.Tests/RCS1261DisposeResourceAsynchronouslyTests.cs b/src/Tests/Analyzers.Tests/RCS1261DisposeResourceAsynchronouslyTests.cs
@@ -919,6 +919,30 @@ internal class Disposable : IDisposable, IAsyncDisposable
     public void Dispose() => throw new NotImplementedException();
     public ValueTask DisposeAsync() => throw new NotImplementedException();
 }
+");
+    }
+
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.DisposeResourceAsynchronously)]
+    public async Task TestNoDiagnostic_LockStatement()
+    {
+        await VerifyNoDiagnosticAsync(@"
+using System.IO;
+using System.Threading.Tasks;
+
+abstract class C
+{
+    object _lock = new();
+
+    async Task Foo()
+    {
+        lock (_lock)
+        {
+            using FileStream fs = new(""test.txt"", FileMode.OpenOrCreate);
+        }
+
+        await Task.Yield();
+    }
+}
 ");
     }
 }