From 6f380f69531f78a5fca9a1e801299db59171b9dc Mon Sep 17 00:00:00 2001 From: Glen Date: Fri, 17 Apr 2026 10:46:00 +0200 Subject: [PATCH] Fix various analyzer errors --- .../Core/src/Types/Utilities/ErrorHelper.cs | 1 - .../IsSelectedTests.cs | 1 - .../k6/eShop.Inventory/ProductNode.cs | 2 - .../Fusion.AspNetCore.Tests/FusionTestBase.cs | 1 - .../Commands/Clients/DeleteClientCommand.cs | 1 - .../Mcp/DeleteMcpFeatureCollectionCommand.cs | 1 - .../Commands/Mocks/UpdateMockCommand.cs | 1 - .../OpenApi/DeleteOpenApiCollectionCommand.cs | 1 - .../Extensions/ParseResultExtensions.cs | 2 - .../Services/Console/ActivityTree.cs | 2 +- .../SetDefaultWorkspaceCommandTests.cs | 2 - .../Console/NitroConsoleActivityTests.cs | 50 +++++++++---------- 12 files changed, 26 insertions(+), 39 deletions(-) diff --git a/src/HotChocolate/Core/src/Types/Utilities/ErrorHelper.cs b/src/HotChocolate/Core/src/Types/Utilities/ErrorHelper.cs index 26c9a6ac0d6..e62c6e886cd 100644 --- a/src/HotChocolate/Core/src/Types/Utilities/ErrorHelper.cs +++ b/src/HotChocolate/Core/src/Types/Utilities/ErrorHelper.cs @@ -1,5 +1,4 @@ using System.Globalization; -using HotChocolate.Execution.Processing; using HotChocolate.Language; using HotChocolate.Properties; using HotChocolate.Types; diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/IsSelectedTests.cs b/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/IsSelectedTests.cs index 1ad8224d0ea..0194de88632 100644 --- a/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/IsSelectedTests.cs +++ b/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/IsSelectedTests.cs @@ -1,5 +1,4 @@ using HotChocolate.Execution; -using HotChocolate.Tests; using Microsoft.Extensions.DependencyInjection; namespace HotChocolate.Types; diff --git a/src/HotChocolate/Fusion/benchmarks/k6/eShop.Inventory/ProductNode.cs b/src/HotChocolate/Fusion/benchmarks/k6/eShop.Inventory/ProductNode.cs index eb49640747d..c8acfb4e2a3 100644 --- a/src/HotChocolate/Fusion/benchmarks/k6/eShop.Inventory/ProductNode.cs +++ b/src/HotChocolate/Fusion/benchmarks/k6/eShop.Inventory/ProductNode.cs @@ -1,5 +1,3 @@ - -using HotChocolate; using HotChocolate.Types; using HotChocolate.Types.Composite; diff --git a/src/HotChocolate/Fusion/test/Fusion.AspNetCore.Tests/FusionTestBase.cs b/src/HotChocolate/Fusion/test/Fusion.AspNetCore.Tests/FusionTestBase.cs index 7022f7c27fb..45660675881 100644 --- a/src/HotChocolate/Fusion/test/Fusion.AspNetCore.Tests/FusionTestBase.cs +++ b/src/HotChocolate/Fusion/test/Fusion.AspNetCore.Tests/FusionTestBase.cs @@ -21,7 +21,6 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Options; using Xunit.Sdk; diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Clients/DeleteClientCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Clients/DeleteClientCommand.cs index 3833002716a..b727e1b30b1 100644 --- a/src/Nitro/CommandLine/src/CommandLine/Commands/Clients/DeleteClientCommand.cs +++ b/src/Nitro/CommandLine/src/CommandLine/Commands/Clients/DeleteClientCommand.cs @@ -2,7 +2,6 @@ using ChilliCream.Nitro.Client.Apis; using ChilliCream.Nitro.Client.Clients; using ChilliCream.Nitro.CommandLine.Arguments; -using ChilliCream.Nitro.CommandLine.Commands.Apis.Components; using ChilliCream.Nitro.CommandLine.Commands.Clients.Components; using ChilliCream.Nitro.CommandLine.Helpers; using ChilliCream.Nitro.CommandLine.Results; diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Mcp/DeleteMcpFeatureCollectionCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Mcp/DeleteMcpFeatureCollectionCommand.cs index fbd21295459..00ed0a70e91 100644 --- a/src/Nitro/CommandLine/src/CommandLine/Commands/Mcp/DeleteMcpFeatureCollectionCommand.cs +++ b/src/Nitro/CommandLine/src/CommandLine/Commands/Mcp/DeleteMcpFeatureCollectionCommand.cs @@ -2,7 +2,6 @@ using ChilliCream.Nitro.Client.Apis; using ChilliCream.Nitro.Client.Mcp; using ChilliCream.Nitro.CommandLine.Arguments; -using ChilliCream.Nitro.CommandLine.Commands.Apis.Components; using ChilliCream.Nitro.CommandLine.Commands.Mcp.Components; using ChilliCream.Nitro.CommandLine.Helpers; using ChilliCream.Nitro.CommandLine.Results; diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/Mocks/UpdateMockCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/Mocks/UpdateMockCommand.cs index 8284534a87e..734feaf5dc9 100644 --- a/src/Nitro/CommandLine/src/CommandLine/Commands/Mocks/UpdateMockCommand.cs +++ b/src/Nitro/CommandLine/src/CommandLine/Commands/Mocks/UpdateMockCommand.cs @@ -2,7 +2,6 @@ using ChilliCream.Nitro.Client.Apis; using ChilliCream.Nitro.Client.Mocks; using ChilliCream.Nitro.CommandLine.Arguments; -using ChilliCream.Nitro.CommandLine.Commands.Apis.Components; using ChilliCream.Nitro.CommandLine.Commands.Mocks.Components; using ChilliCream.Nitro.CommandLine.Helpers; using ChilliCream.Nitro.CommandLine.Results; diff --git a/src/Nitro/CommandLine/src/CommandLine/Commands/OpenApi/DeleteOpenApiCollectionCommand.cs b/src/Nitro/CommandLine/src/CommandLine/Commands/OpenApi/DeleteOpenApiCollectionCommand.cs index 79c11868dec..3d9b8f1949b 100644 --- a/src/Nitro/CommandLine/src/CommandLine/Commands/OpenApi/DeleteOpenApiCollectionCommand.cs +++ b/src/Nitro/CommandLine/src/CommandLine/Commands/OpenApi/DeleteOpenApiCollectionCommand.cs @@ -2,7 +2,6 @@ using ChilliCream.Nitro.Client.Apis; using ChilliCream.Nitro.Client.OpenApi; using ChilliCream.Nitro.CommandLine.Arguments; -using ChilliCream.Nitro.CommandLine.Commands.Apis.Components; using ChilliCream.Nitro.CommandLine.Commands.OpenApi.Components; using ChilliCream.Nitro.CommandLine.Helpers; using ChilliCream.Nitro.CommandLine.Results; diff --git a/src/Nitro/CommandLine/src/CommandLine/Extensions/ParseResultExtensions.cs b/src/Nitro/CommandLine/src/CommandLine/Extensions/ParseResultExtensions.cs index 5a8039f13ec..aefef0193ff 100644 --- a/src/Nitro/CommandLine/src/CommandLine/Extensions/ParseResultExtensions.cs +++ b/src/Nitro/CommandLine/src/CommandLine/Extensions/ParseResultExtensions.cs @@ -1,5 +1,3 @@ -using ChilliCream.Nitro.CommandLine.Helpers; - namespace ChilliCream.Nitro.CommandLine.Services.Sessions; internal static class ParseResultExtensions diff --git a/src/Nitro/CommandLine/src/CommandLine/Services/Console/ActivityTree.cs b/src/Nitro/CommandLine/src/CommandLine/Services/Console/ActivityTree.cs index 952cf03782a..c56eb04a2a2 100644 --- a/src/Nitro/CommandLine/src/CommandLine/Services/Console/ActivityTree.cs +++ b/src/Nitro/CommandLine/src/CommandLine/Services/Console/ActivityTree.cs @@ -291,7 +291,7 @@ private enum NodePosition private readonly record struct ActivityIcon(string Glyph, Style Style, int Width = 2) { - public static ActivityIcon None { get; } = new("", Spectre.Console.Style.Plain, Width: 0); + public static ActivityIcon None { get; } = new("", Style.Plain, Width: 0); public void Write(List segments) { diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Workspaces/SetDefaultWorkspaceCommandTests.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Workspaces/SetDefaultWorkspaceCommandTests.cs index 8427a72533f..f346e76dc7a 100644 --- a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Workspaces/SetDefaultWorkspaceCommandTests.cs +++ b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Workspaces/SetDefaultWorkspaceCommandTests.cs @@ -1,6 +1,4 @@ using ChilliCream.Nitro.Client; -using ChilliCream.Nitro.Client.Workspaces; -using ChilliCream.Nitro.CommandLine.Commands.Workspaces; using Moq; namespace ChilliCream.Nitro.CommandLine.Tests.Commands.Workspaces; diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Console/NitroConsoleActivityTests.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Console/NitroConsoleActivityTests.cs index 0d3b5dfe453..335801fee39 100644 --- a/src/Nitro/CommandLine/test/CommandLine.Tests/Console/NitroConsoleActivityTests.cs +++ b/src/Nitro/CommandLine/test/CommandLine.Tests/Console/NitroConsoleActivityTests.cs @@ -45,7 +45,7 @@ public async Task Success_Should_WriteCheckGlyph_When_ActivityCompletes() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { activity.Success("Done"); } @@ -65,7 +65,7 @@ public async Task Fail_Should_WriteCrossGlyph_When_CalledWithMessage() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { activity.Fail("Something went wrong"); } @@ -85,7 +85,7 @@ public async Task FailAllAsync_Should_WriteCrossGlyphWithDetails_When_CalledWith var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { await activity.FailAllAsync(new Text("Error detail line 1\nError detail line 2")); } @@ -107,7 +107,7 @@ public async Task StartChildActivity_Should_WriteTreeStructure_When_ChildSucceed var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child step", "Child failed")) { @@ -134,7 +134,7 @@ public async Task StartChildActivity_Should_WriteTreeStructure_When_ChildFails() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child step", "Child failed")) { @@ -161,7 +161,7 @@ public async Task StartChildActivity_Should_WriteNestedTreeStructure_When_Grandc var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -195,7 +195,7 @@ public async Task FailAllAsync_Should_PropagateFailure_When_ChildDisposesWithout var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -222,7 +222,7 @@ public async Task Update_Should_BeIgnored_When_CalledAfterSuccess() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { activity.Success("Done"); activity.Update("This should be ignored"); @@ -243,7 +243,7 @@ public async Task Update_Should_WriteMultipleUpdates_When_CalledWithDifferentKin var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { activity.Update("Regular update"); activity.Update("Warning update", ActivityUpdateKind.Warning); @@ -271,7 +271,7 @@ public async Task Warning_Should_WriteExclamationGlyph_When_ActivityCompletes() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { activity.Warning("Something is off"); } @@ -314,7 +314,7 @@ public async Task Update_Should_WrapMessage_When_MessageExceedsWidth() var (console, writer) = CreateConsole(width: 30); // act - await using (var activity = console.StartActivity( "Root", "Failed")) + await using (var activity = console.StartActivity("Root", "Failed")) { activity.Update("This update message is long enough to wrap at narrow width"); activity.Success("Done"); @@ -338,7 +338,7 @@ public async Task Success_Should_WrapMessage_When_MessageExceedsWidth() var (console, writer) = CreateConsole(width: 30); // act - await using (var activity = console.StartActivity( "Root", "Failed")) + await using (var activity = console.StartActivity("Root", "Failed")) { activity.Success("This success message is long enough to wrap at narrow width"); } @@ -360,7 +360,7 @@ public async Task Fail_Should_WrapMessage_When_MessageExceedsWidth() var (console, writer) = CreateConsole(width: 30); // act - await using (var activity = console.StartActivity( "Root", "Failed")) + await using (var activity = console.StartActivity("Root", "Failed")) { activity.Fail("This failure message is long enough to wrap at narrow width"); } @@ -382,7 +382,7 @@ public async Task StartChildActivity_Should_WrapTitle_When_TitleExceedsWidth() var (console, writer) = CreateConsole(width: 30); // act - await using (var activity = console.StartActivity( "Root", "Failed")) + await using (var activity = console.StartActivity("Root", "Failed")) { await using (var child = activity.StartChildActivity( "This child title is long enough to wrap", @@ -412,7 +412,7 @@ public async Task ChildUpdate_Should_WrapMessage_When_MessageExceedsWidth() var (console, writer) = CreateConsole(width: 30); // act - await using (var activity = console.StartActivity( "Root", "Failed")) + await using (var activity = console.StartActivity("Root", "Failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -442,7 +442,7 @@ public async Task ChildSuccess_Should_WrapMessage_When_MessageExceedsWidth() var (console, writer) = CreateConsole(width: 30); // act - await using (var activity = console.StartActivity( "Root", "Failed")) + await using (var activity = console.StartActivity("Root", "Failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -470,7 +470,7 @@ public async Task ChildFail_Should_WrapMessage_When_MessageExceedsWidth() var (console, writer) = CreateConsole(width: 30); // act - await using (var activity = console.StartActivity( "Root", "Failed")) + await using (var activity = console.StartActivity("Root", "Failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -498,7 +498,7 @@ public async Task Update_Should_WriteDetails_When_CalledWithRenderable() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { activity.Update("Status", details: new Text("Detail line 1\nDetail line 2")); activity.Success("Done"); @@ -522,7 +522,7 @@ public async Task ChildUpdate_Should_WriteDetails_When_CalledWithRenderable() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -553,7 +553,7 @@ public async Task ChildFailAllAsync_Should_WriteCrossGlyphWithDetails_When_Calle var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -580,7 +580,7 @@ public async Task ChildWarning_Should_WriteExclamationGlyph_When_ActivityComplet var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -607,7 +607,7 @@ public async Task StartChildActivity_Should_WriteTreeStructure_When_MultipleSibl var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var first = activity.StartChildActivity("First child", "First failed")) { @@ -641,7 +641,7 @@ public async Task FailAllAsync_Should_PropagateFailure_When_GrandchildDisposesWi var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Root", "Root failed")) + await using (var activity = console.StartActivity("Root", "Root failed")) { await using (var child = activity.StartChildActivity("Child", "Child failed")) { @@ -675,7 +675,7 @@ public async Task Update_Should_WriteClockGlyph_When_CalledWithWaitingKind() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { activity.Update("Please wait", ActivityUpdateKind.Waiting); activity.Success("Done"); @@ -731,7 +731,7 @@ public async Task DisposeAsync_Should_TriggerFailure_When_NoCompletionCalled() var (console, writer) = CreateConsole(); // act - await using (var activity = console.StartActivity( "Doing work", "Work failed")) + await using (var activity = console.StartActivity("Doing work", "Work failed")) { // no explicit completion — DisposeAsync should trigger failure }