Fix generation of ArgumentNullException in nullable context

k94ll13nn3 · Mar 9, 2022 · 0808b18 · 0808b18
1 parent 514880e
commit 0808b18
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/AutoConstructor.Generator/AutoConstructorGenerator.cs b/src/AutoConstructor.Generator/AutoConstructorGenerator.cs
@@ -223,7 +223,7 @@ private static FieldInfo GetFieldInfo(IFieldSymbol fieldSymbol, Compilation comp
             type,
             type.IsReferenceType && type.NullableAnnotation == NullableAnnotation.Annotated,
             summaryText,
-            type.NullableAnnotation != NullableAnnotation.NotAnnotated && emitNullChecks);
+            type.IsReferenceType && type.NullableAnnotation == NullableAnnotation.None && emitNullChecks);
     }
 
     private static T? GetParameterValue<T>(string parameterName, ImmutableArray<IParameterSymbol> parameters, ImmutableArray<TypedConstant> arguments)

diff --git a/tests/AutoConstructor.Tests/GeneratorTests.cs b/tests/AutoConstructor.Tests/GeneratorTests.cs
@@ -523,17 +523,23 @@ public async Task Run_WithNullableReferenceType_ShouldGenerateClass()
     [AutoConstructor]
     internal partial class Test
     {
-        private readonly string? _t;
+        private readonly string? _t1;
+        private readonly string _t2;
+        private readonly int _d1;
+        private readonly int? _d2;
     }
 }";
         const string generated = @"#nullable enable
 namespace Test
 {
     partial class Test
     {
-        public Test(string? t)
+        public Test(string? t1, string t2, int d1, int? d2)
         {
-            this._t = t ?? throw new System.ArgumentNullException(nameof(t));
+            this._t1 = t1;
+            this._t2 = t2;
+            this._d1 = d1;
+            this._d2 = d2;
         }
     }
 }