Fix various analyzer errors (#9697)

glen-84 · web-flow · commit 048b6c97cda7 · 2026-05-13T12:58:51.000+02:00
diff --git a/src/HotChocolate/Adapters/src/Adapters.Mcp/Directives/McpToolAnnotationsAttribute.cs b/src/HotChocolate/Adapters/src/Adapters.Mcp/Directives/McpToolAnnotationsAttribute.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using HotChocolate.Adapters.Mcp.Extensions;
 using HotChocolate.Types;
 using HotChocolate.Types.Descriptors;
 
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/CoreIntegrationTests.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/CoreIntegrationTests.cs
@@ -1,6 +1,5 @@
 using System.Text.Json;
 using HotChocolate.Adapters.Mcp.Diagnostics;
-using HotChocolate.Adapters.Mcp.Extensions;
 using HotChocolate.Adapters.Mcp.Storage;
 using HotChocolate.Execution.Configuration;
 using HotChocolate.Language;
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/FusionIntegrationTests.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/FusionIntegrationTests.cs
@@ -1,7 +1,6 @@
 using System.Buffers;
 using System.Text.Json;
 using HotChocolate.Adapters.Mcp.Diagnostics;
-using HotChocolate.Adapters.Mcp.Extensions;
 using HotChocolate.Adapters.Mcp.Storage;
 using HotChocolate.Buffers;
 using HotChocolate.Execution;
diff --git a/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/Handlers/CallToolHandlerTests.cs b/src/HotChocolate/Adapters/test/Adapters.Mcp.Tests/Handlers/CallToolHandlerTests.cs
@@ -1,4 +1,3 @@
-using HotChocolate.Adapters.Mcp.Extensions;
 using HotChocolate.Adapters.Mcp.Storage;
 using HotChocolate.Execution;
 using HotChocolate.Language;
diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpGetSchemaMiddlewareTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpGetSchemaMiddlewareTests.cs
@@ -3,7 +3,6 @@
 using HotChocolate.Execution;
 using HotChocolate.Types;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
diff --git a/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpGetSemanticNonNullSchemaMiddlewareTests.cs b/src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpGetSemanticNonNullSchemaMiddlewareTests.cs
@@ -3,7 +3,6 @@
 using HotChocolate.Execution;
 using HotChocolate.Types;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
diff --git a/src/HotChocolate/Core/src/Types.Abstractions/Serialization/SchemaFormatterOptions.cs b/src/HotChocolate/Core/src/Types.Abstractions/Serialization/SchemaFormatterOptions.cs
@@ -40,7 +40,7 @@ public sealed class SchemaFormatterOptions
 
     /// <summary>
     /// Controls whether directive definitions and applied directives whose
-    /// definition has <see cref="HotChocolate.Types.IDirectiveDefinition.IsPublic"/>
+    /// definition has <see cref="Types.IDirectiveDefinition.IsPublic"/>
     /// set to <c>false</c> are included in the output.
     /// Default: <c>true</c>.
     /// </summary>
diff --git a/src/HotChocolate/Diagnostics/src/Diagnostics.Core/Spans/ExecuteRequestSpanBase.cs b/src/HotChocolate/Diagnostics/src/Diagnostics.Core/Spans/ExecuteRequestSpanBase.cs
@@ -41,8 +41,7 @@ protected override void OnComplete()
         EnrichServerAttributes();
 
         string? operationTypeValue = null;
-        string? operationName = null;
-        if (TryGetOperationInfo(out var operationType, out operationName))
+        if (TryGetOperationInfo(out var operationType, out var operationName))
         {
             operationTypeValue = GraphQL.Operation.TypeValues[operationType];
             Activity.DisplayName = operationTypeValue;
@@ -103,18 +102,18 @@ private void EnrichServerAttributes()
         }
 
         if (!string.IsNullOrEmpty(request.Host.Host)
-            && Activity.GetTagItem(SemanticConventions.Server.Address) is null)
+            && Activity.GetTagItem(Server.Address) is null)
         {
-            Activity.SetTag(SemanticConventions.Server.Address, request.Host.Host);
+            Activity.SetTag(Server.Address, request.Host.Host);
         }
 
         if (request.Host.Port is { } port
-            && Activity.GetTagItem(SemanticConventions.Server.Port) is null)
+            && Activity.GetTagItem(Server.Port) is null)
         {
             var defaultPort = request.IsHttps ? 443 : 80;
             if (port != defaultPort)
             {
-                Activity.SetTag(SemanticConventions.Server.Port, port);
+                Activity.SetTag(Server.Port, port);
             }
         }
     }
