ChilliCream · tobias-tengler · May 20, 2026 · May 20, 2026
diff --git a/src/HotChocolate/Core/src/Types.Analyzers/FileBuilders/TypeFileBuilderBase.cs b/src/HotChocolate/Core/src/Types.Analyzers/FileBuilders/TypeFileBuilderBase.cs
@@ -95,7 +95,7 @@ protected void WriteInitializationBase(
             {
                 Writer.WriteIndentedLine("extension.Context,");
                 Writer.WriteIndentedLine("descriptor,");
-                Writer.WriteIndentedLine("null,");
+                Writer.WriteIndentedLine("typeof(global::{0}),", schemaFullTypeName);
 
                 var first = true;
                 foreach (var attribute in attributes)

diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/IntegrationTests.cs b/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/IntegrationTests.cs
@@ -75,6 +75,23 @@ public async Task Subscription_With_Public_Subscribe_Source_Is_Not_Exposed_As_Fi
             subscription.Fields.Where(f => !f.IsIntrospectionField).Select(f => f.Name).ToArray());
     }
 
+    [Fact]
+    public async Task ObjectTypeDescriptorAttribute_Should_Receive_NonNull_Type_When_Applied_To_StaticPartial_TypeExtension()
+    {
+        // arrange
+        var schema = await new ServiceCollection()
+            .AddGraphQLServer()
+            .AddIntegrationTestTypes()
+            .AddPagingArguments()
+            .BuildSchemaAsync();
+
+        // act
+        var renamedType = schema.Types.GetType<ObjectType>("renamed_DescriptorAttributeProbe");
+
+        // assert
+        Assert.NotNull(renamedType);
+    }
+
     [Fact]
     public async Task Maps_NullOrdering_From_PagingOptions_To_PagingArguments()
     {

diff --git a/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/Types.cs b/src/HotChocolate/Core/test/Types.Analyzers.Integration.Tests/Types.cs
@@ -222,3 +222,33 @@ protected override void OnConfigure(
             });
     }
 }
+
+public class DescriptorAttributeProbe
+{
+    public string Name { get; set; } = "default";
+}
+
+[ObjectType<DescriptorAttributeProbe>]
+[PrefixTypeName("renamed")]
+public static partial class DescriptorAttributeProbeType;
+
+public sealed class PrefixTypeNameAttribute(string prefix) : ObjectTypeDescriptorAttribute
+{
+    public string Prefix { get; } = prefix;
+
+    protected override void OnConfigure(
+        IDescriptorContext context,
+        IObjectTypeDescriptor descriptor,
+        Type? type)
+    {
+        if (type is null)
+        {
+            return;
+        }
+
+        var capturedPrefix = Prefix;
+        descriptor
+            .Extend()
+            .OnBeforeCreate((_, cfg) => cfg.Name = $"{capturedPrefix}_{cfg.Name}");
+    }
+}
diff --git a/...est/Types.Analyzers.Integration.Tests/__snapshots__/IntegrationTests.Schema_Snapshot.snap b/...est/Types.Analyzers.Integration.Tests/__snapshots__/IntegrationTests.Schema_Snapshot.snap
@@ -207,6 +207,10 @@ type ProductsEdge {
   node: Product!
 }
 
