Cleanup from merge

Author: BZngr

Rubberduck.Refactorings/EncapsulateField/EncapsulateFieldRefactoring.cs

@@ -30,16 +30,9 @@ public EncapsulateFieldRefactoring(
                 RefactoringUserInteraction<IEncapsulateFieldPresenter, EncapsulateFieldModel> userInteraction,
                 IRewritingManager rewritingManager,
                 ISelectionProvider selectionProvider,
-//<<<<<<< HEAD
-//                ISelectedDeclarationProvider selectedDeclarationProvider,
-//                IUiDispatcher uiDispatcher,
-//                ICodeBuilder codeBuilder)
-//            :base(selectionProvider, factory, uiDispatcher)
-//=======
                 ISelectedDeclarationProvider selectedDeclarationProvider,
                 ICodeBuilder codeBuilder)
             :base(selectionProvider, userInteraction)
-//>>>>>>> rubberduck-vba/next
         {
             _declarationFinderProvider = declarationFinderProvider;
             _selectedDeclarationProvider = selectedDeclarationProvider;

Rubberduck.Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs

@@ -17,20 +17,11 @@ public class ExtractInterfaceRefactoring : InteractiveRefactoringBase<ExtractInt
 
         public ExtractInterfaceRefactoring(
             ExtractInterfaceRefactoringAction refactoringAction,
-//<<<<<<< HEAD
-//            IDeclarationFinderProvider declarationFinderProvider, 
-//            IRefactoringPresenterFactory factory, 
-//            ISelectionProvider selectionProvider,
-//            IUiDispatcher uiDispatcher,
-//            ICodeBuilder codeBuilder)
-//        :base(selectionProvider, factory, uiDispatcher)
-//=======
             IDeclarationFinderProvider declarationFinderProvider,
             RefactoringUserInteraction<IExtractInterfacePresenter, ExtractInterfaceModel> userInteraction,
             ISelectionProvider selectionProvider,
             ICodeBuilder codeBuilder)
         :base(selectionProvider, userInteraction)
-//>>>>>>> rubberduck-vba/next
         {
             _refactoringAction = refactoringAction;
             _declarationFinderProvider = declarationFinderProvider;

Rubberduck.Refactorings/ImplementInterface/AddInterfaceImplementations/AddInterfaceImplementationsRefactoringAction.cs

@@ -4,10 +4,7 @@
 using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Rewriter;
 using Rubberduck.Parsing.Symbols;
-//<<<<<<< HEAD
-//=======
-//using Rubberduck.Refactorings.Common;
-//>>>>>>> rubberduck-vba/next
+
 
 namespace Rubberduck.Refactorings.AddInterfaceImplementations
 {

RubberduckTests/CodeExplorer/MockedCodeExplorer.cs

@@ -510,11 +510,7 @@ public MockedCodeExplorer ImplementExtractInterfaceCommand()
             var extractInterfaceBaseRefactoring = new ExtractInterfaceRefactoringAction(addImplementationsBaseRefactoring, State, State, null, State.ProjectsProvider, addComponentService);
             var userInteraction = new RefactoringUserInteraction<IExtractInterfacePresenter, ExtractInterfaceModel>(null, _uiDispatcher.Object);
             ViewModel.CodeExplorerExtractInterfaceCommand = new CodeExplorerExtractInterfaceCommand(
-//<<<<<<< HEAD
-//                new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, null, null, _uiDispatcher.Object, new CodeBuilder()),
-//=======
                 new ExtractInterfaceRefactoring(extractInterfaceBaseRefactoring, State, userInteraction, null, new CodeBuilder()),
-//>>>>>>> rubberduck-vba/next
                 State, null, VbeEvents.Object);
             return this;
         }

RubberduckTests/Commands/RefactorCommands/EncapsulateFieldCommandTests.cs

@@ -63,12 +63,8 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             uiDispatcherMock
                 .Setup(m => m.Invoke(It.IsAny<Action>()))
                 .Callback((Action action) => action.Invoke());
-//<<<<<<< HEAD
-//            var refactoring = new EncapsulateFieldRefactoring(state, null, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object, new CodeBuilder());
-//=======
             var userInteraction = new RefactoringUserInteraction<IEncapsulateFieldPresenter, EncapsulateFieldModel>(factory, uiDispatcherMock.Object);
             var refactoring = new EncapsulateFieldRefactoring(state, null, userInteraction, rewritingManager, selectionService, selectedDeclarationProvider, new CodeBuilder());
-//>>>>>>> rubberduck-vba/next
             var notifier = new EncapsulateFieldFailedNotifier(msgBox);
             var selectedDeclarationService = new SelectedDeclarationProvider(selectionService, state);
             return new RefactorEncapsulateFieldCommand(refactoring, notifier, state, selectionService, selectedDeclarationService);

RubberduckTests/Commands/RefactorCommands/ExtractInterfaceCommandTests.cs

@@ -176,12 +176,8 @@ protected override CommandBase TestCommand(IVBE vbe, RubberduckParserState state
             var addImplementationsBaseRefactoring = new AddInterfaceImplementationsRefactoringAction(rewritingManager, new CodeBuilder());
             var addComponentService = TestAddComponentService(state.ProjectsProvider);
             var baseRefactoring = new ExtractInterfaceRefactoringAction(addImplementationsBaseRefactoring, state, state, rewritingManager, state.ProjectsProvider, addComponentService);
-//<<<<<<< HEAD
-//            var refactoring = new ExtractInterfaceRefactoring(baseRefactoring, state, factory, selectionService, uiDispatcherMock.Object, new CodeBuilder());
-//=======
             var userInteraction = new RefactoringUserInteraction<IExtractInterfacePresenter, ExtractInterfaceModel>(factory, uiDispatcherMock.Object);
             var refactoring = new ExtractInterfaceRefactoring(baseRefactoring, state, userInteraction, selectionService, new CodeBuilder());
-//>>>>>>> rubberduck-vba/next
             var notifier = new ExtractInterfaceFailedNotifier(msgBox);
             return new RefactorExtractInterfaceCommand(refactoring, notifier, state, selectionService);
         }

RubberduckTests/Refactoring/EncapsulateField/EncapsulateFIeldTestSupport.cs

@@ -119,15 +119,7 @@ public IRefactoring SupportTestRefactoring(
         {
             var indenter = CreateIndenter();
             var selectedDeclarationProvider = new SelectedDeclarationProvider(selectionService, state);
-//<<<<<<< HEAD
-//            var uiDispatcherMock = new Mock<IUiDispatcher>();
-//            uiDispatcherMock
-//                .Setup(m => m.Invoke(It.IsAny<Action>()))
-//                .Callback((Action action) => action.Invoke());
-//            return new EncapsulateFieldRefactoring(state, indenter, factory, rewritingManager, selectionService, selectedDeclarationProvider, uiDispatcherMock.Object, new CodeBuilder());
-//=======
             return new EncapsulateFieldRefactoring(state, indenter, userInteraction, rewritingManager, selectionService, selectedDeclarationProvider, new CodeBuilder());
-//>>>>>>> rubberduck-vba/next
         }
 
         public IEncapsulateFieldCandidate RetrieveEncapsulateFieldCandidate(string inputCode, string fieldName)

RubberduckTests/Refactoring/ExtractInterface/ExtractInterfaceTests.cs

@@ -309,21 +309,10 @@ protected override IRefactoring TestRefactoring(
             RefactoringUserInteraction<IExtractInterfacePresenter, ExtractInterfaceModel> userInteraction, 
             ISelectionService selectionService)
         {
-//<<<<<<< HEAD
-//            var uiDispatcherMock = new Mock<IUiDispatcher>();
-//            uiDispatcherMock
-//                .Setup(m => m.Invoke(It.IsAny<Action>()))
-//                .Callback((Action action) => action.Invoke());
-//            var addImplementationsBaseRefactoring = new AddInterfaceImplementationsRefactoringAction(rewritingManager, new CodeBuilder());
-//            var addComponentService = TestAddComponentService(state?.ProjectsProvider);
-//            var baseRefactoring = new ExtractInterfaceRefactoringAction(addImplementationsBaseRefactoring, state, state, rewritingManager, state?.ProjectsProvider, addComponentService);
-//            return new ExtractInterfaceRefactoring(baseRefactoring, state, factory, selectionService, uiDispatcherMock.Object, new CodeBuilder());
-//=======
             var addImplementationsBaseRefactoring = new AddInterfaceImplementationsRefactoringAction(rewritingManager, new CodeBuilder());
             var addComponentService = TestAddComponentService(state?.ProjectsProvider);
             var baseRefactoring = new ExtractInterfaceRefactoringAction(addImplementationsBaseRefactoring, state, state, rewritingManager, state?.ProjectsProvider, addComponentService);
             return new ExtractInterfaceRefactoring(baseRefactoring, state, userInteraction, selectionService, new CodeBuilder());
-//>>>>>>> rubberduck-vba/next
         }
 
         private static IAddComponentService TestAddComponentService(IProjectsProvider projectsProvider)