Fix RCS0023 (#1352)

dotnet · Jan 8, 2024 · 23b3f7d · 23b3f7d
1 parent 8ffa81f
commit 23b3f7d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix analyzer [RCS0034](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS0034) ([PR](https://github.com/dotnet/roslynator/pull/1351))
+- Fix analyzer [RCS0023](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS0023) ([PR](https://github.com/dotnet/roslynator/pull/1352))
 
 ## [4.8.0] - 2024-01-02
 

diff --git a/src/Formatting.Analyzers/CSharp/FormatTypeDeclarationBracesAnalyzer.cs b/src/Formatting.Analyzers/CSharp/FormatTypeDeclarationBracesAnalyzer.cs
@@ -43,15 +43,26 @@ private static void AnalyzeTypeDeclaration(SyntaxNodeAnalysisContext context)
 
         SyntaxToken openBrace = typeDeclaration.OpenBraceToken;
 
-        if (openBrace.IsMissing)
+        if (openBrace.IsKind(SyntaxKind.None)
+            || openBrace.IsMissing)
+        {
             return;
+        }
 
-        if (!typeDeclaration.SyntaxTree.IsSingleLineSpan(TextSpan.FromBounds(openBrace.Span.End, openBrace.GetNextToken().SpanStart)))
+        SyntaxToken closeBrace = typeDeclaration.CloseBraceToken;
+
+        if (closeBrace.IsKind(SyntaxKind.None)
+            || closeBrace.IsMissing)
+        {
             return;
+        }
 
-        DiagnosticHelpers.ReportDiagnostic(
-            context,
-            DiagnosticRules.FormatTypeDeclarationBraces,
-            openBrace);
+        if (typeDeclaration.SyntaxTree.IsSingleLineSpan(TextSpan.FromBounds(openBrace.SpanStart, closeBrace.SpanStart)))
+        {
+            DiagnosticHelpers.ReportDiagnostic(
+                context,
+                DiagnosticRules.FormatTypeDeclarationBraces,
+                openBrace);
+        }
     }
 }
diff --git a/src/Tests/Formatting.Analyzers.Tests/RCS0023FormatTypeDeclarationBracesTests.cs b/src/Tests/Formatting.Analyzers.Tests/RCS0023FormatTypeDeclarationBracesTests.cs
@@ -46,6 +46,14 @@ class C
 {
 
 }
+");
+    }
+
+    [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.FormatTypeDeclarationBraces)]
+    public async Task TestNoDiagnostic_NoBraces()
+    {
+        await VerifyNoDiagnosticAsync(@"
+class C;
 ");
     }
 }