injected IIndenter into RefactorExtractMethodCommand

Author: retailcoder

RetailCoder.VBE/Refactorings/ExtractMethod/ExtractMethodPresenter.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Rubberduck.Parsing.Grammar;
+using Rubberduck.SmartIndenter;
 
 namespace Rubberduck.Refactorings.ExtractMethod
 {
@@ -15,11 +16,13 @@ public class ExtractMethodPresenter : IExtractMethodPresenter
     {
         private readonly IExtractMethodDialog _view;
         private readonly ExtractMethodModel _model;
+        private readonly IIndenter _indenter;
 
-        public ExtractMethodPresenter(IExtractMethodDialog view, ExtractMethodModel model)
+        public ExtractMethodPresenter(IExtractMethodDialog view, ExtractMethodModel model, IIndenter indenter)
         {
             _view = view;
             _model = model;
+            _indenter = indenter;
         }
 
         public ExtractMethodModel Show()
@@ -92,7 +95,10 @@ private void GeneratePreview()
             _model.Method.ReturnValue = _view.ReturnValue;
             _model.Method.SetReturnValue = _view.SetReturnValue;
 
-            _view.Preview = ExtractMethodRefactoring.GetExtractedMethod(_model);
+            var code = ExtractMethodRefactoring.GetExtractedMethod(_model).Split(new[]{Environment.NewLine}, StringSplitOptions.RemoveEmptyEntries);
+            _indenter.Indent(code, "Preview", false);
+
+            _view.Preview = string.Join(Environment.NewLine, code);
         }
     }
 }

RetailCoder.VBE/Refactorings/ExtractMethod/ExtractMethodPresenterFactory.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Rubberduck.Parsing.Symbols;
+using Rubberduck.SmartIndenter;
 using Rubberduck.UI.Refactorings;
 using Rubberduck.VBEditor;
 
@@ -10,11 +11,13 @@ public class ExtractMethodPresenterFactory : IRefactoringPresenterFactory<IExtra
     {
         private readonly IActiveCodePaneEditor _editor;
         private readonly IEnumerable<Declaration> _declarations;
+        private readonly IIndenter _indenter;
 
-        public ExtractMethodPresenterFactory(IActiveCodePaneEditor editor, IEnumerable<Declaration> declarations)
+        public ExtractMethodPresenterFactory(IActiveCodePaneEditor editor, IEnumerable<Declaration> declarations, IIndenter indenter)
         {
             _editor = editor;
             _declarations = declarations;
+            _indenter = indenter;
         }
 
         public IExtractMethodPresenter Create()
@@ -36,7 +39,7 @@ public IExtractMethodPresenter Create()
             }
 
             var view = new ExtractMethodDialog();
-            return new ExtractMethodPresenter(view, model);
+            return new ExtractMethodPresenter(view, model, _indenter);
         }
     }
 }

RetailCoder.VBE/UI/Command/Refactorings/RefactorExtractMethodCommand.cs

@@ -6,6 +6,7 @@
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.ExtractMethod;
+using Rubberduck.SmartIndenter;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 
@@ -15,11 +16,13 @@ namespace Rubberduck.UI.Command.Refactorings
     public class RefactorExtractMethodCommand : RefactorCommandBase
     {
         private readonly RubberduckParserState _state;
+        private readonly IIndenter _indenter;
 
-        public RefactorExtractMethodCommand(VBE vbe, RubberduckParserState state, IActiveCodePaneEditor editor)
+        public RefactorExtractMethodCommand(VBE vbe, RubberduckParserState state, IActiveCodePaneEditor editor, IIndenter indenter)
             : base (vbe, editor)
         {
             _state = state;
+            _indenter = indenter;
         }
 
         public override bool CanExecute(object parameter)
@@ -44,7 +47,7 @@ public override bool CanExecute(object parameter)
 
         public override void Execute(object parameter)
         {
-            var factory = new ExtractMethodPresenterFactory(Editor, _state.AllDeclarations);
+            var factory = new ExtractMethodPresenterFactory(Editor, _state.AllDeclarations, _indenter);
             var refactoring = new ExtractMethodRefactoring(factory, Editor);
             refactoring.InvalidSelection += HandleInvalidSelection;
             refactoring.Refactor();