From b5ac4462a109d3b98330ee61a71f19c57e467a2e Mon Sep 17 00:00:00 2001
From: Jeremy Pritts <jrpritts7@gmail.com>
Date: Wed, 30 Mar 2022 09:39:14 -0400
Subject: [PATCH] name changes and context property in the cloning reference
 importer

---
 .../Cloning/CloneContextAwareReferenceImporter.cs      | 10 ++++++----
 src/AsmResolver.DotNet/Cloning/MemberCloneContext.cs   |  6 +++---
 src/AsmResolver.DotNet/Cloning/MemberCloner.cs         | 10 +++++-----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs b/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs
index 235f5a277..0382fb8a9 100644
--- a/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs
+++ b/src/AsmResolver.DotNet/Cloning/CloneContextAwareReferenceImporter.cs
@@ -5,10 +5,7 @@ namespace AsmResolver.DotNet.Cloning
     /// </summary>
     public class CloneContextAwareReferenceImporter : ReferenceImporter
     {
-        /// <summary>
-        /// The working space for this member cloning procedure.
-        /// </summary>
-        protected readonly MemberCloneContext _context;
+        private readonly MemberCloneContext _context;
 
         /// <summary>
         /// Creates a new instance of the <see cref="CloneContextAwareReferenceImporter"/> class.
@@ -20,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
index 4bcf5894b..78c52c8c3 100644
--- a/src/AsmResolver.DotNet/Cloning/MemberCloneContext.cs
+++ b/src/AsmResolver.DotNet/Cloning/MemberCloneContext.cs
@@ -18,12 +18,12 @@ 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>
-        /// <param name="importerInstantiator">The instantiator for creating the reference importer</param>
+        /// <param name="importerFactory">The factory for creating the reference importer</param>
         public MemberCloneContext(ModuleDefinition module,
-            Func<MemberCloneContext, CloneContextAwareReferenceImporter>? importerInstantiator)
+            Func<MemberCloneContext, CloneContextAwareReferenceImporter>? importerFactory)
         {
             Module = module ?? throw new ArgumentNullException(nameof(module));
-            Importer = importerInstantiator?.Invoke(this) ?? new CloneContextAwareReferenceImporter(this);
+            Importer = importerFactory?.Invoke(this) ?? new CloneContextAwareReferenceImporter(this);
         }
 
         /// <summary>
diff --git a/src/AsmResolver.DotNet/Cloning/MemberCloner.cs b/src/AsmResolver.DotNet/Cloning/MemberCloner.cs
index acd0d1811..1580d1efa 100644
--- a/src/AsmResolver.DotNet/Cloning/MemberCloner.cs
+++ b/src/AsmResolver.DotNet/Cloning/MemberCloner.cs
@@ -17,7 +17,7 @@ namespace AsmResolver.DotNet.Cloning
     /// </remarks>
     public partial class MemberCloner
     {
-        private readonly Func<MemberCloneContext, CloneContextAwareReferenceImporter>? _importerInstantiator;
+        private readonly Func<MemberCloneContext, CloneContextAwareReferenceImporter>? _importerFactory;
         private readonly ModuleDefinition _targetModule;
 
         private readonly HashSet<TypeDefinition> _typesToClone = new();
@@ -36,12 +36,12 @@ 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>
-        /// <param name="importerInstantiator">The instantiator for creating the reference importer</param>
+        /// <param name="importerFactory">The factory for creating the reference importer</param>
         public MemberCloner(ModuleDefinition targetModule,
-            Func<MemberCloneContext, CloneContextAwareReferenceImporter>? importerInstantiator)
+            Func<MemberCloneContext, CloneContextAwareReferenceImporter>? importerFactory)
         {
             _targetModule = targetModule ?? throw new ArgumentNullException(nameof(targetModule));
-            _importerInstantiator = importerInstantiator;
+            _importerFactory = importerFactory;
         }
 
         /// <summary>
@@ -230,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, _importerInstantiator);
+            var context = new MemberCloneContext(_targetModule, _importerFactory);
 
             CreateMemberStubs(context);
             DeepCopyMembers(context);