fix: obsolete constructors should have the last priority whlie matchi…

…ng constructors (regression)
riok · Nov 14, 2023 · 2c2f77f · 2c2f77f
1 parent 6cceb6d
commit 2c2f77f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs b/...iok.Mapperly/Descriptors/MappingBodyBuilders/NewInstanceObjectMemberMappingBodyBuilder.cs
@@ -208,7 +208,7 @@ private static void BuildConstructorMapping(INewInstanceBuilderContext<IMapping>
         var ctorCandidates = namedTargetType.InstanceConstructors
             .Where(ctor => ctx.BuilderContext.SymbolAccessor.IsDirectlyAccessible(ctor))
             .OrderByDescending(x => ctx.BuilderContext.SymbolAccessor.HasAttribute<MapperConstructorAttribute>(x))
-            .ThenBy(x => ctx.BuilderContext.SymbolAccessor.HasAttribute<MapperConstructorAttribute>(x))
+            .ThenBy(x => ctx.BuilderContext.SymbolAccessor.HasAttribute<ObsoleteAttribute>(x))
             .ThenByDescending(x => x.Parameters.Length == 0)
             .ThenByDescending(x => x.Parameters.Length);
         foreach (var ctorCandidate in ctorCandidates)

diff --git a/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyConstructorResolverTest.cs b/test/Riok.Mapperly.Tests/Mapping/ObjectPropertyConstructorResolverTest.cs
@@ -215,15 +215,16 @@ public void ClassToClassMultipleCtorsShouldPreferNonObsolete()
             "A",
             "B",
             "class A { public string StringValue { get; set; } public int IntValue { get; set; } }",
-            "class B { [Obsolete] public B(string StringValue) { } public B(string stringValue, int intvalue) { } { public string StringValue { get; set; } public int IntValue { get; set; } "
+            "class B { [Obsolete] public B(string stringValue, int intValue) { } public B(string stringValue) { } { public string StringValue { get; set; } public int IntValue { get; set; } }"
         );
 
         TestHelper
             .GenerateMapper(source)
             .Should()
             .HaveSingleMethodBody(
                 """
-                var target = new global::B(source.StringValue, source.IntValue);
+                var target = new global::B(source.StringValue);
+                target.IntValue = source.IntValue;
                 return target;
                 """
             );