Make NoIndentCommand use the ISelectedDeclarationService

This also enhances the ISelectedDeclarationService by adding SelectedModule.

Author: MDoerner

Rubberduck.Core/UI/Command/ComCommands/NoIndentAnnotationCommand.cs

@@ -5,32 +5,24 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.VBEditor.Events;
-using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.Command.ComCommands
 {
     [ComVisible(false)]
     public class NoIndentAnnotationCommand : ComCommandBase
     {
-        private readonly IVBE _vbe;
-        private readonly IDeclarationFinderProvider _declarationFinderProvider;
-        private readonly ISelectionService _selectionService;
+        private readonly ISelectedDeclarationService _selectedDeclarationService;
         private readonly IAnnotationUpdater _annotationUpdater;
         private readonly IRewritingManager _rewritingManager;
 
         public NoIndentAnnotationCommand(
-            IVBE vbe, 
-            IDeclarationFinderProvider declarationFinderProvider, 
-            ISelectionService selectionService,
+            ISelectedDeclarationService selectedDeclarationService,
             IRewritingManager rewritingManager,
             IAnnotationUpdater annotationUpdater,
             IVbeEvents vbeEvents)
             : base(vbeEvents)
         {
-            _vbe = vbe;
-            _declarationFinderProvider = declarationFinderProvider;
-            _selectionService = selectionService;
+            _selectedDeclarationService = selectedDeclarationService;
             _rewritingManager = rewritingManager;
             _annotationUpdater = annotationUpdater;
 
@@ -65,15 +57,7 @@ private Declaration FindTarget(object parameter)
                 return declaration;
             }
 
-            var activeSelection = _selectionService.ActiveSelection();
-            if (!activeSelection.HasValue)
-            {
-                return null;
-            }
-
-            return _declarationFinderProvider.DeclarationFinder?
-                .UserDeclarations(DeclarationType.Module)
-                .FirstOrDefault(module => module.QualifiedModuleName.Equals(activeSelection.Value.QualifiedName));
+            return _selectedDeclarationService.SelectedModule();
         }
     }
 }

Rubberduck.Parsing/VBA/ISelectedDeclarationService.cs

@@ -8,5 +8,6 @@ public interface ISelectedDeclarationService
         Declaration SelectedDeclaration();
         Declaration SelectedDeclaration(QualifiedModuleName module);
         Declaration SelectedDeclaration(QualifiedSelection qualifiedSelection);
+        ModuleDeclaration SelectedModule();
     }
 }

Rubberduck.Parsing/VBA/SelectedDeclarationService.cs

@@ -1,4 +1,5 @@
-using Rubberduck.Parsing.Symbols;
+using System.Linq;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.Utility;
 
@@ -45,5 +46,16 @@ public Declaration SelectedDeclaration(QualifiedSelection qualifiedSelection)
         {
             return _declarationFinderProvider.DeclarationFinder?.FindSelectedDeclaration(qualifiedSelection);
         }
+
+        public ModuleDeclaration SelectedModule()
+        {
+            var activeSelection = _selectionService.ActiveSelection();
+            return activeSelection.HasValue
+                ? _declarationFinderProvider.DeclarationFinder?
+                    .UserDeclarations(DeclarationType.Module)
+                    .OfType<ModuleDeclaration>()
+                    .FirstOrDefault(module => module.QualifiedModuleName.Equals(activeSelection.Value.QualifiedName))
+                : null;
+        }
     }
 }

RubberduckTests/Commands/MockIndenter.cs

@@ -41,7 +41,9 @@ internal static NoIndentAnnotationCommand ArrangeNoIndentAnnotationCommand(Mock<
 
         internal static NoIndentAnnotationCommand ArrangeNoIndentAnnotationCommand(Mock<IVBE> vbe, RubberduckParserState state, IRewritingManager rewritingManager, Mock<IVbeEvents> vbeEvents)
         {
-            return new NoIndentAnnotationCommand(vbe.Object, state, new SelectionService(vbe.Object, state.ProjectsProvider), rewritingManager, new AnnotationUpdater(), vbeEvents.Object);
+            var selectionService = new SelectionService(vbe.Object, state.ProjectsProvider);
+            var selectedDeclarationService = new SelectedDeclarationService(selectionService, state);
+            return new NoIndentAnnotationCommand(selectedDeclarationService, rewritingManager, new AnnotationUpdater(), vbeEvents.Object);
         }
 
         internal static IndentCurrentProcedureCommand ArrangeIndentCurrentProcedureCommand(Mock<IVBE> vbe,