Merge pull request #3268 from sharwell/empty-record

Allow semicolon for record types without a body
DotNetAnalyzers · Dec 7, 2020 · d3d46e7 · d3d46e7
2 parents b17a349 + c52d179
commit d3d46e7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/...eCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/ReadabilityRules/SA1106CSharp9UnitTests.cs b/...eCop.Analyzers/StyleCop.Analyzers.Test.CSharp9/ReadabilityRules/SA1106CSharp9UnitTests.cs
@@ -3,9 +3,29 @@
 
 namespace StyleCop.Analyzers.Test.CSharp9.ReadabilityRules
 {
+    using System.Threading;
+    using System.Threading.Tasks;
+    using Microsoft.CodeAnalysis.CSharp;
+    using Microsoft.CodeAnalysis.Testing;
     using StyleCop.Analyzers.Test.CSharp8.ReadabilityRules;
+    using Xunit;
+    using static StyleCop.Analyzers.Test.Verifiers.StyleCopCodeFixVerifier<
+        StyleCop.Analyzers.ReadabilityRules.SA1106CodeMustNotContainEmptyStatements,
+        StyleCop.Analyzers.ReadabilityRules.SA1106CodeFixProvider>;
 
     public class SA1106CSharp9UnitTests : SA1106CSharp8UnitTests
     {
+        [Fact]
+        [WorkItem(3267, "https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/3267")]
+        public async Task TestNoDiagnosticForEmptyRecordDeclarationAsync()
+        {
+            var testCode = @"public record Result(int Value);";
+
+            await new CSharpTest(LanguageVersion.CSharp9)
+            {
+                ReferenceAssemblies = ReferenceAssemblies.Net.Net50,
+                TestCode = testCode,
+            }.RunAsync(CancellationToken.None).ConfigureAwait(false);
+        }
     }
 }
diff --git a/....Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1106CodeMustNotContainEmptyStatements.cs b/....Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1106CodeMustNotContainEmptyStatements.cs
@@ -56,7 +56,8 @@ private static void HandleBaseTypeDeclaration(SyntaxNodeAnalysisContext context)
         {
             var declaration = (BaseTypeDeclarationSyntax)context.Node;
 
-            if (declaration.SemicolonToken.IsKind(SyntaxKind.SemicolonToken))
+            if (declaration.SemicolonToken.IsKind(SyntaxKind.SemicolonToken)
+                && !declaration.OpenBraceToken.IsKind(SyntaxKind.None))
             {
                 context.ReportDiagnostic(Diagnostic.Create(Descriptor, declaration.SemicolonToken.GetLocation()));
             }