Fix hotkeys

Author: Hosch250

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -28,7 +29,6 @@ public class RubberduckHooks : IRubberduckHooks
         private readonly IGeneralConfigService _config;
         private readonly IEnumerable<CommandBase> _commands;
         private readonly IList<IAttachable> _hooks = new List<IAttachable>();
-        private readonly IDictionary<RubberduckHotkey, CommandBase> _mappings;
         private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
 
         public RubberduckHooks(VBE vbe, IGeneralConfigService config, IEnumerable<CommandBase> commands)
@@ -42,29 +42,11 @@ public RubberduckHooks(VBE vbe, IGeneralConfigService config, IEnumerable<Comman
 
             _commands = commands;
             _config = config;
-            _mappings = GetCommandMappings();
         }
 
-        private CommandBase Command<TCommand>() where TCommand : CommandBase
+        private CommandBase Command(RubberduckHotkey hotkey)
         {
-            return _commands.OfType<TCommand>().SingleOrDefault();
-        }
-
-        private IDictionary<RubberduckHotkey, CommandBase> GetCommandMappings()
-        {
-            return new Dictionary<RubberduckHotkey, CommandBase>
-            {
-                { RubberduckHotkey.ParseAll, Command<ReparseCommand>() },
-                { RubberduckHotkey.CodeExplorer, Command<CodeExplorerCommand>() },
-                { RubberduckHotkey.IndentModule, Command<IndentCurrentModuleCommand>() },
-                { RubberduckHotkey.IndentProcedure, Command<IndentCurrentProcedureCommand>() },
-                { RubberduckHotkey.FindSymbol, Command<FindSymbolCommand>() },
-                { RubberduckHotkey.RefactorMoveCloserToUsage, Command<RefactorMoveCloserToUsageCommand>() },
-                { RubberduckHotkey.InspectionResults, Command<InspectionResultsCommand>() },
-                { RubberduckHotkey.RefactorExtractMethod, Command<RefactorExtractMethodCommand>() },
-                { RubberduckHotkey.RefactorRename, Command<CodePaneRefactorRenameCommand>() },
-                { RubberduckHotkey.TestExplorer, Command<TestExplorerCommand>() }
-            };
+            return _commands.SingleOrDefault(s => s.Hotkey == hotkey);
         }
 
         public void HookHotkeys()
@@ -92,7 +74,10 @@ public void HookHotkeys()
                 RubberduckHotkey assigned;
                 if (Enum.TryParse(hotkey.Name, out assigned))
                 {
-                    AddHook(new Hotkey(_mainWindowHandle, hotkey.ToString(), _mappings[assigned]));
+                    var command = Command(assigned);
+                    Debug.Assert(command != null);
+
+                    AddHook(new Hotkey(_mainWindowHandle, hotkey.ToString(), command));
                 }
             }
             Attach();

RetailCoder.VBE/Settings/RubberduckHotkey.cs

@@ -2,6 +2,7 @@ namespace Rubberduck.Settings
 {
     public enum RubberduckHotkey
     {
+        None,
         ParseAll,
         IndentProcedure,
         IndentModule,

RetailCoder.VBE/UI/Command/CodeExplorerCommand.cs

@@ -16,11 +16,14 @@ public CodeExplorerCommand(IPresenter presenter)
             _presenter = presenter;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.CodeExplorer; }
+        }
+
         public override void Execute(object parameter)
         {
             _presenter.Show();
         }
-
-        public RubberduckHotkey Hotkey { get {return RubberduckHotkey.CodeExplorer; } }
     }
 }

RetailCoder.VBE/UI/Command/CommandBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Windows.Input;
+using Rubberduck.Settings;
 
 namespace Rubberduck.UI.Command
 {
@@ -15,6 +16,8 @@ public virtual bool CanExecute(object parameter)
         public abstract void Execute(object parameter);
 
         public virtual string ShortcutText { get; set; }
+        
+        public virtual RubberduckHotkey Hotkey { get { return RubberduckHotkey.None; } }
 
         public event EventHandler CanExecuteChanged
         {

RetailCoder.VBE/UI/Command/FindSymbolCommand.cs

@@ -3,6 +3,7 @@
 using Microsoft.Vbe.Interop;
 using Rubberduck.Common;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Settings;
 using Rubberduck.UI.FindSymbol;
 
 namespace Rubberduck.UI.Command
@@ -25,6 +26,11 @@ public FindSymbolCommand(VBE vbe, RubberduckParserState state, DeclarationIconCa
             _iconCache = iconCache;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.FindSymbol; }
+        }
+
         public override void Execute(object parameter)
         {
             var viewModel = new FindSymbolViewModel(_state.AllDeclarations.Where(item => !item.IsBuiltIn), _iconCache);

RetailCoder.VBE/UI/Command/IndentCurrentModuleCommand.cs

@@ -17,6 +17,11 @@ public IndentCurrentModuleCommand(VBE vbe, IIndenter indenter)
             _indenter = indenter;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.IndentModule; }
+        }
+
         public override bool CanExecute(object parameter)
         {
             return _vbe.ActiveCodePane != null;
@@ -26,7 +31,5 @@ public override void Execute(object parameter)
         {
             _indenter.IndentCurrentModule();
         }
-
-        public RubberduckHotkey Hotkey { get { return RubberduckHotkey.IndentModule; } }
     }
 }

RetailCoder.VBE/UI/Command/IndentCurrentProcedureCommand.cs

@@ -17,6 +17,11 @@ public IndentCurrentProcedureCommand(VBE vbe, IIndenter indenter)
             _indenter = indenter;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.IndentProcedure; }
+        }
+
         public override bool CanExecute(object parameter)
         {
             return _vbe.ActiveCodePane != null;
@@ -26,7 +31,5 @@ public override void Execute(object parameter)
         {
             _indenter.IndentCurrentProcedure();
         }
-
-        public RubberduckHotkey Hotkey { get {return RubberduckHotkey.IndentProcedure; } }
     }
 }

RetailCoder.VBE/UI/Command/InspectionResultsCommand.cs

@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using Rubberduck.Settings;
 
 namespace Rubberduck.UI.Command
 {
@@ -15,6 +16,11 @@ public InspectionResultsCommand(IPresenter presenter)
             _presenter = presenter;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.InspectionResults; }
+        }
+
         /// <summary>
         /// Runs code inspections 
         /// </summary>

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

@@ -4,6 +4,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
+using Rubberduck.Settings;
 using Rubberduck.UI.Refactorings;
 
 namespace Rubberduck.UI.Command.Refactorings
@@ -21,6 +22,11 @@ public CodePaneRefactorRenameCommand(VBE vbe, RubberduckParserState state, ICode
             _wrapperWrapperFactory = wrapperWrapperFactory;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.RefactorRename; }
+        }
+
         public override bool CanExecute(object parameter)
         {
             if (Vbe.ActiveCodePane == null)

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

@@ -8,6 +8,7 @@
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using NLog;
+using Rubberduck.Settings;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
@@ -25,6 +26,11 @@ public RefactorExtractMethodCommand(VBE vbe, RubberduckParserState state, IInden
             _indenter = indenter;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.RefactorExtractMethod; }
+        }
+
         public override bool CanExecute(object parameter)
         {
             if (Vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)