#8 fix für auto property initializer

Author: greuelpirat

AssemblyToProcess/SomeObject.cs

@@ -56,4 +56,20 @@ public override int GetHashCode()
 
         #endregion
     }
+
+    [AddDeepCopyConstructor]
+    public class AutoPropertyInitializerObject
+    {
+        public Guid Guid { get; set; } = Guid.NewGuid();
+    }
+
+    public class AutoPropertyInitializerConstructorObject
+    {
+        public AutoPropertyInitializerConstructorObject() { }
+
+        [InjectDeepCopy]
+        public AutoPropertyInitializerConstructorObject(AutoPropertyInitializerConstructorObject source) { }
+
+        public Guid Guid { get; set; } = Guid.NewGuid();
+    }
 }

DeepCopy.Fody/ModuleWeaver.cs

@@ -104,7 +104,7 @@ private void ExecuteInjectDeepCopy()
 
                 var constructorResolved = constructor.Resolve();
                 constructorResolved.Body.SimplifyMacros();
-                InsertCopyInstructions(target, constructorResolved.Body, 2);
+                InsertCopyInstructions(target, constructorResolved.Body);
                 constructorResolved.CustomAttributes.Remove(constructorResolved.SingleAttribute(InjectDeepCopyAttribute));
             }
         }
@@ -115,7 +115,6 @@ private void AddDeepConstructor(TypeDefinition type)
             constructor.Parameters.Add(new ParameterDefinition(type));
 
             var processor = constructor.Body.GetILProcessor();
-            var offset = 2;
 
             if (type.BaseType.Resolve().MetadataToken == TypeSystem.ObjectDefinition.MetadataToken)
             {
@@ -127,24 +126,24 @@ private void AddDeepConstructor(TypeDefinition type)
                 processor.Emit(OpCodes.Ldarg_0);
                 processor.Emit(OpCodes.Ldarg_1);
                 processor.Emit(OpCodes.Call, baseConstructor);
-                offset = 3;
             }
             else
                 throw new CopyConstructorRequiredException(type.BaseType);
 
-            InsertCopyInstructions(type, constructor.Body, offset);
+            InsertCopyInstructions(type, constructor.Body);
 
             processor.Emit(OpCodes.Ret);
             type.Methods.Add(constructor);
         }
 
-        private void InsertCopyInstructions(TypeDefinition type, MethodBody body, int offset)
+        private void InsertCopyInstructions(TypeDefinition type, MethodBody body)
         {
             _booleanVariable = null;
             _indexVariable = null;
             CurrentBody.Value = body;
 
-            var index = offset;
+            var baseConstructorCall = body.Instructions.Single(i => i.OpCode == OpCodes.Call && i.Operand is MethodReference method && method.Name == ".ctor");
+            var index = body.Instructions.IndexOf(baseConstructorCall) + 1;
             var properties = new List<string>();
 
             foreach (var property in type.Properties)

Tests/CopyTests.cs

@@ -60,5 +60,29 @@ public void TestEmptyObject()
             var copy = Activator.CreateInstance(type, instance);
             Assert.NotSame(instance, copy);
         }
+
+        [Fact]
+        public void TestAutoPropertyInitializer()
+        {
+            var type = GetTestType(typeof(AutoPropertyInitializerObject));
+            dynamic instance = Activator.CreateInstance(type);
+            var guid = Guid.NewGuid();
+            instance.Guid = guid;
+            var copy = Activator.CreateInstance(type, instance);
+            Assert.NotSame(instance, copy);
+            Assert.Equal(instance.Guid, copy.Guid);
+        }
+
+        [Fact]
+        public void TestAutoPropertyConstructorInitializer()
+        {
+            var type = GetTestType(typeof(AutoPropertyInitializerConstructorObject));
+            dynamic instance = Activator.CreateInstance(type);
+            var guid = Guid.NewGuid();
+            instance.Guid = guid;
+            var copy = Activator.CreateInstance(type, instance);
+            Assert.NotSame(instance, copy);
+            Assert.Equal(instance.Guid, copy.Guid);
+        }
     }
 }