Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Rule S3398: Private static methods called only by inner class #6781

Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 43 additions & 0 deletions analyzers/rspec/cs/S3398_c#.html
@@ -0,0 +1,43 @@
<p>When a <code>private static</code> method is only invoked by a nested class, there’s no reason not to move it into that class. It will still have
the same access to the outer class' static members, but the outer class will be clearer and less cluttered.</p>
<h2>Noncompliant Code Example</h2>
<pre>
public class Outer
andrei-epure-sonarsource marked this conversation as resolved.
Show resolved Hide resolved
{
private const int base = 42;

private static void Print(int num) // Noncompliant - static method is only used by the nested class, should be moved there
{
Console.WriteLine(num + base);
}

public class Nested
{
public void SomeMethod()
{
Outer.Print(1);
}
}
}
</pre>
<h2>Compliant Solution</h2>
<pre>
public class Outer
{
private const int base = 42;

public class Nested
{
public void SomeMethod()
{
Print(1);
}

private static void Print(int num)
{
Console.WriteLine(num + base);
}
}
}
</pre>

17 changes: 17 additions & 0 deletions analyzers/rspec/cs/S3398_c#.json
@@ -0,0 +1,17 @@
{
"title": "\"private\" methods called only by inner classes should be moved to those classes",
"type": "CODE_SMELL",
"status": "ready",
"remediation": {
"func": "Constant\/Issue",
"constantCost": "5min"
},
"tags": [
"confusing"
],
"defaultSeverity": "Minor",
"ruleSpecification": "RSPEC-3398",
"sqKey": "S3398",
"scope": "All",
"quickfix": "unknown"
}
1 change: 1 addition & 0 deletions analyzers/rspec/cs/Sonar_way_profile.json
Expand Up @@ -157,6 +157,7 @@
"S3358",
"S3376",
"S3397",
"S3398",
"S3400",
"S3415",
"S3427",
Expand Down
@@ -0,0 +1,206 @@
/*
* SonarAnalyzer for .NET
* Copyright (C) 2015-2023 SonarSource SA
* mailto: contact AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

using SonarAnalyzer.CFG.Helpers;

namespace SonarAnalyzer.Rules.CSharp;

[DiagnosticAnalyzer(LanguageNames.CSharp)]
public sealed class PrivateStaticMethodUsedOnlyByNestedClass : SonarDiagnosticAnalyzer
{
private const string DiagnosticId = "S3398";
private const string MessageFormat = "Move this method inside '{0}'.";

private static readonly SyntaxKind[] AnalyzedSyntaxKinds = new[]
{
SyntaxKind.ClassDeclaration,
SyntaxKind.StructDeclaration,
SyntaxKind.InterfaceDeclaration,
SyntaxKindEx.RecordClassDeclaration,
SyntaxKindEx.RecordStructDeclaration
};

private static readonly DiagnosticDescriptor Rule = DescriptorFactory.Create(DiagnosticId, MessageFormat);

public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray.Create(Rule);

protected override void Initialize(SonarAnalysisContext context) =>
context.RegisterNodeAction(c =>
{
var declaredType = (TypeDeclarationSyntax)c.Node;
andrei-epure-sonarsource marked this conversation as resolved.
Show resolved Hide resolved

if (!IsPartial(declaredType)
&& HasNestedTypeDeclarations(declaredType)
&& PrivateStaticMethodsOf(declaredType) is { Length: > 0 } candidates)
{
var methodReferences = TypesWhichUseTheMethods(candidates, declaredType, c.SemanticModel);

foreach (var reference in methodReferences)
{
var typeToMoveInto = LowestCommonAncestorOrSelf(reference.Types);
if (typeToMoveInto != declaredType)
{
var nestedTypeName = typeToMoveInto.Identifier.ValueText;
c.ReportIssue(Diagnostic.Create(Rule, reference.Method.Identifier.GetLocation(), nestedTypeName));
}
}
}
},
AnalyzedSyntaxKinds);

private static bool IsPartial(TypeDeclarationSyntax type) =>
type.Modifiers.Any(x => x.IsKind(SyntaxKind.PartialKeyword));

private static bool HasNestedTypeDeclarations(TypeDeclarationSyntax type) =>
type.Members
.OfType<TypeDeclarationSyntax>()
.Any();

private static MethodDeclarationSyntax[] PrivateStaticMethodsOf(TypeDeclarationSyntax type) =>
type.Members
.OfType<MethodDeclarationSyntax>()
.Where(x => IsPrivateAndStatic(x, type))
.ToArray();

private static bool IsPrivateAndStatic(MethodDeclarationSyntax method, TypeDeclarationSyntax containingType)
{
return method.Modifiers.Any(x => x.IsKind(SyntaxKind.StaticKeyword))
&& (IsExplicitlyPrivate() || IsImplicityPrivate());

bool IsExplicitlyPrivate() =>
HasAnyModifier(method, SyntaxKind.PrivateKeyword) && !HasAnyModifier(method, SyntaxKind.ProtectedKeyword);

// The default accessibility for record class members is private, but for record structs (like all structs) it's internal.
bool IsImplicityPrivate() =>
!HasAnyModifier(method, SyntaxKind.PublicKeyword, SyntaxKind.ProtectedKeyword, SyntaxKind.InternalKeyword)
&& IsClassOrRecordClassOrInterfaceDeclaration(containingType);

static bool IsClassOrRecordClassOrInterfaceDeclaration(TypeDeclarationSyntax type) =>
type is ClassDeclarationSyntax or InterfaceDeclarationSyntax
|| (RecordDeclarationSyntaxWrapper.IsInstance(type) && !((RecordDeclarationSyntaxWrapper)type).ClassOrStructKeyword.IsKind(SyntaxKind.StructKeyword));

static bool HasAnyModifier(MethodDeclarationSyntax method, params SyntaxKind[] modifiers) =>
method.Modifiers.Any(x => x.IsAnyKind(modifiers));
}

private static TypeDeclarationSyntax LowestCommonAncestorOrSelf(IEnumerable<TypeDeclarationSyntax> declaredTypes)
andrei-epure-sonarsource marked this conversation as resolved.
Show resolved Hide resolved
{
var typeHierarchyFromTopToBottom = declaredTypes.Select(PathFromTop);
var minPathLength = typeHierarchyFromTopToBottom.Select(x => x.Length).Min();
var firstPath = typeHierarchyFromTopToBottom.First();

var lastCommonPathIndex = 0;
for (int i = 0; i < minPathLength; i++)
{
var isPartOfCommonPath = typeHierarchyFromTopToBottom.All(x => x[i] == firstPath[i]);
if (isPartOfCommonPath)
{
lastCommonPathIndex = i;
}
else
{
break;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's a code smell about the break, but I'm not sure that removing it will lead to more readable code

Also, there's still a small thing typeHierarchyFromTopToBottom.All doing the check also on firstPath itself, but overall it's clear and more readable probably then using some loops for this

}
}

return firstPath[lastCommonPathIndex];

static TypeDeclarationSyntax[] PathFromTop(SyntaxNode node) =>
node.AncestorsAndSelf()
.OfType<TypeDeclarationSyntax>()
.Distinct()
.Reverse()
.ToArray();
}

private static IEnumerable<MethodUsedByTypes> TypesWhichUseTheMethods(
IEnumerable<MethodDeclarationSyntax> methods, TypeDeclarationSyntax outerType, SemanticModel model)
{
var collector = new PotentialMethodReferenceCollector(methods);
collector.Visit(outerType);

return collector.PotentialMethodReferences
.Where(x => !OnlyUsedByOuterType(x))
.Select(ResolveReferences)
.Where(x => x.Types.Any())
.ToArray();

MethodUsedByTypes ResolveReferences(MethodWithPotentialReferences m)
andrei-epure-sonarsource marked this conversation as resolved.
Show resolved Hide resolved
{
var methodSymbol = model.GetDeclaredSymbol(m.Method);

var typesWhichUseTheMethod = m.PotentialReferences
.Where(x =>
!IsRecursiveMethodCall(x, m.Method)
&& model.GetSymbolOrCandidateSymbol(x) is IMethodSymbol { } methodReference
&& (methodReference.Equals(methodSymbol) || methodReference.ConstructedFrom.Equals(methodSymbol)))
.Select(ContainingTypeDeclaration)
.Distinct()
.ToArray();

return new MethodUsedByTypes(m.Method, typesWhichUseTheMethod);
}

bool IsRecursiveMethodCall(IdentifierNameSyntax methodCall, MethodDeclarationSyntax methodDeclaration) =>
methodCall.Ancestors().OfType<MethodDeclarationSyntax>().FirstOrDefault() == methodDeclaration;

bool OnlyUsedByOuterType(MethodWithPotentialReferences m) =>
m.PotentialReferences.All(x => ContainingTypeDeclaration(x) == outerType);

static TypeDeclarationSyntax ContainingTypeDeclaration(IdentifierNameSyntax identifier) =>
identifier
.Ancestors()
.OfType<TypeDeclarationSyntax>()
.First();
}

private sealed record MethodWithPotentialReferences(MethodDeclarationSyntax Method, IdentifierNameSyntax[] PotentialReferences);

private sealed record MethodUsedByTypes(MethodDeclarationSyntax Method, TypeDeclarationSyntax[] Types);

/// <summary>
/// Collects all the potential references to a set of methods inside the given syntax node.
/// The collector looks for identifiers which match any of the methods' names, but does not try to resolve them to symbols with the semantic model.
/// Performance gains: by only using the syntax tree to find matches we can eliminate certain methods (which are only used by the type which has declared it) without using the more costly symbolic lookup.
/// </summary>
private sealed class PotentialMethodReferenceCollector : CSharpSyntaxWalker
{
private readonly ISet<MethodDeclarationSyntax> methodsToFind;
private readonly Dictionary<MethodDeclarationSyntax, List<IdentifierNameSyntax>> potentialMethodReferences;

public IEnumerable<MethodWithPotentialReferences> PotentialMethodReferences =>
potentialMethodReferences.Select(x => new MethodWithPotentialReferences(x.Key, x.Value.ToArray()));

public PotentialMethodReferenceCollector(IEnumerable<MethodDeclarationSyntax> methodsToFind)
{
this.methodsToFind = new HashSet<MethodDeclarationSyntax>(methodsToFind);
potentialMethodReferences = new();
}

public override void VisitIdentifierName(IdentifierNameSyntax node)
{
if (methodsToFind.FirstOrDefault(x => x.Identifier.ValueText == node.Identifier.ValueText) is { } method)
{
var referenceList = potentialMethodReferences.GetOrAdd(method, _ => new());
referenceList.Add(node);
}
}
}
}
Expand Up @@ -3322,7 +3322,7 @@ internal static class RuleTypeMappingCS
// ["S3395"],
// ["S3396"],
["S3397"] = "BUG",
// ["S3398"],
["S3398"] = "CODE_SMELL",
// ["S3399"],
["S3400"] = "CODE_SMELL",
// ["S3401"],
Expand Down
@@ -0,0 +1,60 @@
/*
* SonarAnalyzer for .NET
* Copyright (C) 2015-2023 SonarSource SA
* mailto: contact AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

using SonarAnalyzer.Rules.CSharp;

namespace SonarAnalyzer.UnitTest.Rules;

[TestClass]
public class PrivateStaticMethodUsedOnlyByNestedClassTest
{
private readonly VerifierBuilder builder = new VerifierBuilder<PrivateStaticMethodUsedOnlyByNestedClass>();

[TestMethod]
public void PrivateStaticMethodUsedOnlyByNestedClass_CS() =>
builder
.AddPaths("PrivateStaticMethodUsedOnlyByNestedClass.cs")
.Verify();

#if NET

[TestMethod]
public void PrivateStaticMethodUsedOnlyByNestedClass_CSharp8() =>
builder
.AddPaths("PrivateStaticMethodUsedOnlyByNestedClass.CSharp8.cs")
.WithOptions(ParseOptionsHelper.FromCSharp8)
.Verify();

#endif

[TestMethod]
public void PrivateStaticMethodUsedOnlyByNestedClass_CSharp9() =>
builder
.AddPaths("PrivateStaticMethodUsedOnlyByNestedClass.CSharp9.cs")
.WithOptions(ParseOptionsHelper.FromCSharp9)
.Verify();

[TestMethod]
public void PrivateStaticMethodUsedOnlyByNestedClass_CSharp10() =>
builder
.AddPaths("PrivateStaticMethodUsedOnlyByNestedClass.CSharp10.cs")
.WithOptions(ParseOptionsHelper.FromCSharp10)
.Verify();
}
@@ -0,0 +1,43 @@
record class OuterRecordClass
{
static void UsedOnlyByNestedClass() { } // Noncompliant
static void UsedOnlyByNestedRecord() { } // Noncompliant

class NestedClass
{
void Foo()
{
UsedOnlyByNestedClass();
}
}

record class NestedRecord
{
void Foo()
{
UsedOnlyByNestedRecord();
}
}
}

record struct OuterRecordStruct
{
private static void UsedOnlyByNestedClass() { } // Noncompliant
private static void UsedOnlyByNestedRecord() { } // Noncompliant

class NestedClass
{
void Foo()
{
UsedOnlyByNestedClass();
}
}

record struct NestedRecord
{
void Foo()
{
UsedOnlyByNestedRecord();
}
}
}