Fix and rewire MoveCloserToUsage

Author: MDoerner

Rubberduck.CodeAnalysis/QuickFixes/MoveFieldCloserToUsageQuickFix.cs

@@ -7,20 +7,21 @@
 using Rubberduck.Refactorings.MoveCloserToUsage;
 using Rubberduck.Resources.Inspections;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
     public sealed class MoveFieldCloserToUsageQuickFix : QuickFixBase
     {
-        private readonly IVBE _vbe;
+        private readonly ISelectionService _selectionService;
         private readonly RubberduckParserState _state;
         private readonly IRewritingManager _rewritingManager;
         private readonly IMessageBox _messageBox;
 
-        public MoveFieldCloserToUsageQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager)
+        public MoveFieldCloserToUsageQuickFix(RubberduckParserState state, IMessageBox messageBox, IRewritingManager rewritingManager, ISelectionService selectionService)
             : base(typeof(MoveFieldCloserToUsageInspection))
         {
-            _vbe = vbe;
+            _selectionService = selectionService;
             _state = state;
             _rewritingManager = rewritingManager;
             _messageBox = messageBox;
@@ -29,7 +30,7 @@ public MoveFieldCloserToUsageQuickFix(IVBE vbe, RubberduckParserState state, IMe
         //The rewriteSession is optional since it is not used in this particular quickfix because it is a refactoring quickfix.
         public override void Fix(IInspectionResult result, IRewriteSession rewriteSession = null)
         {
-            var refactoring = new MoveCloserToUsageRefactoring(_vbe, _state, _messageBox, _rewritingManager);
+            var refactoring = new MoveCloserToUsageRefactoring(_state, _messageBox, _rewritingManager, _selectionService);
             refactoring.Refactor(result.Target);
         }
 

Rubberduck.Core/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs

@@ -5,6 +5,7 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.MoveCloserToUsage;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
@@ -13,41 +14,46 @@ public class RefactorMoveCloserToUsageCommand : RefactorCommandBase
         private readonly RubberduckParserState _state;
         private readonly IRewritingManager _rewritingManager;
         private readonly IMessageBox _msgbox;
+        private readonly ISelectionService _selectionService;
 
-        public RefactorMoveCloserToUsageCommand(IVBE vbe, RubberduckParserState state, IMessageBox msgbox, IRewritingManager rewritingManager)
+        public RefactorMoveCloserToUsageCommand(IVBE vbe, RubberduckParserState state, IMessageBox msgbox, IRewritingManager rewritingManager, ISelectionService selectionService)
             :base(vbe)
         {
             _state = state;
             _rewritingManager = rewritingManager;
             _msgbox = msgbox;
+            _selectionService = selectionService;
         }
 
         protected override bool EvaluateCanExecute(object parameter)
         {
-            using (var activePane = Vbe.ActiveCodePane)
+            if (_state.Status != ParserState.Ready)
             {
-                if (activePane == null || activePane .IsWrappingNullReference || _state.Status != ParserState.Ready)
-                {
-                    return false;
-                }
+                return false;
+            }
 
-                var target = _state.FindSelectedDeclaration(activePane);
-                return target != null
-                       && !_state.IsNewOrModified(target.QualifiedModuleName)
-                       && (target.DeclarationType == DeclarationType.Variable ||
-                           target.DeclarationType == DeclarationType.Constant)
-                       && target.References.Any();
+            var activeSelection = _selectionService.ActiveSelection();
+            if (!activeSelection.HasValue)
+            {
+                return false;
             }
+
+            var target = _state.DeclarationFinder.FindSelectedDeclaration(activeSelection.Value);
+            return target != null
+                   && !_state.IsNewOrModified(target.QualifiedModuleName)
+                   && (target.DeclarationType == DeclarationType.Variable
+                       || target.DeclarationType == DeclarationType.Constant)
+                   && target.References.Any();
         }
 
         protected override void OnExecute(object parameter)
         {
-            var selection = Vbe.GetActiveSelection();
+            var activeSelection = _selectionService.ActiveSelection();
 
-            if (selection.HasValue)
+            if (activeSelection.HasValue)
             {
-                var refactoring = new MoveCloserToUsageRefactoring(Vbe, _state, _msgbox, _rewritingManager);
-                refactoring.Refactor(selection.Value);
+                var refactoring = new MoveCloserToUsageRefactoring(_state, _msgbox, _rewritingManager, _selectionService);
+                refactoring.Refactor(activeSelection.Value);
             }
         }
     }