Skip to content

Commit

Permalink
Fix #728
Browse files Browse the repository at this point in the history
  • Loading branch information
@meziantou
meziantou committed Jun 13, 2024
1 parent 16c3af1 commit 089f987
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 52 deletions.
86 changes: 43 additions & 43 deletions src/Meziantou.Analyzer.CodeFixers/Rules/DoNotUseBlockingCallInAsyncContextFixer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,63 +33,63 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
switch (data)
{
case DoNotUseBlockingCallInAsyncContextData.Thread_Sleep:
{
var codeAction = CodeAction.Create(
"Use Task.Delay",
ct => UseTaskDelay(context.Document, nodeToFix, ct),
equivalenceKey: "Thread_Sleep");
{
var codeAction = CodeAction.Create(
"Use Task.Delay",
ct => UseTaskDelay(context.Document, nodeToFix, ct),
equivalenceKey: "Thread_Sleep");

context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;
context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;

case DoNotUseBlockingCallInAsyncContextData.Task_Wait:
{
var codeAction = CodeAction.Create(
"Use await",
ct => ReplaceTaskWaitWithAwait(context.Document, nodeToFix, ct),
equivalenceKey: "Task_Wait");
{
var codeAction = CodeAction.Create(
"Use await",
ct => ReplaceTaskWaitWithAwait(context.Document, nodeToFix, ct),
equivalenceKey: "Task_Wait");

context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;
context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;

case DoNotUseBlockingCallInAsyncContextData.Task_Result:
{
var codeAction = CodeAction.Create(
"Use await",
ct => ReplaceTaskResultWithAwait(context.Document, nodeToFix, ct),
equivalenceKey: "Task_Result");
{
var codeAction = CodeAction.Create(
"Use await",
ct => ReplaceTaskResultWithAwait(context.Document, nodeToFix, ct),
equivalenceKey: "Task_Result");

context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;
context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;

case DoNotUseBlockingCallInAsyncContextData.Overload:
{
if (!properties.TryGetValue("MethodName", out var methodName) || methodName is null)
return;
{
if (!properties.TryGetValue("MethodName", out var methodName) || methodName is null)
return;

var codeAction = CodeAction.Create(
$"Use '{methodName}'",
ct => ReplaceWithMethodName(context.Document, nodeToFix, methodName, ct),
equivalenceKey: "Overload");
var codeAction = CodeAction.Create(
$"Use '{methodName}'",
ct => ReplaceWithMethodName(context.Document, nodeToFix, methodName, ct),
equivalenceKey: "Overload");

context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;
context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;

case DoNotUseBlockingCallInAsyncContextData.Using:
case DoNotUseBlockingCallInAsyncContextData.UsingDeclarator:
{
var codeAction = CodeAction.Create(
$"Use 'await using'",
ct => ReplaceWithAwaitUsing(context.Document, nodeToFix, ct),
equivalenceKey: "Overload");

context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;
{
var codeAction = CodeAction.Create(
$"Use 'await using'",
ct => ReplaceWithAwaitUsing(context.Document, nodeToFix, ct),
equivalenceKey: "Overload");

context.RegisterCodeFix(codeAction, context.Diagnostics);
}
break;
}
}

Expand Down
21 changes: 14 additions & 7 deletions src/Meziantou.Analyzer.CodeFixers/Rules/OptimizeLinqUsageFixer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,6 @@ private static async Task<Document> UseOrderInsteadOfOrderBy(Document document,
var newName = member.Name.Identifier.ValueText is "OrderBy" ? "Order" : "OrderDescending";

var editor = await DocumentEditor.CreateAsync(document, cancellationToken).ConfigureAwait(false);
var generator = editor.Generator;

editor.RemoveNode(invocation.ArgumentList.Arguments.First());
editor.ReplaceNode(member, member.WithName(IdentifierName(newName)));
return editor.GetChangedDocument();
Expand Down Expand Up @@ -513,12 +511,21 @@ private static async Task<Document> UseIndexerLast(Document document, SyntaxNode
if (semanticModel.GetOperation(nodeToFix, cancellationToken) is not IInvocationOperation operation)
return document;

var newExpression = generator.ElementAccessExpression(operation.Arguments[0].Syntax,
generator.SubtractExpression(
generator.MemberAccessExpression(operation.Arguments[0].Syntax, GetMemberName()),
generator.LiteralExpression(1)));
// if C# 8.0, use ^1
if (expression.SyntaxTree.GetCSharpLanguageVersion() >= LanguageVersion.CSharp8 && editor.SemanticModel.Compilation.GetBestTypeByMetadataName("System.Index") is not null)
{
var newExpression = generator.ElementAccessExpression(operation.Arguments[0].Syntax, PrefixUnaryExpression(SyntaxKind.IndexExpression, LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(1))));
editor.ReplaceNode(nodeToFix, newExpression);
}
else
{
var newExpression = generator.ElementAccessExpression(operation.Arguments[0].Syntax,
generator.SubtractExpression(
generator.MemberAccessExpression(operation.Arguments[0].Syntax, GetMemberName()),
generator.LiteralExpression(1)));
editor.ReplaceNode(nodeToFix, newExpression);
}

editor.ReplaceNode(nodeToFix, newExpression);
return editor.GetChangedDocument();

string GetMemberName()
Expand Down
4 changes: 2 additions & 2 deletions tests/Meziantou.Analyzer.Test/Rules/OptimizeLinqUsageAnalyzerOrderTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public Test()
""")
.ValidateAsync();
}

[Fact]
public async Task IEnumerable_Order_LambdaNotValid()
{
Expand All @@ -54,7 +54,7 @@ public Test()
""")
.ValidateAsync();
}

[Fact]
public async Task IEnumerable_Order_LambdaReferenceAnotherParameter()
{
Expand Down
72 changes: 72 additions & 0 deletions tests/Meziantou.Analyzer.Test/Rules/OptimizeLinqUsageAnalyzerUseIndexerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,77 @@ public Test()
";

await CreateProjectBuilder()
.WithLanguageVersion(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp7_3)
.WithSourceCode(SourceCode)
.ShouldReportDiagnosticWithMessage("Use '[]' instead of 'Last()'")
.ShouldFixCodeWith(CodeFix)
.ValidateAsync();
}

[Fact]
public async Task Last_Array_CSharp8_IndexNotAvailable()
{
const string SourceCode = @"using System.Linq;
class Test
{
public Test()
{
var list = new int[5];
_ = list.[|Last|]();
list.First(x=> x == 0);
}
}
";
const string CodeFix = @"using System.Linq;
class Test
{
public Test()
{
var list = new int[5];
_ = list[list.Length - 1];
list.First(x=> x == 0);
}
}
";

await CreateProjectBuilder()
.WithLanguageVersion(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp8)
.WithTargetFramework(TargetFramework.Net4_8)
.WithSourceCode(SourceCode)
.ShouldReportDiagnosticWithMessage("Use '[]' instead of 'Last()'")
.ShouldFixCodeWith(CodeFix)
.ValidateAsync();
}

[Fact]
public async Task Last_Array_CSharp8_IndexAvailable()
{
const string SourceCode = @"using System.Linq;
class Test
{
public Test()
{
var list = new int[5];
_ = list.[|Last|]();
list.First(x=> x == 0);
}
}
";
const string CodeFix = @"using System.Linq;
class Test
{
public Test()
{
var list = new int[5];
_ = list[^1];
list.First(x=> x == 0);
}
}
";

await CreateProjectBuilder()
.WithLanguageVersion(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp8)
.WithTargetFramework(TargetFramework.Net8_0)
.WithSourceCode(SourceCode)
.ShouldReportDiagnosticWithMessage("Use '[]' instead of 'Last()'")
.ShouldFixCodeWith(CodeFix)
Expand Down Expand Up @@ -172,6 +243,7 @@ public Test()
";

await CreateProjectBuilder()
.WithLanguageVersion(Microsoft.CodeAnalysis.CSharp.LanguageVersion.CSharp7_3)
.WithSourceCode(SourceCode)
.ShouldReportDiagnosticWithMessage("Use '[]' instead of 'Last()'")
.ShouldFixCodeWith(CodeFix)
Expand Down

0 comments on commit 089f987

Please sign in to comment.