S3903: Add support for record structs (#5574)

SonarSource · Apr 20, 2022 · 0818415 · 0818415
1 parent 33e637d
commit 0818415
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/DeclareTypesInNamespaces.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/DeclareTypesInNamespaces.cs
@@ -39,6 +39,7 @@ public sealed class DeclareTypesInNamespaces : DeclareTypesInNamespacesBase<Synt
             SyntaxKind.EnumDeclaration,
             SyntaxKind.InterfaceDeclaration,
             SyntaxKindEx.RecordClassDeclaration,
+            SyntaxKindEx.RecordStructDeclaration,
         };
 
         protected override SyntaxToken GetTypeIdentifier(SyntaxNode declaration) =>
@@ -51,6 +52,7 @@ protected override bool IsInnerTypeOrWithinNamespace(SyntaxNode declaration, Sem
                 SyntaxKind.NamespaceDeclaration,
                 SyntaxKind.InterfaceDeclaration,
                 SyntaxKindEx.RecordClassDeclaration,
+                SyntaxKindEx.RecordStructDeclaration,
                 SyntaxKindEx.FileScopedNamespaceDeclaration);
     }
 }
diff --git a/...ns/SyntaxNodeAnalysisContextExtensions.cs → ...ns/SyntaxNodeAnalysisContextExtensions.cs b/...ns/SyntaxNodeAnalysisContextExtensions.cs → ...ns/SyntaxNodeAnalysisContextExtensions.cs
diff --git a/analyzers/src/SonarAnalyzer.Common/Rules/DeclareTypesInNamespacesBase.cs b/analyzers/src/SonarAnalyzer.Common/Rules/DeclareTypesInNamespacesBase.cs
@@ -18,8 +18,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using System.Collections.Immutable;
 using Microsoft.CodeAnalysis;
+using SonarAnalyzer.Extensions;
 using SonarAnalyzer.Helpers;
 
 namespace SonarAnalyzer.Rules
@@ -30,7 +30,6 @@ public abstract class DeclareTypesInNamespacesBase<TSyntaxKind> : SonarDiagnosti
         protected const string DiagnosticId = "S3903";
 
         protected abstract TSyntaxKind[] SyntaxKinds { get; }
-
         protected abstract bool IsInnerTypeOrWithinNamespace(SyntaxNode declaration, SemanticModel semanticModel);
         protected abstract SyntaxToken GetTypeIdentifier(SyntaxNode declaration);
 
@@ -43,9 +42,7 @@ protected override void Initialize(SonarAnalysisContext context) =>
               c =>
               {
                   var declaration = c.Node;
-
-                  if (c.ContainingSymbol.Kind != SymbolKind.NamedType
-                      || IsInnerTypeOrWithinNamespace(declaration, c.SemanticModel))
+                  if (c.IsRedundantPositionalRecordContext() || IsInnerTypeOrWithinNamespace(declaration, c.SemanticModel))
                   {
                       return;
                   }

diff --git a/...s/SonarAnalyzer.UnitTest/TestCases/DeclareTypesInNamespaces.AfterCSharp10.RecordStruct.cs b/...s/SonarAnalyzer.UnitTest/TestCases/DeclareTypesInNamespaces.AfterCSharp10.RecordStruct.cs
@@ -1,6 +1,7 @@
-record struct Bar // FN
+record struct Bar               // Noncompliant {{Move 'Bar' into a named namespace.}}
+//            ^^^
 {
-    record struct InnerBar { } // Compliant - we want to report only on the outer record
+    record struct InnerBar { }  // Compliant - we want to report only on the outer record
 }
 
 public record class Product { } // Noncompliant