Skip to content

Fix analyzer RCS1229 #1667

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.

Sign up for GitHub

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

Merged
josefpihrt merged 5 commits into from
Jul 26, 2025
+62 −82
Merged

Fix analyzer RCS1229 #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4fd2b2a
fix
josefpihrt Jul 26, 2025
ca0186e
changelog
josefpihrt Jul 26, 2025
be88a6b
fix
josefpihrt Jul 26, 2025
e770dcb
Merge branch 'main' into fix/rcs1229-unsafe
josefpihrt Jul 26, 2025
4c85279
Apply suggestions from code review
josefpihrt Jul 26, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- Fix analyzer [RCS1264](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1264) ([PR](https://github.com/dotnet/roslynator/pull/1666))
- Fix analyzer [RCS1229](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1229) ([PR](https://github.com/dotnet/roslynator/pull/1667))

## [4.13.1] - 2025-02-23

Expand Down
34 changes: 2 additions & 32 deletions src/Analyzers/CSharp/Analysis/UnnecessaryUnsafeContextAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ private static void AnalyzeUnsafeStatement(SyntaxNodeAnalysisContext context)
if (!unsafeStatement.Block.Statements.Any())
return;

if (!AncestorContainsUnsafeModifier(unsafeStatement.Parent))
if (!CSharpUtility.IsInUnsafeContext(unsafeStatement.Parent))
return;

DiagnosticHelpers.ReportDiagnostic(context, DiagnosticRules.UnnecessaryUnsafeContext, unsafeStatement.UnsafeKeyword);
Expand Down Expand Up @@ -166,39 +166,9 @@ private static void AnalyzeMemberDeclaration(
if (index == -1)
return;

if (!AncestorContainsUnsafeModifier(node.Parent))
if (!CSharpUtility.IsInUnsafeContext(node.Parent))
return;

DiagnosticHelpers.ReportDiagnostic(context, DiagnosticRules.UnnecessaryUnsafeContext, modifiers[index]);
}

private static bool AncestorContainsUnsafeModifier(SyntaxNode node)
{
while (node is not null)
{
switch (node)
{
case UnsafeStatementSyntax:
return true;
case MemberDeclarationSyntax memberDeclarationSyntax:
{
if (memberDeclarationSyntax.Modifiers.Contains(SyntaxKind.UnsafeKeyword))
return true;

break;
}
case LocalFunctionStatementSyntax localFunctionStatement:
{
if (localFunctionStatement.Modifiers.Contains(SyntaxKind.UnsafeKeyword))
return true;

break;
}
}

node = node.Parent;
}

return false;
}
}
3 changes: 2 additions & 1 deletion src/Analyzers/CSharp/Analysis/UseAsyncAwaitAnalyzer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ private static bool IsFixable(BlockSyntax body, SyntaxNodeAnalysisContext contex

walker.VisitBlock(body);

return walker.ReturnStatement is not null;
return walker.ReturnStatement is not null
&& !CSharpUtility.IsInUnsafeContext(body);
}
finally
{
Expand Down
78 changes: 29 additions & 49 deletions src/CSharp/CSharp/CSharpUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,55 +10,35 @@ namespace Roslynator.CSharp;

internal static class CSharpUtility
{
//public static bool CanConvertToCollectionExpression(ImplicitObjectCreationExpressionSyntax implicitObjectCreation, SemanticModel semanticModel, CancellationToken cancellationToken)
//{
// return !implicitObjectCreation.WalkUpParentheses().IsParentKind(SyntaxKind.Argument)
// && implicitObjectCreation.ArgumentList?.Arguments.Any() != true
// && SyntaxUtility.CanConvertToCollectionExpression(implicitObjectCreation, semanticModel, cancellationToken);
//}

//public static bool CanConvertToCollectionExpression(ObjectCreationExpressionSyntax objectCreation, SemanticModel semanticModel, CancellationToken cancellationToken)
//{
// return !objectCreation.WalkUpParentheses().IsParentKind(SyntaxKind.Argument)
// && objectCreation.ArgumentList?.Arguments.Any() != true
// && SyntaxUtility.CanConvertToCollectionExpression(objectCreation, semanticModel, cancellationToken);
//}

//public static bool CanConvertToCollectionExpression(ArrayCreationExpressionSyntax arrayCreation, SemanticModel semanticModel, CancellationToken cancellationToken)
//{
// return CanConvertToCollectionExpression(arrayCreation)
// && SyntaxUtility.CanConvertToCollectionExpression(arrayCreation, semanticModel, cancellationToken);
//}

//public static bool CanConvertToCollectionExpression(ImplicitArrayCreationExpressionSyntax implicitArrayCreation, SemanticModel semanticModel, CancellationToken cancellationToken)
//{
// CSharpTypeAnalysis.IsTypeObvious(implicitArrayCreation, semanticModel, cancellationToken);
// return CanConvertToCollectionExpression(implicitArrayCreation)
// && SyntaxUtility.CanConvertToCollectionExpression(implicitArrayCreation, semanticModel, cancellationToken);
//}

//private static bool CanConvertToCollectionExpression(ExpressionSyntax expression)
//{
// expression = expression.WalkUpParentheses();

// if (expression.IsParentKind(
// SyntaxKind.Argument,
// SyntaxKind.ForEachStatement,
// SyntaxKind.ForEachVariableStatement))
// {
// return false;
// }

// if (expression.Parent.IsKind(SyntaxKind.EqualsValueClause)
// && expression.Parent.Parent.IsKind(SyntaxKind.VariableDeclarator)
// && expression.Parent.Parent.Parent is VariableDeclarationSyntax variableDeclaration
// && variableDeclaration.Type.IsVar)
// {
// return false;
// }

// return true;
//}
public static bool IsInUnsafeContext(SyntaxNode? node)
{
while (node is not null)
{
switch (node)
{
case UnsafeStatementSyntax:
return true;
case MemberDeclarationSyntax memberDeclarationSyntax:
{
if (memberDeclarationSyntax.Modifiers.Contains(SyntaxKind.UnsafeKeyword))
return true;

break;
}
case LocalFunctionStatementSyntax localFunctionStatement:
{
if (localFunctionStatement.Modifiers.Contains(SyntaxKind.UnsafeKeyword))
return true;

break;
}
}

node = node.Parent;
}

return false;
}

public static bool IsNullableReferenceType(
TypeSyntax type,
Expand Down
28 changes: 28 additions & 0 deletions src/Tests/Analyzers.Tests/RCS1229UseAsyncAwaitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,4 +831,32 @@ ValueTask M()
}
");
}

[Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.UseAsyncAwait)]
public async Task TestNoDiagnostic_Unsafe()
{
await VerifyNoDiagnosticAsync(@"
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;

internal abstract unsafe class UnsafeStream() : Stream
{
public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken cancellationToken = default)
{
try
{
var tcs = new TaskCompletionSource<int>();

return new ValueTask<int>(tcs.Task);
}
catch
{
throw;
}
}
}
", options: Options.WithAllowUnsafe(true));
}
}
Loading