+type renamed_DescriptorAttributeProbe {
+  name: String!
+}
+
 type Shape {
   key: String!
   name: String!

diff --git a/...ests/__snapshots__/IntegrationTests.Schema_Snapshot_Without_ConnectionName_Inference.snap b/...ests/__snapshots__/IntegrationTests.Schema_Snapshot_Without_ConnectionName_Inference.snap
@@ -164,6 +164,10 @@ type ProductEdge {
   node: Product!
 }
 
+type renamed_DescriptorAttributeProbe {
+  name: String!
+}
+
 type Shape {
   key: String!
   name: String!

diff --git a/...napshots__/CollectionInferenceTests.Infer_Dictionary_As_List_Of_KeyValuePair.md b/...napshots__/CollectionInferenceTests.Infer_Dictionary_As_List_Of_KeyValuePair.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...napshots__/LookupReturnsListTypeAnalyzerTests.Method_ArrayReturn_RaisesError.md b/...napshots__/LookupReturnsListTypeAnalyzerTests.Method_ArrayReturn_RaisesError.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ts__/LookupReturnsListTypeAnalyzerTests.Method_IEnumerableReturn_RaisesError.md b/...ts__/LookupReturnsListTypeAnalyzerTests.Method_IEnumerableReturn_RaisesError.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...snapshots__/LookupReturnsListTypeAnalyzerTests.Method_ListReturn_RaisesError.md b/...snapshots__/LookupReturnsListTypeAnalyzerTests.Method_ListReturn_RaisesError.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...pshots__/LookupReturnsListTypeAnalyzerTests.Method_NoLookupAttribute_NoError.md b/...pshots__/LookupReturnsListTypeAnalyzerTests.Method_NoLookupAttribute_NoError.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...__snapshots__/LookupReturnsListTypeAnalyzerTests.Method_SingleReturn_NoError.md b/...__snapshots__/LookupReturnsListTypeAnalyzerTests.Method_SingleReturn_NoError.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...shots__/LookupReturnsListTypeAnalyzerTests.Method_TaskListReturn_RaisesError.md b/...shots__/LookupReturnsListTypeAnalyzerTests.Method_TaskListReturn_RaisesError.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...apshots__/LookupReturnsListTypeAnalyzerTests.Property_ListReturn_RaisesError.md b/...apshots__/LookupReturnsListTypeAnalyzerTests.Property_ListReturn_RaisesError.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...leTypeAnalyzerTests.Method_FullyQualifiedTaskNonNullableReturn_RaisesWarning.md b/...leTypeAnalyzerTests.Method_FullyQualifiedTaskNonNullableReturn_RaisesWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...nNullableTypeAnalyzerTests.Method_FullyQualifiedTaskNullableReturn_NoWarning.md b/...nNullableTypeAnalyzerTests.Method_FullyQualifiedTaskNullableReturn_NoWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...LookupReturnsNonNullableTypeAnalyzerTests.Method_NoLookupAttribute_NoWarning.md b/...LookupReturnsNonNullableTypeAnalyzerTests.Method_NoLookupAttribute_NoWarning.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...upReturnsNonNullableTypeAnalyzerTests.Method_NonNullableReturn_RaisesWarning.md b/...upReturnsNonNullableTypeAnalyzerTests.Method_NonNullableReturn_RaisesWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...__/LookupReturnsNonNullableTypeAnalyzerTests.Method_NullableReturn_NoWarning.md b/...__/LookupReturnsNonNullableTypeAnalyzerTests.Method_NullableReturn_NoWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...turnsNonNullableTypeAnalyzerTests.Method_TaskNonNullableReturn_RaisesWarning.md b/...turnsNonNullableTypeAnalyzerTests.Method_TaskNonNullableReturn_RaisesWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ookupReturnsNonNullableTypeAnalyzerTests.Method_TaskNullableReturn_NoWarning.md b/...ookupReturnsNonNullableTypeAnalyzerTests.Method_TaskNullableReturn_NoWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...NonNullableTypeAnalyzerTests.Method_ValueTaskNonNullableReturn_RaisesWarning.md b/...NonNullableTypeAnalyzerTests.Method_ValueTaskNonNullableReturn_RaisesWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ReturnsNonNullableTypeAnalyzerTests.Property_NonNullableReturn_RaisesWarning.md b/...ReturnsNonNullableTypeAnalyzerTests.Property_NonNullableReturn_RaisesWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/.../LookupReturnsNonNullableTypeAnalyzerTests.Property_NullableReturn_NoWarning.md b/.../LookupReturnsNonNullableTypeAnalyzerTests.Property_NullableReturn_NoWarning.md
@@ -68,7 +68,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...onTests.GraphQLDescription_Attribute_Still_Works_When_DisableXmlDocumentation_Is_Set.snap b/...onTests.GraphQLDescription_Attribute_Still_Works_When_DisableXmlDocumentation_Is_Set.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...cumentationTests.XmlDocumentation_Is_Emitted_When_DisableXmlDocumentation_Is_Not_Set.snap b/...cumentationTests.XmlDocumentation_Is_Emitted_When_DisableXmlDocumentation_Is_Not_Set.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ocumentationTests.XmlDocumentation_Is_Suppressed_When_DisableXmlDocumentation_Is_Set.snap b/...ocumentationTests.XmlDocumentation_Is_Suppressed_When_DisableXmlDocumentation_Is_Set.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...pes.Analyzers.Tests/__snapshots__/ObjectTypeTests.Argument_With_DefaultValue.md b/...pes.Analyzers.Tests/__snapshots__/ObjectTypeTests.Argument_With_DefaultValue.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ts/__snapshots__/ObjectTypeTests.NullableValueTypeArgument_With_DefaultValue.md b/...ts/__snapshots__/ObjectTypeTests.NullableValueTypeArgument_With_DefaultValue.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...rs.Tests/__snapshots__/ObjectTypeTests.XmlDocumentation_With_ComplexScenario.md b/...rs.Tests/__snapshots__/ObjectTypeTests.XmlDocumentation_With_ComplexScenario.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...sts/__snapshots__/ObjectTypeTests.XmlDocumentation_With_MultilineDescription.md b/...sts/__snapshots__/ObjectTypeTests.XmlDocumentation_With_MultilineDescription.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...sts/__snapshots__/ObjectTypeTests.XmlDocumentation_With_ParameterDescription.md b/...sts/__snapshots__/ObjectTypeTests.XmlDocumentation_With_ParameterDescription.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/....Tests/__snapshots__/ObjectTypeTests.XmlDocumentation_With_SpecialCharacters.md b/....Tests/__snapshots__/ObjectTypeTests.XmlDocumentation_With_SpecialCharacters.md
@@ -67,7 +67,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ots__/ObjectTypeXmlDocInferenceTests.When_class_has_description_then_it_is_converted.snap b/...ots__/ObjectTypeXmlDocInferenceTests.When_class_has_description_then_it_is_converted.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ments_interface_and_method_has_description_then_method_parameter_description_is_used.snap b/...ments_interface_and_method_has_description_then_method_parameter_description_is_used.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...bjectTypeXmlDocInferenceTests.When_description_has_generic_tags_then_it_is_converted.snap b/...bjectTypeXmlDocInferenceTests.When_description_has_generic_tags_then_it_is_converted.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...bjectTypeXmlDocInferenceTests.When_description_has_paramref_tag_then_it_is_converted.snap b/...bjectTypeXmlDocInferenceTests.When_description_has_paramref_tag_then_it_is_converted.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...s__/ObjectTypeXmlDocInferenceTests.When_description_has_see_tag_then_it_is_converted.snap b/...s__/ObjectTypeXmlDocInferenceTests.When_description_has_see_tag_then_it_is_converted.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ferenceTests.When_method_has_exceptions_then_exceptions_with_no_code_will_be_ignored.snap b/...ferenceTests.When_method_has_exceptions_then_exceptions_with_no_code_will_be_ignored.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;
 

diff --git a/...ots__/ObjectTypeXmlDocInferenceTests.When_method_has_exceptions_then_it_is_converted.snap b/...ots__/ObjectTypeXmlDocInferenceTests.When_method_has_exceptions_then_it_is_converted.snap
@@ -63,7 +63,7 @@ namespace TestNamespace
             HotChocolate.Internal.ConfigurationHelper.ApplyConfiguration(
                 extension.Context,
                 descriptor,
-                null,
+                typeof(global::TestNamespace.Query),
                 new global::HotChocolate.Types.QueryTypeAttribute());
             configuration.ConfigurationsAreApplied = true;