-
Notifications
You must be signed in to change notification settings - Fork 227
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
Fix S1144: False Positive when private member is only used in a gener… #2320
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,7 +85,7 @@ protected override void Initialize(SonarAnalysisContext context) | |
// Collect symbols of private members that could potentially be removed | ||
var removableSymbolsCollector = new CSharpRemovableSymbolWalker(c.Compilation.GetSemanticModel); | ||
|
||
if (!VisitDeclaringReferences(namedType, removableSymbolsCollector, c.Compilation)) | ||
if (!VisitDeclaringReferences(namedType, removableSymbolsCollector, c.Compilation, includeGeneratedFile: false)) | ||
{ | ||
return; | ||
} | ||
|
@@ -100,7 +100,7 @@ protected override void Initialize(SonarAnalysisContext context) | |
c.Compilation.GetSemanticModel, | ||
removableSymbolsCollector.PrivateSymbols.Select(s => s.Name).ToHashSet()); | ||
|
||
if (!VisitDeclaringReferences(namedType, usageCollector, c.Compilation)) | ||
if (!VisitDeclaringReferences(namedType, usageCollector, c.Compilation, includeGeneratedFile: true)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ... But we do want to collect the usages of other members even in generated files. |
||
{ | ||
return; | ||
} | ||
|
@@ -286,9 +286,14 @@ private static string GetMemberType(ISymbol symbol) | |
} | ||
} | ||
|
||
private static bool VisitDeclaringReferences(INamedTypeSymbol namedType, CSharpSyntaxWalker visitor, Compilation compilation) | ||
private static bool VisitDeclaringReferences(INamedTypeSymbol namedType, CSharpSyntaxWalker visitor, Compilation compilation, | ||
bool includeGeneratedFile) | ||
{ | ||
foreach (var reference in namedType.DeclaringSyntaxReferences.Where(r => !IsGenerated(r))) | ||
var syntaxReferencesToVisit = includeGeneratedFile | ||
? namedType.DeclaringSyntaxReferences | ||
: namedType.DeclaringSyntaxReferences.Where(r => !IsGenerated(r)); | ||
|
||
foreach (var reference in syntaxReferencesToVisit) | ||
{ | ||
if (!visitor.SafeVisit(reference.GetSyntax())) | ||
{ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
...-dotnet/tests/SonarAnalyzer.UnitTest/TestCases/UnusedPrivateMember.CalledFromGenerated.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
using System; | ||
|
||
namespace Tests.Diagnostics | ||
{ | ||
public partial class MyClass | ||
{ | ||
private void PrivateMethodOnlyCalledFromGenerated() | ||
{ | ||
} | ||
|
||
internal void InternalMethodOnlyCalledFromGenerated() | ||
{ | ||
} | ||
} | ||
} |
14 changes: 14 additions & 0 deletions
14
sonaranalyzer-dotnet/tests/SonarAnalyzer.UnitTest/TestCases/UnusedPrivateMember.Generated.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
// <AUTO-GENERATED> | ||
using System; | ||
|
||
namespace Tests.Diagnostics | ||
{ | ||
public partial class MyClass | ||
{ | ||
public void Foo() | ||
{ | ||
PrivateMethodOnlyCalledFromGenerated(); | ||
InternalMethodOnlyCalledFromGenerated(); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need to collect the members declared in generated files as we don't want to report about them...