Merge pull request #3534 from rkapka/rkapka-master

Hotkey wiring enhancements

Author: retailcoder

RetailCoder.VBE/Common/Hotkeys/HotkeyFactory.cs

@@ -0,0 +1,30 @@
+using Rubberduck.Settings;
+using Rubberduck.UI.Command;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Rubberduck.Common.Hotkeys
+{
+    public class HotkeyFactory
+    {
+        private readonly IEnumerable<CommandBase> _commands;
+
+        public HotkeyFactory(IEnumerable<CommandBase> commands)
+        {
+            _commands = commands;
+        }
+
+        public Hotkey Create(HotkeySetting setting, IntPtr hWndVbe)
+        {
+            if (setting == null)
+            {
+                return null;
+            }
+
+            var commandToBind = _commands.FirstOrDefault(command => command.GetType().Name == setting.CommandTypeName);
+
+            return commandToBind == null ? null : new Hotkey(hWndVbe, setting.ToString(), commandToBind);
+        }
+    }
+}

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
 using Rubberduck.Common.Hotkeys;
 using Rubberduck.Settings;
-using Rubberduck.UI.Command;
 using NLog;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.WindowsApi;
@@ -15,20 +13,15 @@ namespace Rubberduck.Common
     public class RubberduckHooks : SubclassingWindow, IRubberduckHooks
     {
         private readonly IGeneralConfigService _config;
-        private readonly IEnumerable<CommandBase> _commands;
+        private readonly HotkeyFactory _hotkeyFactory;
         private readonly IList<IAttachable> _hooks = new List<IAttachable>();
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
-        public RubberduckHooks(IVBE vbe, IGeneralConfigService config, IEnumerable<CommandBase> commands)
+        public RubberduckHooks(IVBE vbe, IGeneralConfigService config, HotkeyFactory hotkeyFactory)
             : base((IntPtr)vbe.MainWindow.HWnd, (IntPtr)vbe.MainWindow.HWnd)
         {
-            _commands = commands;
             _config = config;
-        }
-
-        private CommandBase Command(RubberduckHotkey hotkey)
-        {
-            return _commands.FirstOrDefault(s => s.Hotkey == hotkey);
+            _hotkeyFactory = hotkeyFactory;
         }
 
         public void HookHotkeys()
@@ -39,16 +32,15 @@ public void HookHotkeys()
             var config = _config.LoadConfiguration();
             var settings = config.UserSettings.HotkeySettings;
 
-            foreach (var hotkey in settings.Settings.Where(hotkey => hotkey.IsEnabled))
+            foreach (var hotkeySetting in settings.Settings.Where(hotkeySetting => hotkeySetting.IsEnabled))
             {
-                if (Enum.TryParse(hotkey.Name, out RubberduckHotkey assigned))
+                var hotkey = _hotkeyFactory.Create(hotkeySetting, Hwnd);
+                if (hotkey != null)
                 {
-                    var command = Command(assigned);
-                    Debug.Assert(command != null);
-
-                    AddHook(new Hotkey(Hwnd, hotkey.ToString(), command));
+                    AddHook(hotkey);
                 }
             }
+
             Attach();
         }