Use IProjectsProvider in ExtractInterfaceBaseRefactoring

Author: MDoerner

Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceBaseRefactoring.cs

@@ -8,24 +8,29 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Parsing.VBA.Parsing;
 using Rubberduck.Refactorings.AddInterfaceImplementations;
+using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.VBEditor.SafeComWrappers;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Refactorings.ExtractInterface
 {
     public class ExtractInterfaceBaseRefactoring : BaseRefactoringWithSuspensionBase<ExtractInterfaceModel>
     {
         private readonly ICodeOnlyBaseRefactoring<AddInterfaceImplementationsModel> _addImplementationsRefactoring;
         private readonly IParseTreeProvider _parseTreeProvider;
+        private readonly IProjectsProvider _projectsProvider;
 
         public ExtractInterfaceBaseRefactoring(
             AddInterFaceImplementationsBaseRefactoring addImplementationsRefactoring,
             IParseTreeProvider parseTreeProvider,
             IParseManager parseManager, 
-            IRewritingManager rewritingManager) 
+            IRewritingManager rewritingManager,
+            IProjectsProvider projectsProvider) 
             : base(parseManager, rewritingManager)
         {
             _addImplementationsRefactoring = addImplementationsRefactoring;
             _parseTreeProvider = parseTreeProvider;
+            _projectsProvider = projectsProvider;
         }
 
         protected override bool RequiresSuspension(ExtractInterfaceModel model)
@@ -40,20 +45,19 @@ protected override void Refactor(ExtractInterfaceModel model, IRewriteSession re
 
         private void AddInterface(ExtractInterfaceModel model, IRewriteSession rewriteSession)
         {
-            var targetProject = model.TargetDeclaration.Project;
+            var targetProject = _projectsProvider.Project(model.TargetDeclaration.ProjectId);
             if (targetProject == null)
             {
                 return; //The target project is not available.
             }
 
-            AddInterfaceClass(model.TargetDeclaration, model.InterfaceName, GetInterfaceModuleBody(model));
+            AddInterfaceClass(targetProject, model.InterfaceName, GetInterfaceModuleBody(model));
             AddImplementsStatement(model, rewriteSession);
             AddInterfaceMembersToClass(model, rewriteSession);
         }
 
-        private void AddInterfaceClass(Declaration implementingClass, string interfaceName, string interfaceBody)
+        private void AddInterfaceClass(IVBProject targetProject, string interfaceName, string interfaceBody)
         {
-            var targetProject = implementingClass.Project;
             using (var components = targetProject.VBComponents)
             {
                 using (var interfaceComponent = components.Add(ComponentType.ClassModule))
@@ -120,8 +124,6 @@ private void AddImplementsStatement(ExtractInterfaceModel model, IRewriteSession
             return (-1, false);
         }
 
-
-
         private void AddInterfaceMembersToClass(ExtractInterfaceModel model, IRewriteSession rewriteSession)
         {
             var targetModule = model.TargetDeclaration.QualifiedModuleName;

RubberduckTests/CodeExplorer/MockedCodeExplorer.cs

@@ -504,7 +504,7 @@ public MockedCodeExplorer ImplementIndenterCommand()
         public MockedCodeExplorer ImplementExtractInterfaceCommand()
         {
             var addImplementationsBaseRefactoring = new AddInterFaceImplementationsBaseRefactoring(null);
-            var extractInterfaceBaseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, State, State, null);
+            var extractInterfaceBaseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, State, State, null, State.ProjectsProvider);
             ViewModel.CodeExplorerExtractInterfaceCommand = new CodeExplorerExtractInterfaceCommand(
                 new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, null, null, _uiDispatcher.Object),
                 State, null, VbeEvents.Object);

RubberduckTests/Commands/RefactorCommands/ExtractInterfaceCommandTests.cs

@@ -172,7 +172,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
                 .Setup(m => m.Invoke(It.IsAny<Action>()))
                 .Callback((Action action) => action.Invoke());
             var addImplementationsBaseRefactoring = new AddInterFaceImplementationsBaseRefactoring(rewritingManager);
-            var baseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, state, state, rewritingManager);
+            var baseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, state, state, rewritingManager, state.ProjectsProvider);
             var refactoring = new ExtractInterfaceRefactoring(baseRefactoring, state, factory, selectionService, uiDispatcherMock.Object);
             var notifier = new ExtractInterfaceFailedNotifier(msgBox);
             return new RefactorExtractInterfaceCommand(refactoring, notifier, state, selectionService);

RubberduckTests/Refactoring/ExtractInterfaceTests.cs

@@ -650,7 +650,7 @@ protected override IRefactoring TestRefactoring(IRewritingManager rewritingManag
                 .Setup(m => m.Invoke(It.IsAny<Action>()))
                 .Callback((Action action) => action.Invoke());
             var addImplementationsBaseRefactoring = new AddInterFaceImplementationsBaseRefactoring(rewritingManager);
-            var baseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, state, state, rewritingManager);
+            var baseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, state, state, rewritingManager, state.ProjectsProvider);
             return new ExtractInterfaceRefactoring(baseRefactoring, state, factory, selectionService, uiDispatcherMock.Object);
         }
     }