Review 1

SonarSource · Jun 21, 2023 · 2a19fa3 · 2a19fa3
1 parent 4df673a
commit 2a19fa3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/Hotspots/UnsafeCodeBlocks.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/Hotspots/UnsafeCodeBlocks.cs
@@ -37,22 +37,12 @@ public UnsafeCodeBlocks(IAnalyzerConfiguration configuration) : base(configurati
     protected override void Initialize(SonarAnalysisContext context)
     {
         context.RegisterNodeAction(c => Report(c, ((UnsafeStatementSyntax)c.Node).UnsafeKeyword), SyntaxKind.UnsafeStatement);
-        context.RegisterNodeAction(c =>
-            {
-                if (c.Node is BaseMethodDeclarationSyntax { Modifiers: var modifiers })
-                {
-                    ReportIfUnsafe(c, modifiers);
-                }
-            },
+        context.RegisterNodeAction(
+            c => ReportIfUnsafe(c, ((BaseMethodDeclarationSyntax)c.Node).Modifiers),
             SyntaxKind.MethodDeclaration, SyntaxKind.ConstructorDeclaration, SyntaxKind.DestructorDeclaration, SyntaxKind.OperatorDeclaration);
-        context.RegisterNodeAction(c =>
-            {
-                if (c.Node is BaseTypeDeclarationSyntax { Modifiers: var modifiers }
-                    && modifiers.Find(SyntaxKind.UnsafeKeyword) is { } unsafeModifier)
-                {
-                    Report(c, unsafeModifier);
-                }
-            }, SyntaxKind.ClassDeclaration, SyntaxKind.InterfaceDeclaration, SyntaxKind.StructDeclaration, SyntaxKindEx.RecordClassDeclaration);
+        context.RegisterNodeAction(
+            c => ReportIfUnsafe(c, ((BaseTypeDeclarationSyntax)c.Node).Modifiers),
+            SyntaxKind.ClassDeclaration, SyntaxKind.InterfaceDeclaration, SyntaxKind.StructDeclaration, SyntaxKindEx.RecordClassDeclaration, SyntaxKindEx.RecordStructDeclaration);
     }
 
     private void ReportIfUnsafe(SonarSyntaxNodeReportingContext context, SyntaxTokenList modifiers)

diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/Rules/Hotspots/UnsafeCodeBlocksTest.cs b/analyzers/tests/SonarAnalyzer.UnitTest/Rules/Hotspots/UnsafeCodeBlocksTest.cs
@@ -41,7 +41,7 @@ public void UnsafeRecord() =>
 
     [TestMethod]
     public void UnsafeRecordStruct() =>
-        builder.AddSnippet("""unsafe record struct MyRecord(byte* Pointer); // FN""")
+        builder.AddSnippet("""unsafe record struct MyRecord(byte* Pointer); // Noncompliant""")
         .WithOptions(ParseOptionsHelper.FromCSharp10).Verify();
 
 #endif