diff --git a/src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Extensions/OperationPlanRequestOverridesExtensions.cs b/src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Extensions/OperationPlanRequestOverridesExtensions.cs
@@ -1,4 +1,3 @@
-using HotChocolate.Features;
 using HotChocolate.Fusion.Execution;
 
 // ReSharper disable once CheckNamespace
diff --git a/src/HotChocolate/Fusion/src/Fusion.Execution/Planning/OperationPlanner.Defer.cs b/src/HotChocolate/Fusion/src/Fusion.Execution/Planning/OperationPlanner.Defer.cs
@@ -240,10 +240,7 @@ ScopeState ScopeStateFor(ParentPlanContext scope)
                 return enclosingState;
             }
 
-            if (rootScopeState is null)
-            {
-                rootScopeState = new ScopeState(scope.ParentSteps, scope.ParentInternalOperation);
-            }
+            rootScopeState ??= new ScopeState(scope.ParentSteps, scope.ParentInternalOperation);
             return rootScopeState;
         }
 
@@ -578,8 +575,8 @@ private static bool TryLocateInternalSelectionSetAtPath(
         var promotedStep = providerStep with
         {
             Id = newParentStepId,
-            Dependents = ImmutableHashSet<int>.Empty,
-            ParentDependencies = ImmutableHashSet<ParentStepRef>.Empty,
+            Dependents = [],
+            ParentDependencies = [],
             SelectionSets = SelectionSetIndexer.CreateIdSet(providerStep.Definition.SelectionSet, index),
             RootSelectionSetId = index.GetId(providerStep.Definition.SelectionSet)
         };
diff --git a/src/HotChocolate/Fusion/test/Fusion.Composition.Tests/SourceSchemaMergerTestBase.cs b/src/HotChocolate/Fusion/test/Fusion.Composition.Tests/SourceSchemaMergerTestBase.cs
@@ -2,7 +2,6 @@
 using HotChocolate.Fusion.Options;
 using HotChocolate.Serialization;
 using HotChocolate.Types.Mutable;
-using HotChocolate.Types.Mutable.Serialization;
 using static HotChocolate.Fusion.CompositionTestHelper;
 
 namespace HotChocolate.Fusion;
diff --git a/src/HotChocolate/Fusion/test/Fusion.Composition.Tests/SourceSchemaMergerTests.cs b/src/HotChocolate/Fusion/test/Fusion.Composition.Tests/SourceSchemaMergerTests.cs
@@ -4,7 +4,6 @@
 using HotChocolate.Fusion.Options;
 using HotChocolate.Serialization;
 using HotChocolate.Types.Mutable;
-using HotChocolate.Types.Mutable.Serialization;
 using static HotChocolate.Fusion.CompositionTestHelper;
 using static HotChocolate.Fusion.WellKnownTypeNames;
 
diff --git a/src/HotChocolate/Fusion/test/Fusion.Connectors.ApolloFederation.Tests/Configuration/ParsersTests.cs b/src/HotChocolate/Fusion/test/Fusion.Connectors.ApolloFederation.Tests/Configuration/ParsersTests.cs
@@ -4,7 +4,6 @@
 using HotChocolate.Fusion.Logging;
 using HotChocolate.Fusion.Options;
 using HotChocolate.Fusion.Types;
-using HotChocolate.Language;
 
 namespace HotChocolate.Fusion.Configuration;
 
diff --git a/src/HotChocolate/Fusion/test/Fusion.Execution.Tests/Execution/OperationPlanContextRoutingTests.cs b/src/HotChocolate/Fusion/test/Fusion.Execution.Tests/Execution/OperationPlanContextRoutingTests.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Text.Json;
 using HotChocolate.Execution;
 using HotChocolate.Fusion.Execution.Nodes;
@@ -254,7 +253,7 @@ type Query {
                 .BuildServiceProvider();
 
             var executor = await services.GetRequestExecutorAsync();
-            var schema = (HotChocolate.Fusion.Types.FusionSchemaDefinition)executor.Schema;
+            var schema = (Fusion.Types.FusionSchemaDefinition)executor.Schema;
             var operationPlan = PlanOperation(
                 schema,
                 """
@@ -325,7 +324,7 @@ public void SetRequirements(
             _stores.Add(sourceStore);
 
             var entry = sourceStore.CreateVariableValueSets(CompactPath.Root, fields);
-            context.SetRequirements(ImmutableArray.Create(entry), keys);
+            context.SetRequirements([entry], keys);
         }
 
         public async ValueTask DisposeAsync()
diff --git a/src/HotChocolate/Fusion/test/Fusion.Execution.Tests/Execution/Results/FetchResultStoreTests.cs b/src/HotChocolate/Fusion/test/Fusion.Execution.Tests/Execution/Results/FetchResultStoreTests.cs
@@ -1,4 +1,3 @@
-using System.Collections.Immutable;
 using System.Text.Json;
 using HotChocolate.Execution;
 using HotChocolate.Fusion.Execution.Nodes;
@@ -282,7 +281,7 @@ public void CreateVariableValueSetsFromSnapshot_Should_ReturnEmpty_When_Imported
 
         // act
         var result = target.CreateVariableValueSetsFromSnapshot(
-            ImmutableArray<VariableValues>.Empty,
+            [],
             ImportedKeys("__fusion_1_id"),
             [],
             [Requirement("__fusion_1_id")]);
diff --git a/src/HotChocolate/Language/test/Language.SyntaxTree.Tests/Utilities/PrettierParity/PrettierParityTests.cs b/src/HotChocolate/Language/test/Language.SyntaxTree.Tests/Utilities/PrettierParity/PrettierParityTests.cs
@@ -1,5 +1,3 @@
-using CookieCrumble;
-
 namespace HotChocolate.Language.SyntaxTree.Utilities.PrettierParity;
 
 public class PrettierParityTests
diff --git a/src/Mocha/test/Mocha.Tests/MessageBusChangeTokenSourceTests.cs b/src/Mocha/test/Mocha.Tests/MessageBusChangeTokenSourceTests.cs
@@ -275,7 +275,7 @@ public void GetChangeToken_Should_ThrowObjectDisposedException_When_Disposed()
         topology.Dispose();
 
         // act & assert
-        Assert.Throws<ObjectDisposedException>(() => topology.GetChangeToken());
+        Assert.Throws<ObjectDisposedException>(topology.GetChangeToken);
     }
 
     [Fact]
@@ -304,7 +304,7 @@ public void Dispose_Should_NotThrow_When_CalledMultipleTimes()
 
         // act
         topology.Dispose();
-        var exception = Record.Exception(() => topology.Dispose());
+        var exception = Record.Exception(topology.Dispose);
 
         // assert
         Assert.Null(exception);
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/CommandTestBase.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/CommandTestBase.cs
@@ -48,7 +48,7 @@ public abstract class CommandTestBase
     protected readonly Mock<IEnvironmentsClient> EnvironmentsClientMock = new(MockBehavior.Strict);
     protected readonly Mock<IStagesClient> StagesClientMock = new(MockBehavior.Strict);
     internal readonly Mock<Services.Sessions.ISessionService> _sessionServiceMock = new();
-    internal readonly Mock<IBrowserLauncher> BrowserLauncherMock = new();
+    internal readonly Mock<IBrowserLauncher> _browserLauncherMock = new();
     protected readonly Mock<IWorkspacesClient> WorkspacesClientMock = new(MockBehavior.Strict);
     private InteractionMode _interactionMode = InteractionMode.NonInteractive;
     private bool _authenticated = true;
@@ -226,7 +226,7 @@ private ServiceProvider BuildServices(INitroConsole console)
         services.Replace(ServiceDescriptor.Singleton(_fileSystemMock.Object));
         services.Replace(ServiceDescriptor.Singleton(_environmentVariableProviderMock.Object));
         services.Replace(ServiceDescriptor.Singleton(_sessionServiceMock.Object));
-        services.Replace(ServiceDescriptor.Singleton(BrowserLauncherMock.Object));
+        services.Replace(ServiceDescriptor.Singleton(_browserLauncherMock.Object));
         services.Replace(ServiceDescriptor.Singleton(WorkspacesClientMock.Object));
         services.Replace(ServiceDescriptor.Singleton(SchemasClientMock.Object));
         services.Replace(ServiceDescriptor.Singleton(FusionConfigurationClientMock.Object));
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionComposeCommandTests.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Fusion/FusionComposeCommandTests.cs
@@ -14,9 +14,6 @@ public sealed class FusionComposeCommandTests(NitroCommandFixture fixture)
     private static readonly string s_validExample1CompositeSchema =
         File.ReadAllText("__resources__/valid-example-1-result/composite-schema.graphqls");
 
-    private static readonly string s_invalidExample1CompositeSchema =
-        File.ReadAllText("__resources__/invalid-example-1-result/composite-schema.graphqls");
-
     private static readonly string s_validExcludeByTagCompositeSchema =
         File.ReadAllText("__resources__/valid-exclude-by-tag-result/composite-schema.graphqls");
 
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Session/LaunchCommandTests.cs b/src/Nitro/CommandLine/test/CommandLine.Tests/Commands/Session/LaunchCommandTests.cs
@@ -41,7 +41,7 @@ public async Task NoSession_OpensDefaultNitroWebUrl()
 
         // assert
         Assert.Equal(0, result.ExitCode);
-        BrowserLauncherMock.Verify(x => x.Open(Constants.NitroWebUrl), Times.Once);
+        _browserLauncherMock.Verify(x => x.Open(Constants.NitroWebUrl), Times.Once);
     }
 
     [Fact]
@@ -56,7 +56,7 @@ public async Task DefaultApiUrl_OpensDefaultNitroWebUrl()
 
         // assert
         Assert.Equal(0, result.ExitCode);
-        BrowserLauncherMock.Verify(x => x.Open(Constants.NitroWebUrl), Times.Once);
+        _browserLauncherMock.Verify(x => x.Open(Constants.NitroWebUrl), Times.Once);
     }
 
     [Fact]
@@ -73,7 +73,7 @@ public async Task CustomApiUrl_OpensBaseUrlSlashUi()
 
         // assert
         Assert.Equal(0, result.ExitCode);
-        BrowserLauncherMock.Verify(x => x.Open("https://api.custom.com/ui"), Times.Once);
+        _browserLauncherMock.Verify(x => x.Open("https://api.custom.com/ui"), Times.Once);
     }
 
     [Fact]
@@ -90,6 +90,6 @@ public async Task CustomApiUrlWithScheme_OpensBaseUrlSlashUi()
 
         // assert
         Assert.Equal(0, result.ExitCode);
-        BrowserLauncherMock.Verify(x => x.Open("https://api.custom.com/ui"), Times.Once);
+        _browserLauncherMock.Verify(x => x.Open("https://api.custom.com/ui"), Times.Once);
     }
 }
diff --git a/src/Nitro/CommandLine/test/CommandLine.Tests/__resources__/invalid-example-1-result/composite-schema.graphqls b/src/Nitro/CommandLine/test/CommandLine.Tests/__resources__/invalid-example-1-result/composite-schema.graphqls

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using HotChocolate.Adapters.Mcp.Extensions;`
`3`	`2`	`using HotChocolate.Types;`
`4`	`3`	`using HotChocolate.Types.Descriptors;`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using HotChocolate.Adapters.Mcp.Extensions;`
`2`	`1`	`using HotChocolate.Adapters.Mcp.Storage;`
`3`	`2`	`using HotChocolate.Execution;`
`4`	`3`	`using HotChocolate.Language;`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ protected override void OnComplete()`
`41`	`41`	`EnrichServerAttributes();`
`42`	`42`
`43`	`43`	`string? operationTypeValue = null;`
`44`		`- string? operationName = null;`
`45`		`- if (TryGetOperationInfo(out var operationType, out operationName))`
	`44`	`+ if (TryGetOperationInfo(out var operationType, out var operationName))`
`46`	`45`	`{`
`47`	`46`	`operationTypeValue = GraphQL.Operation.TypeValues[operationType];`
`48`	`47`	`Activity.DisplayName = operationTypeValue;`
`@@ -103,18 +102,18 @@ private void EnrichServerAttributes()`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`if (!string.IsNullOrEmpty(request.Host.Host)`
`106`		`- && Activity.GetTagItem(SemanticConventions.Server.Address) is null)`
	`105`	`+ && Activity.GetTagItem(Server.Address) is null)`
`107`	`106`	`{`
`108`		`- Activity.SetTag(SemanticConventions.Server.Address, request.Host.Host);`
	`107`	`+ Activity.SetTag(Server.Address, request.Host.Host);`
`109`	`108`	`}`
`110`	`109`
`111`	`110`	`if (request.Host.Port is { } port`
`112`		`- && Activity.GetTagItem(SemanticConventions.Server.Port) is null)`
	`111`	`+ && Activity.GetTagItem(Server.Port) is null)`
`113`	`112`	`{`
`114`	`113`	`var defaultPort = request.IsHttps ? 443 : 80;`
`115`	`114`	`if (port != defaultPort)`
`116`	`115`	`{`
`117`		`- Activity.SetTag(SemanticConventions.Server.Port, port);`
	`116`	`+ Activity.SetTag(Server.Port, port);`
`118`	`117`	`}`
`119`	`118`	`}`
`120`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using HotChocolate.Features;`
`2`	`1`	`using HotChocolate.Fusion.Execution;`
`3`	`2`
`4`	`3`	`// ReSharper disable once CheckNamespace`