Navigate command.

Author: Hosch250

RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -21,6 +21,8 @@ public class CodeExplorerViewModel : ViewModelBase
     {
         private readonly VBE _vbe;
         private readonly RubberduckParserState _state;
+        private readonly NewUnitTestModuleCommand _newUnitTestModuleCommand;
+        private readonly Indenter _indenter;
         private readonly ICodePaneWrapperFactory _wrapperFactory;
         private readonly FindAllReferencesCommand _findAllReferences;
 
@@ -34,21 +36,22 @@ public CodeExplorerViewModel(VBE vbe,
         {
             _vbe = vbe;
             _state = state;
-            _navigateCommand = navigateCommand;
             _newUnitTestModuleCommand = newUnitTestModuleCommand;
             _indenter = indenter;
             _wrapperFactory = wrapperFactory;
             _findAllReferences = findAllReferences;
             _state.StateChanged += ParserState_StateChanged;
             _state.ModuleStateChanged += ParserState_ModuleStateChanged;
 
+            _navigateCommand = navigateCommand;
+            _contextMenuNavigateCommand = new DelegateCommand(ExecuteContextMenuNavigateCommand, CanExecuteContextMenuNavigateCommand);
             _refreshCommand = new DelegateCommand(ExecuteRefreshCommand, _ => CanRefresh);
             _addTestModuleCommand = new DelegateCommand(ExecuteAddTestModuleCommand);
             _addStdModuleCommand = new DelegateCommand(ExecuteAddStdModuleCommand, CanAddModule);
             _addClsModuleCommand = new DelegateCommand(ExecuteAddClsModuleCommand, CanAddModule);
             _addFormCommand = new DelegateCommand(ExecuteAddFormCommand, CanAddModule);
-            _indenterCommand = new DelegateCommand(ExecuteIndenterCommand);
-            _renameCommand = new DelegateCommand(ExecuteRenameCommand);
+            _indenterCommand = new DelegateCommand(ExecuteIndenterCommand, _ => CanExecuteIndenterCommand);
+            _renameCommand = new DelegateCommand(ExecuteRenameCommand, _ => CanExecuteRenameCommand);
             _findAllReferencesCommand = new DelegateCommand(ExecuteFindAllReferencesCommand);
         }
 
@@ -77,10 +80,11 @@ public CodeExplorerViewModel(VBE vbe,
         public ICommand FindAllReferencesCommand { get { return _findAllReferencesCommand; } }
 
         private readonly INavigateCommand _navigateCommand;
-        private readonly NewUnitTestModuleCommand _newUnitTestModuleCommand;
-        private readonly Indenter _indenter;
         public ICommand NavigateCommand { get { return _navigateCommand; } }
 
+        private readonly ICommand _contextMenuNavigateCommand;
+        public ICommand ContextMenuNavigateCommand { get { return _contextMenuNavigateCommand; } }
+
         public string Description
         {
             get
@@ -153,6 +157,11 @@ private bool CanAddModule(object param)
             return _vbe.ActiveVBProject != null;
         }
 
+        private bool CanExecuteContextMenuNavigateCommand(object param)
+        {
+            return SelectedItem != null && SelectedItem.QualifiedSelection.HasValue;
+        }
+
         public bool CanExecuteIndenterCommand
         {
             get
@@ -329,6 +338,15 @@ private void ExecuteFindAllReferencesCommand(object obj)
             _findAllReferences.Execute(GetSelectedDeclaration());
         }
 
+        private void ExecuteContextMenuNavigateCommand(object obj)
+        {
+            // ReSharper disable once PossibleInvalidOperationException
+            // CanExecute protects against this
+            var arg = new NavigateCodeEventArgs(SelectedItem.QualifiedSelection.Value);
+
+            NavigateCommand.Execute(arg);
+        }
+
         private Declaration GetSelectedDeclaration()
         {
             if (SelectedItem is CodeExplorerProjectViewModel)

RetailCoder.VBE/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -76,11 +76,17 @@
                         <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Rename}"
                                   Command="{Binding RenameCommand}" />
                         <Separator />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=Navigate}"
+                                  Command="{Binding ContextMenuNavigateCommand}" />
+                        <Separator />
                         <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddTestModuleText}"
                                   Command="{Binding AddTestModuleCommand}" />
-                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddStdModuleText}" Command="{Binding AddStdModuleCommand}" />
-                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddClassModuleText}" Command="{Binding AddClsModuleCommand}" />
-                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddFormText}" Command="{Binding AddFormCommand}" />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddStdModuleText}"
+                                  Command="{Binding AddStdModuleCommand}" />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddClassModuleText}"
+                                  Command="{Binding AddClsModuleCommand}" />
+                        <MenuItem Header="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=CodeExplorer_ContextMenu_AddFormText}"
+                                  Command="{Binding AddFormCommand}" />
                     </ContextMenu>
                 </Setter.Value>
             </Setter>