Fix simple scenarios for combining contexts (#6)

* Fix simple scenarios for combining contexts * feedback
krwq · Jun 7, 2022 · fe6264d · fe6264d
1 parent ba3b401
commit fe6264d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Emitter.cs b/src/libraries/System.Text.Json/gen/JsonSourceGenerator.Emitter.cs
@@ -706,10 +706,10 @@ private string GeneratePropMetadataInitFunc(TypeGenerationSpec typeGenerationSpe
 
                 sb.Append($@"
 
-private static {JsonPropertyInfoTypeRef}[] {propInitMethodName}({JsonSerializerContextTypeRef} context)
+private {JsonPropertyInfoTypeRef}[] {propInitMethodName}({JsonSerializerContextTypeRef}? context)
 {{
-    {contextTypeRef} {JsonContextVarName} = ({contextTypeRef})context;
-    {JsonSerializerOptionsTypeRef} options = context.Options;
+    {contextTypeRef} {JsonContextVarName} = ({contextTypeRef}?)context ?? this;
+    {JsonSerializerOptionsTypeRef} options = {JsonContextVarName}.Options;
 
     {JsonPropertyInfoTypeRef}[] {PropVarName} = {propertyArrayInstantiationValue};
 ");

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerContext.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerContext.cs
@@ -101,6 +101,7 @@ protected JsonSerializerContext(JsonSerializerOptions? options, bool bindOptions
                 if (bindOptionsToContext)
                 {
                     options.TypeInfoResolver = this;
+                    Debug.Assert(_options == options, "options.TypeInfoResolver setter did not assign options");
                 }
                 else
                 {

diff --git a/.../System.Text.Json/src/System/Text/Json/Serialization/Metadata/SourceGenJsonTypeInfoOfT.cs b/.../System.Text.Json/src/System/Text/Json/Serialization/Metadata/SourceGenJsonTypeInfoOfT.cs
@@ -102,7 +102,7 @@ internal override JsonParameterInfoValues[] GetParameterInfoValues()
         {
             JsonSerializerContext? context = Options.SerializerContext;
             JsonParameterInfoValues[] array;
-            if (context == null || CtorParamInitFunc == null || (array = CtorParamInitFunc()) == null)
+            if (CtorParamInitFunc == null || (array = CtorParamInitFunc()) == null)
             {
                 ThrowHelper.ThrowInvalidOperationException_NoMetadataForTypeCtorParams(context, Type);
                 return null!;
@@ -120,7 +120,7 @@ internal void AddPropertiesUsingSourceGenInfo()
 
             JsonSerializerContext? context = Options.SerializerContext;
             JsonPropertyInfo[] array;
-            if (context == null || PropInitFunc == null || (array = PropInitFunc(context)) == null)
+            if (PropInitFunc == null || (array = PropInitFunc(context!)) == null)
             {
                 if (typeof(T) == typeof(object))
                 {

diff --git a/...tem.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/JsonSerializerContextTests.cs b/...tem.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/JsonSerializerContextTests.cs
@@ -106,7 +106,7 @@ public static void CombiningContexts_Serialization<T>(T value, string expectedJs
 
         public static IEnumerable<object[]> GetCombiningContextsData()
         {
-            yield return WrapArgs(new JsonMessage { Message = "Hi" }, """{ "Message" : { "Hi" } }""");
+            yield return WrapArgs(new JsonMessage { Message = "Hi" }, """{ "Message" : "Hi", "Length" : 2 }""");
             yield return WrapArgs(new Person("John", "Doe"), """{ "FirstName" : "John", "LastName" : "Doe" }""");
             static object[] WrapArgs<T>(T value, string expectedJson) => new object[] { value, expectedJson };
         }