Add members for finding selected projects and members to ISelectedDeclarationService

Author: MDoerner

Rubberduck.Core/UI/Command/RunSelectedTestMethodCommand.cs

@@ -3,20 +3,19 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UnitTesting;
-using Rubberduck.VBEditor.Utility;
 
 namespace Rubberduck.UI.Command
 {
     public class RunSelectedTestMethodCommand : CommandBase
     {
         private readonly ITestEngine _engine;
-        private readonly ISelectionProvider _selectionProvider;
+        private readonly ISelectedDeclarationProvider _selectedDeclarationProvider;
         private readonly IDeclarationFinderProvider _finderProvider;
 
-        public RunSelectedTestMethodCommand(ITestEngine engine, ISelectionProvider selectionProvider, IDeclarationFinderProvider finderProvider) 
+        public RunSelectedTestMethodCommand(ITestEngine engine, ISelectedDeclarationProvider selectedDeclarationProvider, IDeclarationFinderProvider finderProvider) 
         {
             _engine = engine;
-            _selectionProvider = selectionProvider;
+            _selectedDeclarationProvider = selectedDeclarationProvider;
             _finderProvider = finderProvider;
 
             AddToCanExecuteEvaluation(SpecialEvaluateCanExecute);
@@ -43,15 +42,17 @@ protected override void OnExecute(object parameter)
 
         private Declaration FindDeclarationFromSelection()
         {
-            var active = _selectionProvider?.ActiveSelection();
-            if (!active.HasValue)
-            {
-                return null;
-            }
+            var selectedMember = _selectedDeclarationProvider.SelectedMember();
+            return IsTestMethod(selectedMember)
+                ? selectedMember
+                : null;
+        }
 
-            return _finderProvider.DeclarationFinder.FindDeclarationsContainingSelection(active.Value)
-                .SingleOrDefault(declaration => declaration.DeclarationType == DeclarationType.Procedure &&
-                                                declaration.Annotations.Any(annotation => annotation is TestMethodAnnotation));
+        private bool IsTestMethod(Declaration member)
+        {
+            return member.DeclarationType == DeclarationType.Procedure
+                   && member.Annotations.Any(parseTreeAnnotation =>
+                       parseTreeAnnotation.Annotation is TestMethodAnnotation);
         }
     }
 }

Rubberduck.Parsing/VBA/ISelectedDeclarationProvider.cs

@@ -8,6 +8,8 @@ public interface ISelectedDeclarationProvider
         Declaration SelectedDeclaration();
         Declaration SelectedDeclaration(QualifiedModuleName module);
         Declaration SelectedDeclaration(QualifiedSelection qualifiedSelection);
+        ProjectDeclaration SelectedProject();
         ModuleDeclaration SelectedModule();
+        ModuleBodyElementDeclaration SelectedMember();
     }
 }

Rubberduck.Parsing/VBA/SelectedDeclarationProvider.cs

@@ -47,6 +47,17 @@ public Declaration SelectedDeclaration(QualifiedSelection qualifiedSelection)
             return _declarationFinderProvider.DeclarationFinder?.FindSelectedDeclaration(qualifiedSelection);
         }
 
+        public ProjectDeclaration SelectedProject()
+        {
+            var activeSelection = _selectionProvider.ActiveSelection();
+            return activeSelection.HasValue
+                ? _declarationFinderProvider.DeclarationFinder?
+                    .UserDeclarations(DeclarationType.Project)
+                    .OfType<ProjectDeclaration>()
+                    .FirstOrDefault(project => project.ProjectId.Equals(activeSelection.Value.QualifiedName.ProjectId))
+                : null;
+        }
+
         public ModuleDeclaration SelectedModule()
         {
             var activeSelection = _selectionProvider.ActiveSelection();
@@ -57,5 +68,17 @@ public ModuleDeclaration SelectedModule()
                     .FirstOrDefault(module => module.QualifiedModuleName.Equals(activeSelection.Value.QualifiedName))
                 : null;
         }
+
+        public ModuleBodyElementDeclaration SelectedMember()
+        {
+            var activeSelection = _selectionProvider.ActiveSelection();
+            return activeSelection.HasValue
+                ? _declarationFinderProvider.DeclarationFinder?
+                    .UserDeclarations(DeclarationType.Member)
+                    .OfType<ModuleBodyElementDeclaration>()
+                    .FirstOrDefault(member => member.QualifiedModuleName.Equals(activeSelection.Value.QualifiedName)
+                        && member.Context.GetSelection().Contains(activeSelection.Value.Selection))
+                : null;
+        }
     }
 }