Remove RewritingManager from RefactoringBase

MDoerner · MDoerner · commit 6f9e34784539 · 2020-02-13T22:29:48.000+01:00
diff --git a/Rubberduck.Main/Root/RubberduckIoCInstaller.cs b/Rubberduck.Main/Root/RubberduckIoCInstaller.cs
@@ -149,15 +149,15 @@ public void Install(IWindsorContainer container, IConfigurationStore store)
                 .LifestyleSingleton());
 
             RegisterSettingsViewModel(container);
+            RegisterRefactoringPreviewProviders(container);
             RegisterRefactoringDialogs(container);
 
             container.Register(Component.For<ISearchResultsWindowViewModel>()
                 .ImplementedBy<SearchResultsWindowViewModel>()
                 .LifestyleSingleton());
             container.Register(Component.For<SearchResultPresenterInstanceManager>()
                 .LifestyleSingleton());
-
-            RegisterRefactoringDialogs(container);
+            
             RegisterDockablePresenters(container);
             RegisterDockableUserControls(container);
 
@@ -715,6 +715,23 @@ private void RegisterSettingsViewModel(IWindsorContainer container)
             );
         }
 
+        private void RegisterRefactoringPreviewProviders(IWindsorContainer container)
+        {
+            container.Register(Types
+                .FromAssemblyInThisApplication()
+                .IncludeNonPublicTypes()
+                .BasedOn(typeof(IRefactoringPreviewProvider<>))
+                .LifestyleSingleton()
+                .WithServiceSelect((type, types) =>
+                {
+                    var face = type.GetInterfaces().FirstOrDefault(i =>
+                        i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IRefactoringPreviewProvider<>));
+
+                    return face == null ? new[] { type } : new[] { type, face };
+                })
+            );
+        }
+
         private void RegisterRefactoringDialogs(IWindsorContainer container)
         {
             container.Register(Types
diff --git a/Rubberduck.Refactorings/Abstract/InteractiveRefactoringBase.cs b/Rubberduck.Refactorings/Abstract/InteractiveRefactoringBase.cs
@@ -1,5 +1,4 @@
-﻿using Rubberduck.Parsing.Rewriter;
-using Rubberduck.VBEditor.Utility;
+﻿using Rubberduck.VBEditor.Utility;
 using System;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
@@ -13,12 +12,11 @@ public abstract class InteractiveRefactoringBase<TPresenter, TModel> : Refactori
     {
         private readonly Func<TModel, IDisposalActionContainer<TPresenter>> _presenterFactory;
 
-        protected InteractiveRefactoringBase(
-            IRewritingManager rewritingManager, 
+        protected InteractiveRefactoringBase( 
             ISelectionProvider selectionProvider, 
             IRefactoringPresenterFactory factory,
             IUiDispatcher uiDispatcher) 
-        :base(rewritingManager, selectionProvider)
+        :base(selectionProvider)
         {
             Action<TPresenter> presenterDisposalAction = (TPresenter presenter) => uiDispatcher.Invoke(() => factory.Release(presenter)); 
             _presenterFactory = ((model) => DisposalActionContainer.Create(factory.Create<TPresenter, TModel>(model), presenterDisposalAction));
diff --git a/Rubberduck.Refactorings/Abstract/RefactoringBase.cs b/Rubberduck.Refactorings/Abstract/RefactoringBase.cs
@@ -1,5 +1,4 @@
-﻿using Rubberduck.Parsing.Rewriter;
-using Rubberduck.Parsing.Symbols;
+﻿using Rubberduck.Parsing.Symbols;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Utility;
@@ -8,12 +7,10 @@ namespace Rubberduck.Refactorings
 {
     public abstract class RefactoringBase : IRefactoring
     {
-        protected readonly IRewritingManager RewritingManager;
         protected readonly ISelectionProvider SelectionProvider;
 
-        protected RefactoringBase(IRewritingManager rewritingManager, ISelectionProvider selectionProvider)
+        protected RefactoringBase(ISelectionProvider selectionProvider)
         {
-            RewritingManager = rewritingManager;
             SelectionProvider = selectionProvider;
         }
 
diff --git a/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs b/Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs
@@ -27,6 +27,7 @@ public class EncapsulateFieldRefactoring : InteractiveRefactoringBase<IEncapsula
         private readonly IDeclarationFinderProvider _declarationFinderProvider;
         private readonly ISelectedDeclarationProvider _selectedDeclarationProvider;
         private readonly IIndenter _indenter;
+        private readonly IRewritingManager _rewritingManager;
 
         public EncapsulateFieldRefactoring(
                 IDeclarationFinderProvider declarationFinderProvider,
@@ -36,11 +37,12 @@ public EncapsulateFieldRefactoring(
                 ISelectionProvider selectionProvider,
                 ISelectedDeclarationProvider selectedDeclarationProvider,
                 IUiDispatcher uiDispatcher)
-            :base(rewritingManager, selectionProvider, factory, uiDispatcher)
+            :base(selectionProvider, factory, uiDispatcher)
         {
             _declarationFinderProvider = declarationFinderProvider;
             _selectedDeclarationProvider = selectedDeclarationProvider;
             _indenter = indenter;
+            _rewritingManager = rewritingManager;
         }
 
         public EncapsulateFieldModel TestUserInteractionOnly(Declaration target, Func<EncapsulateFieldModel, EncapsulateFieldModel> userInteraction)
@@ -99,7 +101,7 @@ protected override EncapsulateFieldModel InitializeModel(Declaration target)
 
         protected override void RefactorImpl(EncapsulateFieldModel model)
         {
-            var refactorRewriteSession = new EncapsulateFieldRewriteSession(RewritingManager.CheckOutCodePaneSession()) as IEncapsulateFieldRewriteSession;
+            var refactorRewriteSession = new EncapsulateFieldRewriteSession(_rewritingManager.CheckOutCodePaneSession()) as IEncapsulateFieldRewriteSession;
 
             refactorRewriteSession = RefactorRewrite(model, refactorRewriteSession);
 
@@ -111,7 +113,7 @@ protected override void RefactorImpl(EncapsulateFieldModel model)
 
         private string PreviewRewrite(EncapsulateFieldModel model)
         {
-            var previewSession = new EncapsulateFieldRewriteSession(RewritingManager.CheckOutCodePaneSession()) as IEncapsulateFieldRewriteSession; ;
+            var previewSession = new EncapsulateFieldRewriteSession(_rewritingManager.CheckOutCodePaneSession()) as IEncapsulateFieldRewriteSession; ;
 
             previewSession = RefactorRewrite(model, previewSession, true);
 
diff --git a/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs b/Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs
@@ -1,7 +1,6 @@
 ﻿using System.Linq;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.Grammar;
-using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
@@ -20,10 +19,9 @@ public ExtractInterfaceRefactoring(
             ExtractInterfaceBaseRefactoring baseRefactoring,
             IDeclarationFinderProvider declarationFinderProvider, 
             IRefactoringPresenterFactory factory, 
-            IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
             IUiDispatcher uiDispatcher)
-        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
+        :base(selectionProvider, factory, uiDispatcher)
         {
             _baseRefactoring = baseRefactoring;
             _declarationFinderProvider = declarationFinderProvider;
diff --git a/Rubberduck.Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs b/Rubberduck.Refactorings/ImplementInterface/ImplementInterfaceRefactoring.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
-using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
@@ -19,9 +18,8 @@ public class ImplementInterfaceRefactoring : RefactoringBase
         public ImplementInterfaceRefactoring(
             ImplementInterfaceBaseRefactoring baseRefactoring,
             IDeclarationFinderProvider declarationFinderProvider, 
-            IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider)
-        :base(rewritingManager, selectionProvider)
+        :base(selectionProvider)
         {
             _baseRefactoring = baseRefactoring;
             _declarationFinderProvider = declarationFinderProvider;
diff --git a/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs b/Rubberduck.Refactorings/IntroduceField/IntroduceFieldRefactoring.cs
@@ -1,5 +1,4 @@
 ﻿using System.Linq;
-using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
@@ -16,10 +15,9 @@ public class IntroduceFieldRefactoring : RefactoringBase
 
         public IntroduceFieldRefactoring(
             IntroduceFieldBaseRefactoring baseRefactoring, 
-            IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
             ISelectedDeclarationProvider selectedDeclarationProvider)
-        :base(rewritingManager, selectionProvider)
+        :base(selectionProvider)
         {
             _baseRefactoring = baseRefactoring;
             _selectedDeclarationProvider = selectedDeclarationProvider;
diff --git a/Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs b/Rubberduck.Refactorings/IntroduceParameter/IntroduceParameterRefactoring.cs
@@ -1,9 +1,4 @@
-﻿using System.Collections.Generic;
-using System.Linq;
-using Rubberduck.Interaction;
-using Rubberduck.Parsing;
-using Rubberduck.Parsing.Grammar;
-using Rubberduck.Parsing.Rewriter;
+﻿using Rubberduck.Interaction;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
@@ -23,10 +18,9 @@ public class IntroduceParameterRefactoring : RefactoringBase
         public IntroduceParameterRefactoring(
             IntroduceParameterBaseRefactoring baseRefactoring, 
             IMessageBox messageBox, 
-            IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
             ISelectedDeclarationProvider selectedDeclarationProvider)
-        :base(rewritingManager, selectionProvider)
+        :base(selectionProvider)
         {
             _baseRefactoring = baseRefactoring;
             _selectedDeclarationProvider = selectedDeclarationProvider;
diff --git a/Rubberduck.Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs b/Rubberduck.Refactorings/MoveCloserToUsage/MoveCloserToUsageRefactoring.cs
@@ -1,5 +1,4 @@
 ﻿using System.Linq;
-using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Exceptions;
@@ -17,11 +16,10 @@ public class MoveCloserToUsageRefactoring : RefactoringBase
 
         public MoveCloserToUsageRefactoring(
             MoveCloserToUsageBaseRefactoring baseRefactoring,
-            IDeclarationFinderProvider declarationFinderProvider, 
-            IRewritingManager rewritingManager,
+            IDeclarationFinderProvider declarationFinderProvider,
             ISelectionProvider selectionProvider,
             ISelectedDeclarationProvider selectedDeclarationProvider)
-        :base(rewritingManager, selectionProvider)
+        :base(selectionProvider)
         {
             _baseRefactoring = baseRefactoring;
             _declarationFinderProvider = declarationFinderProvider;
diff --git a/Rubberduck.Refactorings/RemoveParameters/RemoveParametersRefactoring.cs b/Rubberduck.Refactorings/RemoveParameters/RemoveParametersRefactoring.cs
@@ -1,5 +1,4 @@
 ﻿using System.Linq;
-using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
@@ -20,11 +19,10 @@ public RemoveParametersRefactoring(
             RemoveParameterBaseRefactoring baseRefactoring,
             IDeclarationFinderProvider declarationFinderProvider, 
             IRefactoringPresenterFactory factory, 
-            IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
             ISelectedDeclarationProvider selectedDeclarationProvider,
             IUiDispatcher uiDispatcher)
-        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
+        :base(selectionProvider, factory, uiDispatcher)
         {
             _baseRefactoring = baseRefactoring;
             _declarationFinderProvider = declarationFinderProvider;
diff --git a/Rubberduck.Refactorings/Rename/RenameRefactoring.cs b/Rubberduck.Refactorings/Rename/RenameRefactoring.cs
@@ -3,7 +3,6 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
-using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Refactorings.Exceptions;
 using Rubberduck.Refactorings.Exceptions.Rename;
 using Rubberduck.VBEditor.ComManagement;
@@ -24,11 +23,10 @@ public RenameRefactoring(
             IRefactoringPresenterFactory factory, 
             IDeclarationFinderProvider declarationFinderProvider,
             IProjectsProvider projectsProvider, 
-            IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
             ISelectedDeclarationProvider selectedDeclarationProvider,
             IUiDispatcher uiDispatcher)
-            : base(rewritingManager, selectionProvider, factory, uiDispatcher)
+            : base(selectionProvider, factory, uiDispatcher)
         {
             _baseRefactoring = baseRefactoring;
             _declarationFinderProvider = declarationFinderProvider;
diff --git a/Rubberduck.Refactorings/ReorderParameters/ReorderParametersRefactoring.cs b/Rubberduck.Refactorings/ReorderParameters/ReorderParametersRefactoring.cs
@@ -1,6 +1,5 @@
 ﻿using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
-using Rubberduck.Parsing.Rewriter;
 using System.Linq;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.Parsing.VBA;
@@ -19,11 +18,10 @@ public ReorderParametersRefactoring(
             ReorderParameterBaseRefactoring baseRefactoring,
             IDeclarationFinderProvider declarationFinderProvider, 
             IRefactoringPresenterFactory factory, 
-            IRewritingManager rewritingManager,
             ISelectionProvider selectionProvider,
             ISelectedDeclarationProvider selectedDeclarationProvider,
             IUiDispatcher uiDispatcher)
-        :base(rewritingManager, selectionProvider, factory, uiDispatcher)
+        :base(selectionProvider, factory, uiDispatcher)
         {
             _baseRefactoring = baseRefactoring;
             _declarationFinderProvider = declarationFinderProvider;
diff --git a/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs b/RubberduckTests/CodeExplorer/MockedCodeExplorer.cs
@@ -506,7 +506,7 @@ public MockedCodeExplorer ImplementExtractInterfaceCommand()
             var addImplementationsBaseRefactoring = new AddInterFaceImplementationsBaseRefactoring(null);
             var extractInterfaceBaseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, State, State, null);
             ViewModel.CodeExplorerExtractInterfaceCommand = new CodeExplorerExtractInterfaceCommand(
-                new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, null, null, null, _uiDispatcher.Object),
+                new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, null, null, _uiDispatcher.Object),
                 State, null, VbeEvents.Object);
             return this;
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/ExtractInterfaceCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/ExtractInterfaceCommandTests.cs
@@ -173,7 +173,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
                 .Callback((Action action) => action.Invoke());
             var addImplementationsBaseRefactoring = new AddInterFaceImplementationsBaseRefactoring(rewritingManager);
             var baseRefactoring = new ExtractInterfaceBaseRefactoring(addImplementationsBaseRefactoring, state, state, rewritingManager);
-            var refactoring = new ExtractInterfaceRefactoring(baseRefactoring, state, factory, rewritingManager, selectionService, uiDispatcherMock.Object);
+            var refactoring = new ExtractInterfaceRefactoring(baseRefactoring, state, factory, selectionService, uiDispatcherMock.Object);
             var notifier = new ExtractInterfaceFailedNotifier(msgBox);
             return new RefactorExtractInterfaceCommand(refactoring, notifier, state, selectionService);
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/ImplementInterfaceCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/ImplementInterfaceCommandTests.cs
@@ -59,7 +59,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var msgBox = new Mock<IMessageBox>().Object;
             var addImplementationsBaseRefactoring = new AddInterFaceImplementationsBaseRefactoring(rewritingManager);
             var baseRefactoring = new ImplementInterfaceBaseRefactoring(addImplementationsBaseRefactoring, rewritingManager);
-            var refactoring = new ImplementInterfaceRefactoring(baseRefactoring, state, rewritingManager, selectionService);
+            var refactoring = new ImplementInterfaceRefactoring(baseRefactoring, state, selectionService);
             var notifier = new ImplementInterfaceFailedNotifier(msgBox);
             return new RefactorImplementInterfaceCommand(refactoring, notifier, state, selectionService);
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/IntroduceFieldCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/IntroduceFieldCommandTests.cs
@@ -44,7 +44,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var msgBox = new Mock<IMessageBox>().Object;
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
             var baseRefactoring = new IntroduceFieldBaseRefactoring(state, rewritingManager);
-            var refactoring = new IntroduceFieldRefactoring(baseRefactoring, rewritingManager, selectionService, selectedDeclarationProvider);
+            var refactoring = new IntroduceFieldRefactoring(baseRefactoring, selectionService, selectedDeclarationProvider);
             var notifier = new IntroduceFieldFailedNotifier(msgBox);
             return new RefactorIntroduceFieldCommand(refactoring, notifier, state, selectionService, selectedDeclarationProvider);
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/IntroduceParameterCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/IntroduceParameterCommandTests.cs
@@ -45,7 +45,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var msgBox = new Mock<IMessageBox>().Object;
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
             var baseRefactoring = new IntroduceParameterBaseRefactoring(state, rewritingManager);
-            var refactoring = new IntroduceParameterRefactoring(baseRefactoring, msgBox, rewritingManager, selectionService, selectedDeclarationProvider);
+            var refactoring = new IntroduceParameterRefactoring(baseRefactoring, msgBox, selectionService, selectedDeclarationProvider);
             var notifier = new IntroduceParameterFailedNotifier(msgBox);
             return new RefactorIntroduceParameterCommand(refactoring, notifier, state, selectionService, selectedDeclarationProvider);
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/MoveCloserToUsageCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/MoveCloserToUsageCommandTests.cs
@@ -99,7 +99,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var msgBox = new Mock<IMessageBox>().Object;
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
             var baseRefactoring = new MoveCloserToUsageBaseRefactoring(rewritingManager);
-            var refactoring = new MoveCloserToUsageRefactoring(baseRefactoring, state, rewritingManager, selectionService, selectedDeclarationProvider);
+            var refactoring = new MoveCloserToUsageRefactoring(baseRefactoring, state, selectionService, selectedDeclarationProvider);
             var notifier = new MoveCloserToUsageFailedNotifier(msgBox);
             var selectedDeclarationService = new SelectedDeclarationProvider(selectionService, state);
             return new RefactorMoveCloserToUsageCommand(refactoring, notifier, state, selectionService, selectedDeclarationService);
diff --git a/RubberduckTests/Commands/RefactorCommands/RemoveParametersCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/RemoveParametersCommandTests.cs
@@ -171,7 +171,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
                 .Setup(m => m.Invoke(It.IsAny<Action>()))
                 .Callback((Action action) => action.Invoke());
             var baseRefactoring = new RemoveParameterBaseRefactoring(state, rewritingManager);
-            var refactoring = new RemoveParametersRefactoring(baseRefactoring, state, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
+            var refactoring = new RemoveParametersRefactoring(baseRefactoring, state, factory, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
             var notifier = new RemoveParameterFailedNotifier(msgBox);
             return new RefactorRemoveParametersCommand(refactoring, notifier, state, selectionService, selectedDeclarationProvider);
         }
diff --git a/RubberduckTests/Commands/RefactorCommands/ReorderParametersCommandTests.cs b/RubberduckTests/Commands/RefactorCommands/ReorderParametersCommandTests.cs
@@ -171,7 +171,7 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
                 .Setup(m => m.Invoke(It.IsAny<Action>()))
                 .Callback((Action action) => action.Invoke());
             var baseRefactoring = new ReorderParameterBaseRefactoring(state, rewritingManager);
-            var refactoring = new ReorderParametersRefactoring(baseRefactoring, state, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
+            var refactoring = new ReorderParametersRefactoring(baseRefactoring, state, factory, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object);
             var notifier = new ReorderParametersFailedNotifier(msgBox);
             return new RefactorReorderParametersCommand(refactoring, notifier, state, selectionService, selectedDeclarationProvider);
         }
diff --git a/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs b/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs
diff --git a/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs b/RubberduckTests/QuickFixes/RemoveUnusedParameterQuickFixTests.cs
diff --git a/RubberduckTests/Refactoring/ExtractInterfaceTests.cs b/RubberduckTests/Refactoring/ExtractInterfaceTests.cs
diff --git a/RubberduckTests/Refactoring/ImplementInterfaceTests.cs b/RubberduckTests/Refactoring/ImplementInterfaceTests.cs
diff --git a/RubberduckTests/Refactoring/IntroduceFieldTests.cs b/RubberduckTests/Refactoring/IntroduceFieldTests.cs
diff --git a/RubberduckTests/Refactoring/IntroduceParameterTests.cs b/RubberduckTests/Refactoring/IntroduceParameterTests.cs
diff --git a/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs b/RubberduckTests/Refactoring/MoveCloserToUsageTests.cs
diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs
diff --git a/RubberduckTests/Refactoring/Rename/RenameTests.cs b/RubberduckTests/Refactoring/Rename/RenameTests.cs
diff --git a/RubberduckTests/Refactoring/ReorderParametersTests.cs b/RubberduckTests/Refactoring/ReorderParametersTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using Rubberduck.Parsing.Rewriter;`
`2`		`-using Rubberduck.Parsing.Symbols;`
	`1`	`+using Rubberduck.Parsing.Symbols;`
`3`	`2`	`using Rubberduck.Refactorings.Exceptions;`
`4`	`3`	`using Rubberduck.VBEditor;`
`5`	`4`	`using Rubberduck.VBEditor.Utility;`
`@@ -8,12 +7,10 @@ namespace Rubberduck.Refactorings`
`8`	`7`	`{`
`9`	`8`	`public abstract class RefactoringBase : IRefactoring`
`10`	`9`	`{`
`11`		`- protected readonly IRewritingManager RewritingManager;`
`12`	`10`	`protected readonly ISelectionProvider SelectionProvider;`
`13`	`11`
`14`		`- protected RefactoringBase(IRewritingManager rewritingManager, ISelectionProvider selectionProvider)`
	`12`	`+ protected RefactoringBase(ISelectionProvider selectionProvider)`
`15`	`13`	`{`
`16`		`- RewritingManager = rewritingManager;`
`17`	`14`	`SelectionProvider = selectionProvider;`
`18`	`15`	`}`
`19`	`16`