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

Fix analyzer RCS1201 #1470

Merged
merged 5 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Fix analyzer [RCS1108](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1108) ([PR](https://github.com/dotnet/roslynator/pull/1469))
- Fix analyzer [RCS1201](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1201) ([PR](https://github.com/dotnet/roslynator/pull/1470))

## [4.12.3] - 2024-05-10

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ public bool Analyze(
if (statement.SpanOrTrailingTriviaContainsDirectives())
return false;

if (statement.GetTrailingTrivia().Any(f => f.IsKind(SyntaxKind.SingleLineCommentTrivia, SyntaxKind.MultiLineCommentTrivia)))
return false;

StatementListInfo statementsInfo = SyntaxInfo.StatementListInfo(statement);

if (!statementsInfo.Success)
Expand Down Expand Up @@ -99,7 +102,12 @@ public bool Analyze(
int j = i;
while (j < statements.Count - 1)
{
if (!IsFixableStatement(statements[j + 1], name, returnType, semanticModel, cancellationToken))
StatementSyntax statement2 = statements[j + 1];

if (statement2.GetLeadingTrivia().Any(f => f.IsKind(SyntaxKind.SingleLineCommentTrivia, SyntaxKind.MultiLineCommentTrivia)))
break;

if (!IsFixableStatement(statement2, name, returnType, semanticModel, cancellationToken))
break;

j++;
Expand Down
46 changes: 46 additions & 0 deletions src/Tests/Analyzers.Tests/RCS1201UseMethodChainingTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,50 @@ public C2 M2()
}
");
}

[Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseMethodChaining)]
public async Task TestNoDiagnostic_CommentsBetween()
{
await VerifyNoDiagnosticAsync("""

using System.Text;

public class C
{
public void M()
{
var sb = new StringBuilder();

// first
sb.Append("first");

// second
sb.Append("second");
}
}

""");
}

[Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseMethodChaining)]
public async Task TestNoDiagnostic_CommentsBetween2()
{
await VerifyNoDiagnosticAsync("""

using System.Text;

public class C
{
public void M()
{
var sb = new StringBuilder();

sb.Append("first"); // first

sb.Append("second");
}
}

""");
}
}