Merge pull request #283 from ds5678/Feature/CustomReferenceImportersI…

…nMemberCloner [Feature]: Custom ReferenceImporter in MemberCloner
Washi1337 · Mar 30, 2022 · 415e207 · 415e207
2 parents 5ca68c8 + b5ac446
commit 415e207
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs b/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs
@@ -17,6 +17,11 @@ public CloneContextAwareReferenceImporter(MemberCloneContext context)
             _context = context;
         }
 
+        /// <summary>
+        /// The working space for this member cloning procedure.
+        /// </summary>
+        protected MemberCloneContext Context => _context;
+
         /// <inheritdoc />
         protected override ITypeDefOrRef ImportType(TypeDefinition type)
         {

diff --git a/src/AsmResolver.DotNet/Cloning/MemberCloneContext.cs b/src/AsmResolver.DotNet/Cloning/MemberCloneContext.cs
@@ -12,10 +12,18 @@ public class MemberCloneContext
         /// Creates a new instance of the <see cref="MemberCloneContext"/> class.
         /// </summary>
         /// <param name="module">The target module to copy the cloned members into.</param>
-        public MemberCloneContext(ModuleDefinition module)
+        public MemberCloneContext(ModuleDefinition module) : this(module, null) { }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="MemberCloneContext"/> class.
+        /// </summary>
+        /// <param name="module">The target module to copy the cloned members into.</param>
+        /// <param name="importerFactory">The factory for creating the reference importer</param>
+        public MemberCloneContext(ModuleDefinition module,
+            Func<MemberCloneContext, CloneContextAwareReferenceImporter>? importerFactory)
         {
             Module = module ?? throw new ArgumentNullException(nameof(module));
-            Importer = new CloneContextAwareReferenceImporter(this);
+            Importer = importerFactory?.Invoke(this) ?? new CloneContextAwareReferenceImporter(this);
         }
 
         /// <summary>
@@ -42,4 +50,4 @@ public ReferenceImporter Importer
             get;
         } = new Dictionary<IMemberDescriptor, IMemberDescriptor>();
     }
-}
+}
diff --git a/src/AsmResolver.DotNet/Cloning/MemberCloner.cs b/src/AsmResolver.DotNet/Cloning/MemberCloner.cs
@@ -17,6 +17,7 @@ namespace AsmResolver.DotNet.Cloning
     /// </remarks>
     public partial class MemberCloner
     {
+        private readonly Func<MemberCloneContext, CloneContextAwareReferenceImporter>? _importerFactory;
         private readonly ModuleDefinition _targetModule;
 
         private readonly HashSet<TypeDefinition> _typesToClone = new();
@@ -29,9 +30,18 @@ public partial class MemberCloner
         /// Creates a new instance of the <see cref="MemberCloner"/> class.
         /// </summary>
         /// <param name="targetModule">The target module to copy the members into.</param>
-        public MemberCloner(ModuleDefinition targetModule)
+        public MemberCloner(ModuleDefinition targetModule) : this(targetModule, null) { }
+
+        /// <summary>
+        /// Creates a new instance of the <see cref="MemberCloner"/> class.
+        /// </summary>
+        /// <param name="targetModule">The target module to copy the members into.</param>
+        /// <param name="importerFactory">The factory for creating the reference importer</param>
+        public MemberCloner(ModuleDefinition targetModule,
+            Func<MemberCloneContext, CloneContextAwareReferenceImporter>? importerFactory)
         {
             _targetModule = targetModule ?? throw new ArgumentNullException(nameof(targetModule));
+            _importerFactory = importerFactory;
         }
 
         /// <summary>
@@ -220,7 +230,7 @@ public MemberCloner Include(EventDefinition @event)
         /// <returns>An object representing the result of the cloning process.</returns>
         public MemberCloneResult Clone()
         {
-            var context = new MemberCloneContext(_targetModule);
+            var context = new MemberCloneContext(_targetModule, _importerFactory);
 
             CreateMemberStubs(context);
             DeepCopyMembers(context);