Fix binder gen nullability issue wrt binding ref type members (#89900)

layomia · web-flow · commit 4f9fbcf01382 · 2023-08-03T06:03:49.000-07:00
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Emitter.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/ConfigurationBindingGenerator.Emitter.cs
@@ -73,7 +73,8 @@ private void EmitBindCoreCall(
                 string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
                 if (initKind is InitializationKind.AssignmentWithNullCheck)
                 {
-                    _writer.WriteLine($"{type.MinimalDisplayString} {tempIdentifier} = {memberAccessExpr};");
+                    Debug.Assert(!type.IsValueType);
+                    _writer.WriteLine($"{type.MinimalDisplayString}? {tempIdentifier} = {memberAccessExpr};");
                     EmitBindCoreCall(tempIdentifier, InitializationKind.AssignmentWithNullCheck);
                 }
                 else if (initKind is InitializationKind.None && type.IsValueType)
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/CoreBindingHelper.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Helpers/Emitter/CoreBindingHelper.cs
@@ -837,14 +837,14 @@ private bool EmitBindImplForMember(
 
                 EmitStartBlock($"if ({sectionValidationCall} is {Identifier.IConfigurationSection} {sectionIdentifier})");
 
-                bool success = !EmitInitException(effectiveMemberType);
-                if (success)
+                bool canInit = !EmitInitException(effectiveMemberType);
+                if (canInit)
                 {
                     EmitBindCoreCallForMember(member, memberAccessExpr, sectionIdentifier, canSet);
                 }
 
                 EmitEndBlock();
-                return success;
+                return canInit;
             }
 
             private void EmitBindCoreCallForMember(
@@ -856,8 +856,6 @@ private void EmitBindCoreCallForMember(
 
                 TypeSpec memberType = member.Type;
                 TypeSpec effectiveMemberType = memberType.EffectiveType;
-                string effectiveMemberTypeDisplayString = effectiveMemberType.MinimalDisplayString;
-                bool canGet = member.CanGet;
 
                 string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);
                 InitializationKind initKind;
@@ -871,6 +869,7 @@ private void EmitBindCoreCallForMember(
                     }
 
                     Debug.Assert(canSet);
+                    string effectiveMemberTypeDisplayString = effectiveMemberType.MinimalDisplayString;
                     initKind = InitializationKind.None;
 
                     if (memberType.SpecKind is TypeSpecKind.Nullable)
@@ -889,7 +888,7 @@ private void EmitBindCoreCallForMember(
 
                     targetObjAccessExpr = tempIdentifier;
                 }
-                else if (canGet)
+                else if (member.CanGet)
                 {
                     targetObjAccessExpr = memberAccessExpr;
                     initKind = InitializationKind.AssignmentWithNullCheck;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.TestClasses.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/Common/ConfigurationBinderTests.TestClasses.cs
@@ -605,7 +605,7 @@ public class QueueNamespaces
         {
             public string Namespace { get; set; }
 
-            public Dictionary<string, QueueProperties> Queues { get; set; } = new();
+            public Dictionary<string, QueueProperties>? Queues { get; set; } = new();
         }
 
         public class QueueProperties
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/Collections.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/Collections.generated.txt
@@ -198,31 +198,31 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("CustomDictionary")) is IConfigurationSection section1)
             {
-                Program.CustomDictionary<string, int> temp3 = obj.CustomDictionary;
+                Program.CustomDictionary<string, int>? temp3 = obj.CustomDictionary;
                 temp3 ??= new Program.CustomDictionary<string, int>();
                 BindCore(section1, ref temp3, binderOptions);
                 obj.CustomDictionary = temp3;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("CustomList")) is IConfigurationSection section4)
             {
-                Program.CustomList temp6 = obj.CustomList;
+                Program.CustomList? temp6 = obj.CustomList;
                 temp6 ??= new Program.CustomList();
                 BindCore(section4, ref temp6, binderOptions);
                 obj.CustomList = temp6;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("IReadOnlyList")) is IConfigurationSection section7)
             {
-                IReadOnlyList<int> temp9 = obj.IReadOnlyList;
+                IReadOnlyList<int>? temp9 = obj.IReadOnlyList;
                 temp9 = temp9 is null ? new List<int>() : new List<int>(temp9);
                 BindCore(section7, ref temp9, binderOptions);
                 obj.IReadOnlyList = temp9;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("IReadOnlyDictionary")) is IConfigurationSection section10)
             {
-                IReadOnlyDictionary<string, int> temp12 = obj.IReadOnlyDictionary;
+                IReadOnlyDictionary<string, int>? temp12 = obj.IReadOnlyDictionary;
                 temp12 = temp12 is null ? new Dictionary<string, int>() : temp12.ToDictionary(pair => pair.Key, pair => pair.Value);
                 BindCore(section10, ref temp12, binderOptions);
                 obj.IReadOnlyDictionary = temp12;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind.generated.txt
@@ -97,23 +97,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section2)
             {
-                List<int> temp4 = obj.MyList;
+                List<int>? temp4 = obj.MyList;
                 temp4 ??= new List<int>();
                 BindCore(section2, ref temp4, binderOptions);
                 obj.MyList = temp4;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section5)
             {
-                Dictionary<string, string> temp7 = obj.MyDictionary;
+                Dictionary<string, string>? temp7 = obj.MyDictionary;
                 temp7 ??= new Dictionary<string, string>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyDictionary = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyComplexDictionary")) is IConfigurationSection section8)
             {
-                Dictionary<string, Program.MyClass2> temp10 = obj.MyComplexDictionary;
+                Dictionary<string, Program.MyClass2>? temp10 = obj.MyComplexDictionary;
                 temp10 ??= new Dictionary<string, Program.MyClass2>();
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyComplexDictionary = temp10;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind_Instance.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind_Instance.generated.txt
@@ -91,23 +91,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section2)
             {
-                List<int> temp4 = obj.MyList;
+                List<int>? temp4 = obj.MyList;
                 temp4 ??= new List<int>();
                 BindCore(section2, ref temp4, binderOptions);
                 obj.MyList = temp4;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section5)
             {
-                Dictionary<string, string> temp7 = obj.MyDictionary;
+                Dictionary<string, string>? temp7 = obj.MyDictionary;
                 temp7 ??= new Dictionary<string, string>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyDictionary = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyComplexDictionary")) is IConfigurationSection section8)
             {
-                Dictionary<string, Program.MyClass2> temp10 = obj.MyComplexDictionary;
+                Dictionary<string, Program.MyClass2>? temp10 = obj.MyComplexDictionary;
                 temp10 ??= new Dictionary<string, Program.MyClass2>();
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyComplexDictionary = temp10;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind_Instance_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind_Instance_BinderOptions.generated.txt
@@ -91,23 +91,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section2)
             {
-                List<int> temp4 = obj.MyList;
+                List<int>? temp4 = obj.MyList;
                 temp4 ??= new List<int>();
                 BindCore(section2, ref temp4, binderOptions);
                 obj.MyList = temp4;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section5)
             {
-                Dictionary<string, string> temp7 = obj.MyDictionary;
+                Dictionary<string, string>? temp7 = obj.MyDictionary;
                 temp7 ??= new Dictionary<string, string>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyDictionary = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyComplexDictionary")) is IConfigurationSection section8)
             {
-                Dictionary<string, Program.MyClass2> temp10 = obj.MyComplexDictionary;
+                Dictionary<string, Program.MyClass2>? temp10 = obj.MyComplexDictionary;
                 temp10 ??= new Dictionary<string, Program.MyClass2>();
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyComplexDictionary = temp10;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind_Key_Instance.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Bind_Key_Instance.generated.txt
@@ -91,23 +91,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section2)
             {
-                List<int> temp4 = obj.MyList;
+                List<int>? temp4 = obj.MyList;
                 temp4 ??= new List<int>();
                 BindCore(section2, ref temp4, binderOptions);
                 obj.MyList = temp4;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section5)
             {
-                Dictionary<string, string> temp7 = obj.MyDictionary;
+                Dictionary<string, string>? temp7 = obj.MyDictionary;
                 temp7 ??= new Dictionary<string, string>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyDictionary = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyComplexDictionary")) is IConfigurationSection section8)
             {
-                Dictionary<string, Program.MyClass2> temp10 = obj.MyComplexDictionary;
+                Dictionary<string, Program.MyClass2>? temp10 = obj.MyComplexDictionary;
                 temp10 ??= new Dictionary<string, Program.MyClass2>();
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyComplexDictionary = temp10;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Get.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Get.generated.txt
@@ -129,23 +129,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section6)
             {
-                List<int> temp8 = obj.MyList;
+                List<int>? temp8 = obj.MyList;
                 temp8 ??= new List<int>();
                 BindCore(section6, ref temp8, binderOptions);
                 obj.MyList = temp8;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyArray")) is IConfigurationSection section9)
             {
-                int[] temp11 = obj.MyArray;
+                int[]? temp11 = obj.MyArray;
                 temp11 ??= new int[0];
                 BindCore(section9, ref temp11, binderOptions);
                 obj.MyArray = temp11;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section12)
             {
-                Dictionary<string, string> temp14 = obj.MyDictionary;
+                Dictionary<string, string>? temp14 = obj.MyDictionary;
                 temp14 ??= new Dictionary<string, string>();
                 BindCore(section12, ref temp14, binderOptions);
                 obj.MyDictionary = temp14;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Get_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Get_T.generated.txt
@@ -112,23 +112,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section5)
             {
-                List<int> temp7 = obj.MyList;
+                List<int>? temp7 = obj.MyList;
                 temp7 ??= new List<int>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyList = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyArray")) is IConfigurationSection section8)
             {
-                int[] temp10 = obj.MyArray;
+                int[]? temp10 = obj.MyArray;
                 temp10 ??= new int[0];
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyArray = temp10;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section11)
             {
-                Dictionary<string, string> temp13 = obj.MyDictionary;
+                Dictionary<string, string>? temp13 = obj.MyDictionary;
                 temp13 ??= new Dictionary<string, string>();
                 BindCore(section11, ref temp13, binderOptions);
                 obj.MyDictionary = temp13;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Get_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ConfigurationBinder/Get_T_BinderOptions.generated.txt
@@ -112,23 +112,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section5)
             {
-                List<int> temp7 = obj.MyList;
+                List<int>? temp7 = obj.MyList;
                 temp7 ??= new List<int>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyList = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyArray")) is IConfigurationSection section8)
             {
-                int[] temp10 = obj.MyArray;
+                int[]? temp10 = obj.MyArray;
                 temp10 ??= new int[0];
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyArray = temp10;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section11)
             {
-                Dictionary<string, string> temp13 = obj.MyDictionary;
+                Dictionary<string, string>? temp13 = obj.MyDictionary;
                 temp13 ??= new Dictionary<string, string>();
                 BindCore(section11, ref temp13, binderOptions);
                 obj.MyDictionary = temp13;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/BindConfiguration.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/BindConfiguration.generated.txt
@@ -103,7 +103,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section3)
             {
-                List<int> temp5 = obj.MyList;
+                List<int>? temp5 = obj.MyList;
                 temp5 ??= new List<int>();
                 BindCore(section3, ref temp5, binderOptions);
                 obj.MyList = temp5;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T.generated.txt
@@ -121,7 +121,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section3)
             {
-                List<int> temp5 = obj.MyList;
+                List<int>? temp5 = obj.MyList;
                 temp5 ??= new List<int>();
                 BindCore(section3, ref temp5, binderOptions);
                 obj.MyList = temp5;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/OptionsBuilder/Bind_T_BinderOptions.generated.txt
@@ -115,7 +115,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section3)
             {
-                List<int> temp5 = obj.MyList;
+                List<int>? temp5 = obj.MyList;
                 temp5 ??= new List<int>();
                 BindCore(section3, ref temp5, binderOptions);
                 obj.MyList = temp5;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T.generated.txt
@@ -150,23 +150,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section5)
             {
-                List<int> temp7 = obj.MyList;
+                List<int>? temp7 = obj.MyList;
                 temp7 ??= new List<int>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyList = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyList2")) is IConfigurationSection section8)
             {
-                List<Program.MyClass2> temp10 = obj.MyList2;
+                List<Program.MyClass2>? temp10 = obj.MyList2;
                 temp10 ??= new List<Program.MyClass2>();
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyList2 = temp10;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section11)
             {
-                Dictionary<string, string> temp13 = obj.MyDictionary;
+                Dictionary<string, string>? temp13 = obj.MyDictionary;
                 temp13 ??= new Dictionary<string, string>();
                 BindCore(section11, ref temp13, binderOptions);
                 obj.MyDictionary = temp13;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_BinderOptions.generated.txt
@@ -150,23 +150,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section5)
             {
-                List<int> temp7 = obj.MyList;
+                List<int>? temp7 = obj.MyList;
                 temp7 ??= new List<int>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyList = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyList2")) is IConfigurationSection section8)
             {
-                List<Program.MyClass2> temp10 = obj.MyList2;
+                List<Program.MyClass2>? temp10 = obj.MyList2;
                 temp10 ??= new List<Program.MyClass2>();
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyList2 = temp10;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section11)
             {
-                Dictionary<string, string> temp13 = obj.MyDictionary;
+                Dictionary<string, string>? temp13 = obj.MyDictionary;
                 temp13 ??= new Dictionary<string, string>();
                 BindCore(section11, ref temp13, binderOptions);
                 obj.MyDictionary = temp13;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name.generated.txt
@@ -150,23 +150,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration
 
             if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section5)
             {
-                List<int> temp7 = obj.MyList;
+                List<int>? temp7 = obj.MyList;
                 temp7 ??= new List<int>();
                 BindCore(section5, ref temp7, binderOptions);
                 obj.MyList = temp7;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyList2")) is IConfigurationSection section8)
             {
-                List<Program.MyClass2> temp10 = obj.MyList2;
+                List<Program.MyClass2>? temp10 = obj.MyList2;
                 temp10 ??= new List<Program.MyClass2>();
                 BindCore(section8, ref temp10, binderOptions);
                 obj.MyList2 = temp10;
             }
 
             if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section11)
             {
-                Dictionary<string, string> temp13 = obj.MyDictionary;
+                Dictionary<string, string>? temp13 = obj.MyDictionary;
                 temp13 ??= new Dictionary<string, string>();
                 BindCore(section11, ref temp13, binderOptions);
                 obj.MyDictionary = temp13;
diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/ServiceCollection/Configure_T_name_BinderOptions.generated.txt

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,8 @@ private void EmitBindCoreCall(`
`73`	`73`	`string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);`
`74`	`74`	`if (initKind is InitializationKind.AssignmentWithNullCheck)`
`75`	`75`	`{`
`76`		`- _writer.WriteLine($"{type.MinimalDisplayString} {tempIdentifier} = {memberAccessExpr};");`
	`76`	`+ Debug.Assert(!type.IsValueType);`
	`77`	`+ _writer.WriteLine($"{type.MinimalDisplayString}? {tempIdentifier} = {memberAccessExpr};");`
`77`	`78`	`EmitBindCoreCall(tempIdentifier, InitializationKind.AssignmentWithNullCheck);`
`78`	`79`	`}`
`79`	`80`	`else if (initKind is InitializationKind.None && type.IsValueType)`
Original file line number	Diff line number	Diff line change
`@@ -837,14 +837,14 @@ private bool EmitBindImplForMember(`
`837`	`837`
`838`	`838`	`EmitStartBlock($"if ({sectionValidationCall} is {Identifier.IConfigurationSection} {sectionIdentifier})");`
`839`	`839`
`840`		`- bool success = !EmitInitException(effectiveMemberType);`
`841`		`- if (success)`
	`840`	`+ bool canInit = !EmitInitException(effectiveMemberType);`
	`841`	`+ if (canInit)`
`842`	`842`	`{`
`843`	`843`	`EmitBindCoreCallForMember(member, memberAccessExpr, sectionIdentifier, canSet);`
`844`	`844`	`}`
`845`	`845`
`846`	`846`	`EmitEndBlock();`
`847`		`- return success;`
	`847`	`+ return canInit;`
`848`	`848`	`}`
`849`	`849`
`850`	`850`	`private void EmitBindCoreCallForMember(`
`@@ -856,8 +856,6 @@ private void EmitBindCoreCallForMember(`
`856`	`856`
`857`	`857`	`TypeSpec memberType = member.Type;`
`858`	`858`	`TypeSpec effectiveMemberType = memberType.EffectiveType;`
`859`		`- string effectiveMemberTypeDisplayString = effectiveMemberType.MinimalDisplayString;`
`860`		`- bool canGet = member.CanGet;`
`861`	`859`
`862`	`860`	`string tempIdentifier = GetIncrementalIdentifier(Identifier.temp);`
`863`	`861`	`InitializationKind initKind;`
`@@ -871,6 +869,7 @@ private void EmitBindCoreCallForMember(`
`871`	`869`	`}`
`872`	`870`
`873`	`871`	`Debug.Assert(canSet);`
	`872`	`+ string effectiveMemberTypeDisplayString = effectiveMemberType.MinimalDisplayString;`
`874`	`873`	`initKind = InitializationKind.None;`
`875`	`874`
`876`	`875`	`if (memberType.SpecKind is TypeSpecKind.Nullable)`
`@@ -889,7 +888,7 @@ private void EmitBindCoreCallForMember(`
`889`	`888`
`890`	`889`	`targetObjAccessExpr = tempIdentifier;`
`891`	`890`	`}`
`892`		`- else if (canGet)`
	`891`	`+ else if (member.CanGet)`
`893`	`892`	`{`
`894`	`893`	`targetObjAccessExpr = memberAccessExpr;`
`895`	`894`	`initKind = InitializationKind.AssignmentWithNullCheck;`
Original file line number	Diff line number	Diff line change
`@@ -605,7 +605,7 @@ public class QueueNamespaces`
`605`	`605`	`{`
`606`	`606`	`public string Namespace { get; set; }`
`607`	`607`
`608`		`- public Dictionary<string, QueueProperties> Queues { get; set; } = new();`
	`608`	`+ public Dictionary<string, QueueProperties>? Queues { get; set; } = new();`
`609`	`609`	`}`
`610`	`610`
`611`	`611`	`public class QueueProperties`
Original file line number	Diff line number	Diff line change
`@@ -198,31 +198,31 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration`
`198`	`198`
`199`	`199`	`if (AsConfigWithChildren(configuration.GetSection("CustomDictionary")) is IConfigurationSection section1)`
`200`	`200`	`{`
`201`		`- Program.CustomDictionary<string, int> temp3 = obj.CustomDictionary;`
	`201`	`+ Program.CustomDictionary<string, int>? temp3 = obj.CustomDictionary;`
`202`	`202`	`temp3 ??= new Program.CustomDictionary<string, int>();`
`203`	`203`	`BindCore(section1, ref temp3, binderOptions);`
`204`	`204`	`obj.CustomDictionary = temp3;`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`if (AsConfigWithChildren(configuration.GetSection("CustomList")) is IConfigurationSection section4)`
`208`	`208`	`{`
`209`		`- Program.CustomList temp6 = obj.CustomList;`
	`209`	`+ Program.CustomList? temp6 = obj.CustomList;`
`210`	`210`	`temp6 ??= new Program.CustomList();`
`211`	`211`	`BindCore(section4, ref temp6, binderOptions);`
`212`	`212`	`obj.CustomList = temp6;`
`213`	`213`	`}`
`214`	`214`
`215`	`215`	`if (AsConfigWithChildren(configuration.GetSection("IReadOnlyList")) is IConfigurationSection section7)`
`216`	`216`	`{`
`217`		`- IReadOnlyList<int> temp9 = obj.IReadOnlyList;`
	`217`	`+ IReadOnlyList<int>? temp9 = obj.IReadOnlyList;`
`218`	`218`	`temp9 = temp9 is null ? new List<int>() : new List<int>(temp9);`
`219`	`219`	`BindCore(section7, ref temp9, binderOptions);`
`220`	`220`	`obj.IReadOnlyList = temp9;`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`if (AsConfigWithChildren(configuration.GetSection("IReadOnlyDictionary")) is IConfigurationSection section10)`
`224`	`224`	`{`
`225`		`- IReadOnlyDictionary<string, int> temp12 = obj.IReadOnlyDictionary;`
	`225`	`+ IReadOnlyDictionary<string, int>? temp12 = obj.IReadOnlyDictionary;`
`226`	`226`	`temp12 = temp12 is null ? new Dictionary<string, int>() : temp12.ToDictionary(pair => pair.Key, pair => pair.Value);`
`227`	`227`	`BindCore(section10, ref temp12, binderOptions);`
`228`	`228`	`obj.IReadOnlyDictionary = temp12;`
Original file line number	Diff line number	Diff line change
`@@ -97,23 +97,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration`
`97`	`97`
`98`	`98`	`if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section2)`
`99`	`99`	`{`
`100`		`- List<int> temp4 = obj.MyList;`
	`100`	`+ List<int>? temp4 = obj.MyList;`
`101`	`101`	`temp4 ??= new List<int>();`
`102`	`102`	`BindCore(section2, ref temp4, binderOptions);`
`103`	`103`	`obj.MyList = temp4;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section5)`
`107`	`107`	`{`
`108`		`- Dictionary<string, string> temp7 = obj.MyDictionary;`
	`108`	`+ Dictionary<string, string>? temp7 = obj.MyDictionary;`
`109`	`109`	`temp7 ??= new Dictionary<string, string>();`
`110`	`110`	`BindCore(section5, ref temp7, binderOptions);`
`111`	`111`	`obj.MyDictionary = temp7;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if (AsConfigWithChildren(configuration.GetSection("MyComplexDictionary")) is IConfigurationSection section8)`
`115`	`115`	`{`
`116`		`- Dictionary<string, Program.MyClass2> temp10 = obj.MyComplexDictionary;`
	`116`	`+ Dictionary<string, Program.MyClass2>? temp10 = obj.MyComplexDictionary;`
`117`	`117`	`temp10 ??= new Dictionary<string, Program.MyClass2>();`
`118`	`118`	`BindCore(section8, ref temp10, binderOptions);`
`119`	`119`	`obj.MyComplexDictionary = temp10;`
Original file line number	Diff line number	Diff line change
`@@ -91,23 +91,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration`
`91`	`91`
`92`	`92`	`if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section2)`
`93`	`93`	`{`
`94`		`- List<int> temp4 = obj.MyList;`
	`94`	`+ List<int>? temp4 = obj.MyList;`
`95`	`95`	`temp4 ??= new List<int>();`
`96`	`96`	`BindCore(section2, ref temp4, binderOptions);`
`97`	`97`	`obj.MyList = temp4;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section5)`
`101`	`101`	`{`
`102`		`- Dictionary<string, string> temp7 = obj.MyDictionary;`
	`102`	`+ Dictionary<string, string>? temp7 = obj.MyDictionary;`
`103`	`103`	`temp7 ??= new Dictionary<string, string>();`
`104`	`104`	`BindCore(section5, ref temp7, binderOptions);`
`105`	`105`	`obj.MyDictionary = temp7;`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`if (AsConfigWithChildren(configuration.GetSection("MyComplexDictionary")) is IConfigurationSection section8)`
`109`	`109`	`{`
`110`		`- Dictionary<string, Program.MyClass2> temp10 = obj.MyComplexDictionary;`
	`110`	`+ Dictionary<string, Program.MyClass2>? temp10 = obj.MyComplexDictionary;`
`111`	`111`	`temp10 ??= new Dictionary<string, Program.MyClass2>();`
`112`	`112`	`BindCore(section8, ref temp10, binderOptions);`
`113`	`113`	`obj.MyComplexDictionary = temp10;`
Original file line number	Diff line number	Diff line change
`@@ -129,23 +129,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration`
`129`	`129`
`130`	`130`	`if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section6)`
`131`	`131`	`{`
`132`		`- List<int> temp8 = obj.MyList;`
	`132`	`+ List<int>? temp8 = obj.MyList;`
`133`	`133`	`temp8 ??= new List<int>();`
`134`	`134`	`BindCore(section6, ref temp8, binderOptions);`
`135`	`135`	`obj.MyList = temp8;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`if (AsConfigWithChildren(configuration.GetSection("MyArray")) is IConfigurationSection section9)`
`139`	`139`	`{`
`140`		`- int[] temp11 = obj.MyArray;`
	`140`	`+ int[]? temp11 = obj.MyArray;`
`141`	`141`	`temp11 ??= new int[0];`
`142`	`142`	`BindCore(section9, ref temp11, binderOptions);`
`143`	`143`	`obj.MyArray = temp11;`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section12)`
`147`	`147`	`{`
`148`		`- Dictionary<string, string> temp14 = obj.MyDictionary;`
	`148`	`+ Dictionary<string, string>? temp14 = obj.MyDictionary;`
`149`	`149`	`temp14 ??= new Dictionary<string, string>();`
`150`	`150`	`BindCore(section12, ref temp14, binderOptions);`
`151`	`151`	`obj.MyDictionary = temp14;`
Original file line number	Diff line number	Diff line change
`@@ -112,23 +112,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration`
`112`	`112`
`113`	`113`	`if (AsConfigWithChildren(configuration.GetSection("MyList")) is IConfigurationSection section5)`
`114`	`114`	`{`
`115`		`- List<int> temp7 = obj.MyList;`
	`115`	`+ List<int>? temp7 = obj.MyList;`
`116`	`116`	`temp7 ??= new List<int>();`
`117`	`117`	`BindCore(section5, ref temp7, binderOptions);`
`118`	`118`	`obj.MyList = temp7;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if (AsConfigWithChildren(configuration.GetSection("MyArray")) is IConfigurationSection section8)`
`122`	`122`	`{`
`123`		`- int[] temp10 = obj.MyArray;`
	`123`	`+ int[]? temp10 = obj.MyArray;`
`124`	`124`	`temp10 ??= new int[0];`
`125`	`125`	`BindCore(section8, ref temp10, binderOptions);`
`126`	`126`	`obj.MyArray = temp10;`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`if (AsConfigWithChildren(configuration.GetSection("MyDictionary")) is IConfigurationSection section11)`
`130`	`130`	`{`
`131`		`- Dictionary<string, string> temp13 = obj.MyDictionary;`
	`131`	`+ Dictionary<string, string>? temp13 = obj.MyDictionary;`
`132`	`132`	`temp13 ??= new Dictionary<string, string>();`
`133`	`133`	`BindCore(section11, ref temp13, binderOptions);`
`134`	`134`	`obj.MyDictionary = temp13;`