Update SA1503 and SA1106 for using declarations

Author: sharwell

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/LayoutRules/SA1503CSharp8UnitTests.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#nullable disable
-
 namespace StyleCop.Analyzers.Test.CSharp8.LayoutRules
 {
     using System.Threading;
@@ -32,5 +30,69 @@ public void Method()
 
             await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(3004, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3004")]
+        public async Task TestUsingDeclarationWithFollowingStatementAsync()
+        {
+            var testCode = @"
+using System.IO;
+public class Foo
+{
+    public int Method()
+    {
+        using var stream = new MemoryStream();
+        return stream.ReadByte();
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        [Fact]
+        [WorkItem(3004, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3004")]
+        public async Task TestAwaitUsingDeclarationStatementAsync()
+        {
+            var testCode = @"
+using System;
+using System.Threading.Tasks;
+
+public class Foo
+{
+    public async Task MethodAsync()
+    {
+        await using var resource = new AsyncDisposable();
+        await Task.Yield();
+    }
+
+    private sealed class AsyncDisposable : IAsyncDisposable
+    {
+        public ValueTask DisposeAsync()
+        {
+            return default;
+        }
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        [Fact]
+        [WorkItem(3004, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3004")]
+        public async Task TestMultipleUsingDeclarationsAsync()
+        {
+            var testCode = @"
+using System.IO;
+public class Foo
+{
+    public void Method()
+    {
+        using MemoryStream stream1 = new MemoryStream(), stream2 = new MemoryStream();
+        _ = stream1.ReadByte() + stream2.ReadByte();
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

StyleCop.Analyzers/StyleCop.Analyzers.Test.CSharp8/ReadabilityRules/SA1106CSharp8UnitTests.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Tunnel Vision Laboratories, LLC. All Rights Reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
-#nullable disable
-
 namespace StyleCop.Analyzers.Test.CSharp8.ReadabilityRules
 {
     using System.Threading;
@@ -32,5 +30,69 @@ public void Method()
 
             await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
         }
+
+        [Fact]
+        [WorkItem(3004, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3004")]
+        public async Task TestUsingDeclarationWithFollowingStatementAsync()
+        {
+            var testCode = @"
+using System.IO;
+public class Foo
+{
+    public int Method()
+    {
+        using var stream = new MemoryStream();
+        return stream.ReadByte();
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        [Fact]
+        [WorkItem(3004, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3004")]
+        public async Task TestAwaitUsingDeclarationAsync()
+        {
+            var testCode = @"
+using System;
+using System.Threading.Tasks;
+
+public class Foo
+{
+    public async Task MethodAsync()
+    {
+        await using var resource = new AsyncDisposable();
+        await Task.Yield();
+    }
+
+    private sealed class AsyncDisposable : IAsyncDisposable
+    {
+        public ValueTask DisposeAsync()
+        {
+            return default;
+        }
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
+
+        [Fact]
+        [WorkItem(3004, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3004")]
+        public async Task TestMultipleUsingDeclarationsAsync()
+        {
+            var testCode = @"
+using System.IO;
+public class Foo
+{
+    public void Method()
+    {
+        using MemoryStream stream1 = new MemoryStream(), stream2 = new MemoryStream();
+        _ = stream1.ReadByte() + stream2.ReadByte();
+    }
+}";
+
+            await VerifyCSharpDiagnosticAsync(testCode, DiagnosticResult.EmptyDiagnosticResults, CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }

documentation/SA1106.md

@@ -23,6 +23,8 @@ The C# code contains an extra semicolon.
 
 A violation of this rule occurs when the code contain an extra semicolon. Syntactically, this results in an extra, empty statement in the code.
 
+C# 8 using declarations (e.g. `using var stream = new MemoryStream();` or `await using`) end with a required semicolon that is part of the declaration syntax. This semicolon is not considered an empty statement and does not trigger this rule.
+
 ## How to fix violations
 
 To fix a violation of this rule, remove the unneeded semicolon.

documentation/SA1503.md

@@ -50,6 +50,8 @@ if (true)
 }
 ```
 
+C# 8 using declarations intentionally omit a braced block. Statements like `using var stream = new MemoryStream();` (or `await using` for `IAsyncDisposable`) are valid and will not be flagged by this rule, because wrapping them in braces would alter the lifetime of the declared resource.
+
 ## How to fix violations
 
 To fix a violation of this rule, wrap the body of the statement in braces.