fix: upgrade parameter nullability correctly (#1057)

riok · Jan 10, 2024 · ad917ee · ad917ee
1 parent 54b0eea
commit ad917ee
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs b/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs
@@ -262,8 +262,8 @@ private static void BuildConstructorMapping(INewInstanceBuilderContext<IMapping>
             }
 
             // nullability is handled inside the member mapping
-            var paramType = parameter.Type.WithNullableAnnotation(parameter.NullableAnnotation);
-            var typeMapping = new TypeMappingKey(sourcePath.MemberType, paramType, memberConfig?.ToTypeMappingConfiguration());
+            var parameterType = ctx.BuilderContext.SymbolAccessor.UpgradeNullable(parameter.Type);
+            var typeMapping = new TypeMappingKey(sourcePath.MemberType, parameterType, memberConfig?.ToTypeMappingConfiguration());
             var delegateMapping = ctx.BuilderContext.FindOrBuildLooseNullableMapping(
                 typeMapping,
                 diagnosticLocation: memberConfig?.Location
@@ -295,8 +295,8 @@ private static void BuildConstructorMapping(INewInstanceBuilderContext<IMapping>
             var memberMapping = new NullMemberMapping(
                 delegateMapping,
                 getterSourcePath,
-                paramType,
-                ctx.BuilderContext.GetNullFallbackValue(paramType),
+                parameterType,
+                ctx.BuilderContext.GetNullFallbackValue(parameterType),
                 !ctx.BuilderContext.IsExpression
             );
             var ctorMapping = new ConstructorParameterMapping(parameter, memberMapping, skippedOptionalParam);

diff --git a/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs b/src/Riok.Mapperly/Descriptors/MappingBodyBuilders/NewValueTupleMappingBodyBuilder.cs
@@ -81,8 +81,8 @@ private static void BuildTupleConstructorMapping(INewValueTupleBuilderContext<IN
             }
 
             // nullability is handled inside the member expressionMapping
-            var paramType = targetMember.Type.WithNullableAnnotation(targetMember.NullableAnnotation);
-            var mappingKey = new TypeMappingKey(sourcePath.MemberType, paramType, memberConfig?.ToTypeMappingConfiguration());
+            var targetMemberType = ctx.BuilderContext.SymbolAccessor.UpgradeNullable(targetMember.Type);
+            var mappingKey = new TypeMappingKey(sourcePath.MemberType, targetMemberType, memberConfig?.ToTypeMappingConfiguration());
             var delegateMapping = ctx.BuilderContext.FindOrBuildLooseNullableMapping(
                 mappingKey,
                 diagnosticLocation: memberConfig?.Location
@@ -118,8 +118,8 @@ private static void BuildTupleConstructorMapping(INewValueTupleBuilderContext<IN
             var memberMapping = new NullMemberMapping(
                 delegateMapping,
                 getterSourcePath,
-                paramType,
-                ctx.BuilderContext.GetNullFallbackValue(paramType),
+                targetMemberType,
+                ctx.BuilderContext.GetNullFallbackValue(targetMemberType),
                 !ctx.BuilderContext.IsExpression
             );
 

diff --git a/src/Riok.Mapperly/Descriptors/Mappings/MemberMappings/ConstructorParameterMapping.cs b/src/Riok.Mapperly/Descriptors/Mappings/MemberMappings/ConstructorParameterMapping.cs
@@ -13,6 +13,10 @@ bool selfOrPreviousIsUnmappedOptional
 {
     private readonly bool _selfOrPreviousIsUnmappedOptional = selfOrPreviousIsUnmappedOptional;
 
+    /// <summary>
+    /// The parameter of the constructor.
+    /// Note: the nullability of it may not be "upgraded".
+    /// </summary>
     public IParameterSymbol Parameter { get; } = parameter;
 
     public NullMemberMapping DelegateMapping { get; } = delegateMapping;

diff --git a/...iok.Mapperly/Descriptors/Mappings/MemberMappings/ValueTupleConstructorParameterMapping.cs b/...iok.Mapperly/Descriptors/Mappings/MemberMappings/ValueTupleConstructorParameterMapping.cs
@@ -7,6 +7,10 @@ namespace Riok.Mapperly.Descriptors.Mappings.MemberMappings;
 
 public class ValueTupleConstructorParameterMapping(IFieldSymbol parameter, NullMemberMapping delegateMapping)
 {
+    /// <summary>
+    /// The parameter the value tuple.
+    /// Note: the nullability of it may not be "upgraded".
+    /// </summary>
     public IFieldSymbol Parameter { get; } = parameter;
 
     public NullMemberMapping DelegateMapping { get; } = delegateMapping;

diff --git a/src/Riok.Mapperly/Descriptors/TypeMappingKey.cs b/src/Riok.Mapperly/Descriptors/TypeMappingKey.cs
@@ -5,7 +5,7 @@
 
 namespace Riok.Mapperly.Descriptors;
 
-[DebuggerDisplay("{Source.Name} => {Target.Name}")]
+[DebuggerDisplay("{Source} => {Target}")]
 public readonly struct TypeMappingKey(
     ITypeSymbol source,
     ITypeSymbol target,

diff --git a/test/Riok.Mapperly.Tests/Mapping/UseMapperTest.cs b/test/Riok.Mapperly.Tests/Mapping/UseMapperTest.cs
@@ -306,7 +306,7 @@ public void DisabledNullableShouldWork()
                 """
                 if (source == null)
                     return default;
-                var target = new global::B(source.Value != null ? MapToBExternal(source.Value) : default);
+                var target = new global::B(_otherMapper.ToBExternal(source.Value));
                 return target;
                 """
             );