Fix wiring up member attribute recovery

Author: MDoerner

Rubberduck.Main/Root/RubberduckIoCInstaller.cs

@@ -117,6 +117,9 @@ public void Install(IWindsorContainer container, IConfigurationStore store)
             container.Register(Component.For<IRewritingManager>()
                 .ImplementedBy<RewritingManager>()
                 .LifestyleSingleton());
+            container.Register(Component.For<IMemberAttributeRecovererWithSettableRewritingManager>()
+                .ImplementedBy<MemberAttributeRecoverer>()
+                .LifestyleSingleton());
 
             container.Register(Component.For<TestExplorerModel>()
                 .LifestyleSingleton());

Rubberduck.Parsing/Rewriter/IMemberAttributeRecovererWithSettableRewritingManager.cs

@@ -0,0 +1,7 @@
+namespace Rubberduck.Parsing.Rewriter
+{
+    public interface IMemberAttributeRecovererWithSettableRewritingManager : IMemberAttributeRecoverer
+    {
+        IRewritingManager RewritingManager { set; }
+    }
+}

Rubberduck.Parsing/Rewriter/MemberAttributeRecoverer.cs

@@ -10,7 +10,7 @@
 
 namespace Rubberduck.Parsing.Rewriter
 {
-    public class MemberAttributeRecoverer : IMemberAttributeRecoverer
+    public class MemberAttributeRecoverer : IMemberAttributeRecovererWithSettableRewritingManager
     {
         private readonly IDeclarationFinderProvider _declarationFinderProvider;
         private readonly IParseManager _parseManager;

Rubberduck.Parsing/Rewriter/RewritingManager.cs

@@ -8,16 +8,17 @@ public class RewritingManager : IRewritingManager
     {
         private readonly HashSet<IRewriteSession> _activeCodePaneSessions = new HashSet<IRewriteSession>();
         private readonly HashSet<IRewriteSession> _activeAttributesSessions = new HashSet<IRewriteSession>();
-        private readonly IMemberAttributeRecoverer _memberAttributeRecoverer;
+        private readonly IMemberAttributeRecovererWithSettableRewritingManager _memberAttributeRecoverer;
 
         private readonly IRewriteSessionFactory _sessionFactory;
 
         private readonly object _invalidationLockObject = new object();
 
-        public RewritingManager(IRewriteSessionFactory sessionFactory, IMemberAttributeRecoverer memberAttributeRecoverer)
+        public RewritingManager(IRewriteSessionFactory sessionFactory, IMemberAttributeRecovererWithSettableRewritingManager memberAttributeRecoverer)
         {
             _sessionFactory = sessionFactory;
             _memberAttributeRecoverer = memberAttributeRecoverer;
+            _memberAttributeRecoverer.RewritingManager = this;
         }
 
 

RubberduckTests/Mocks/MockParser.cs

@@ -134,7 +134,7 @@ public static (SynchronousParseCoordinator parser, IRewritingManager rewritingMa
                 attributesSourceCodeHandler);
             var rewriterProvider = new RewriterProvider(tokenStreamCache, moduleRewriterFactory);
             var rewriteSessionFactory = new RewriteSessionFactory(state, rewriterProvider);
-            var stubMembersAttributeRecoverer = new Mock<IMemberAttributeRecoverer>().Object;
+            var stubMembersAttributeRecoverer = new Mock<IMemberAttributeRecovererWithSettableRewritingManager>().Object;
             var rewritingManager = new RewritingManager(rewriteSessionFactory, stubMembersAttributeRecoverer); 
 
             var parser = new SynchronousParseCoordinator(

RubberduckTests/Rewriter/RewriteManagerTests.cs

@@ -178,14 +178,25 @@ public void CallingTheRewritingAllowedCallbackFromANoLongerActiveAttributesSessi
             }
         }
 
+        [Test]
+        [Category("Rewriter")]
+        public void OnCreatingTheRewritingManagerPropertyInjectsItselfIntoTheMemberAttributeRecoverer()
+        {
+            var memberAttributeRecovererMock = new Mock<IMemberAttributeRecovererWithSettableRewritingManager>();
+
+            var rewritingManager = RewritingManager(out _, memberAttributeRecovererMock.Object);
+
+            memberAttributeRecovererMock.VerifySet(m => m.RewritingManager = rewritingManager, Times.Once);
+        }
+
         [Test]
         [Category("Rewriter")]
         public void CallingTheRewritingAllowedCallbackFromAnActiveCodePaneSessionRequestMemberAttributeRecoveryForTheCheckedOutModules()
         {
-            var memberAttributeRecovererMock = new Mock<IMemberAttributeRecoverer>();
+            var memberAttributeRecovererMock = new Mock<IMemberAttributeRecovererWithSettableRewritingManager>();
             memberAttributeRecovererMock.Setup(m => m.RecoverCurrentMemberAttributesAfterNextParse(It.IsAny<IEnumerable<QualifiedModuleName>>()));
 
-            var rewritingManager = RewritingManager(out var mockFactory, memberAttributeRecovererMock.Object);
+            var rewritingManager = RewritingManager(out _, memberAttributeRecovererMock.Object);
             var codePaneSession = rewritingManager.CheckOutCodePaneSession();
 
             var moduleToCheckOutRewriterFor = new QualifiedModuleName("project", "path", "module");
@@ -200,10 +211,10 @@ public void CallingTheRewritingAllowedCallbackFromAnActiveCodePaneSessionRequest
         [Category("Rewriter")]
         public void CallingTheRewritingAllowedCallbackFromAnActiveAttributesSessionDoesNotRequestMemberAttributeRecovery()
         {
-            var memberAttributeRecovererMock = new Mock<IMemberAttributeRecoverer>();
+            var memberAttributeRecovererMock = new Mock<IMemberAttributeRecovererWithSettableRewritingManager>();
             memberAttributeRecovererMock.Setup(m => m.RecoverCurrentMemberAttributesAfterNextParse(It.IsAny<IEnumerable<QualifiedModuleName>>()));
 
-            var rewritingManager = RewritingManager(out var mockFactory, memberAttributeRecovererMock.Object);
+            var rewritingManager = RewritingManager(out _, memberAttributeRecovererMock.Object);
             var codePaneSession = rewritingManager.CheckOutAttributesSession();
 
             var moduleToCheckOutRewriterFor = new QualifiedModuleName("project", "path", "module");
@@ -214,9 +225,9 @@ public void CallingTheRewritingAllowedCallbackFromAnActiveAttributesSessionDoesN
             memberAttributeRecovererMock.Verify(m => m.RecoverCurrentMemberAttributesAfterNextParse(It.IsAny<IEnumerable<QualifiedModuleName>>()), Times.Never);
         }
 
-        private IRewritingManager RewritingManager(out MockRewriteSessionFactory mockFactory, IMemberAttributeRecoverer memberAttributeRecoverer = null)
+        private IRewritingManager RewritingManager(out MockRewriteSessionFactory mockFactory, IMemberAttributeRecovererWithSettableRewritingManager memberAttributeRecoverer = null)
         {
-            var recoverer = memberAttributeRecoverer ?? new Mock<IMemberAttributeRecoverer>().Object;
+            var recoverer = memberAttributeRecoverer ?? new Mock<IMemberAttributeRecovererWithSettableRewritingManager>().Object;
             mockFactory = new MockRewriteSessionFactory();
             return new RewritingManager(mockFactory, recoverer);
         }