hotkeys work again.. not the cleanest, but at least it's out of App class now

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -4,7 +4,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Runtime.InteropServices.ComTypes;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Windows.Input;
 using Microsoft.Vbe.Interop;
@@ -18,9 +17,6 @@
 using Rubberduck.UI.Command.MenuItems;
 using Infralution.Localization.Wpf;
 using Rubberduck.Common.Dispatch;
-using Rubberduck.Common.Hotkeys;
-using Rubberduck.UI.Command;
-using Hotkey = Rubberduck.Common.Hotkeys.Hotkey;
 
 namespace Rubberduck
 {
@@ -35,7 +31,6 @@ public class App : IDisposable
         private readonly RubberduckCommandBar _stateBar;
         private readonly IIndenter _indenter;
         private readonly IRubberduckHooks _hooks;
-        private readonly IEnumerable<ICommand> _appCommands;
 
         private readonly Logger _logger;
 
@@ -47,19 +42,13 @@ public class App : IDisposable
         private readonly IDictionary<VBComponents, Tuple<IConnectionPoint, int>>  _componentsEventsConnectionPoints = 
             new Dictionary<VBComponents, Tuple<IConnectionPoint, int>>();
 
-        private IReadOnlyDictionary<string, RubberduckHotkey> _hotkeyNameMap;
-
-        private IReadOnlyDictionary<RubberduckHotkey, ICommand> _hotkeyActions;
-        private IReadOnlyDictionary<string, ICommand> _secondKeyActions;
-
         public App(VBE vbe, IMessageBox messageBox,
             IRubberduckParser parser,
             IGeneralConfigService configService,
             IAppMenu appMenus,
             RubberduckCommandBar stateBar,
             IIndenter indenter,
-            IRubberduckHooks hooks,
-            IEnumerable<ICommand> appCommands)
+            IRubberduckHooks hooks)
         {
             _vbe = vbe;
             _messageBox = messageBox;
@@ -70,10 +59,8 @@ public App(VBE vbe, IMessageBox messageBox,
             _stateBar = stateBar;
             _indenter = indenter;
             _hooks = hooks;
-            _appCommands = appCommands;
             _logger = LogManager.GetCurrentClassLogger();
 
-            _hooks.MessageReceived += hooks_MessageReceived;
             _configService.LanguageChanged += ConfigServiceLanguageChanged;
             _parser.State.StateChanged += Parser_StateChanged;
             _stateBar.Refresh += _stateBar_Refresh;
@@ -100,11 +87,11 @@ public void Startup()
             _appMenus.Initialize();
             _appMenus.Localize();
 
-            //_hooks.AddHook(new LowLevelKeyboardHook(_vbe));
-            HookHotkeys();
+            _hooks.HookHotkeys();
             _hooks.Attach();
         }
 
+        #region sink handlers. todo: move to another class
         async void sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
         {
             Debug.WriteLine(string.Format("Project '{0}' was removed.", e.Item.Name));
@@ -239,90 +226,7 @@ async void sink_ProjectActivated(object sender, DispatcherEventArgs<VBProject> e
             Debug.WriteLine(string.Format("Project '{0}' was activated.", e.Item.Name));
             // do something?
         }
-
-        private Keys _firstStepHotKey;
-        private bool _isAwaitingTwoStepKey;
-        private bool _skipKeyUp;
-
-        private void hooks_MessageReceived(object sender, HookEventArgs e)
-        {
-            if (sender is LowLevelKeyboardHook)
-            {
-                HandleLowLevelKeyhook(e);
-                return;
-            }
-            
-            var hotKey = sender as IHotkey;
-            if (hotKey != null)
-            {
-                HandleHotkey(hotKey);
-            }
-            else
-            {
-                AwaitNextKey();
-            }
-        }
-
-        private void HandleHotkey(IHotkey hotkey)
-        {
-            if (hotkey.IsTwoStepHotkey)
-            {
-                _firstStepHotKey = hotkey.HotkeyInfo.Keys;
-                AwaitNextKey(true, hotkey.HotkeyInfo);
-            }
-            else
-            {
-                _firstStepHotKey = Keys.None;
-                _hotkeyActions[_hotkeyNameMap[hotkey.Key]].Execute(null);
-                AwaitNextKey();
-            }
-        }
-
-        private void HandleLowLevelKeyhook(HookEventArgs e)
-        {
-            if (_skipKeyUp)
-            {
-                _skipKeyUp = false;
-                return;
-            }
-
-            if (_isAwaitingTwoStepKey)
-            {
-                // todo: use _firstStepHotKey and e.Key to run 2-step hotkey action
-                if (_firstStepHotKey == Keys.I && e.Key == Keys.M)
-                {
-                    _indenter.IndentCurrentModule();
-                }
-
-                AwaitNextKey();
-                return;
-            }
-
-            var component = _vbe.ActiveCodePane.CodeModule.Parent;
-            _parser.ParseComponent(component);
-
-            AwaitNextKey();
-            return;
-        }
-
-        private void AwaitNextKey(bool eatNextKey = false, HotkeyInfo info = default(HotkeyInfo))
-        {
-            _isAwaitingTwoStepKey = eatNextKey;
-            foreach (var hook in _hooks.Hooks.OfType<ILowLevelKeyboardHook>())
-            {
-                hook.EatNextKey = eatNextKey;
-            }
-
-            _skipKeyUp = eatNextKey;
-            if (eatNextKey)
-            {
-                _stateBar.SetStatusText("(" + info + ") was pressed. Waiting for second key...");
-            }
-            else
-            {
-                _stateBar.SetStatusText(_parser.State.Status.ToString());
-            }
-        }
+        #endregion
 
         private void _stateBar_Refresh(object sender, EventArgs e)
         {
@@ -335,42 +239,9 @@ private void Parser_StateChanged(object sender, EventArgs e)
             _appMenus.EvaluateCanExecute(_parser.State);
         }
 
-        private void HookHotkeys()
-        {
-            var settings = _config.UserSettings.GeneralSettings.HotkeySettings;
-            foreach (var hotkey in settings.Where(hotkey => hotkey.IsEnabled))
-            {
-                _hooks.AddHook(new Hotkey((IntPtr)_vbe.MainWindow.HWnd, hotkey.ToString()));
-            }
-        }
-
         private void CleanReloadConfig()
         {
             LoadConfig();
-            var hotkeys = _config.UserSettings.GeneralSettings.HotkeySettings
-                .Where(hotkey => hotkey.IsEnabled).ToList();
-
-            _hotkeyNameMap = hotkeys
-                .ToDictionary(
-                    hotkey => hotkey.ToString(),
-                    hotkey => (RubberduckHotkey)Enum.Parse(typeof(RubberduckHotkey), hotkey.Name));
-
-            _hotkeyActions = (from hotkey in hotkeys
-                             let value = (RubberduckHotkey)Enum.Parse(typeof(RubberduckHotkey),hotkey.Name)
-                             where string.IsNullOrEmpty(hotkey.Key2)
-                             select new
-                             {
-                                 Hotkey = value, 
-                                 Command = _appCommands.OfType<IHotkeyCommand>()
-                                 .SingleOrDefault(command => command.Hotkey == (RubberduckHotkey)Enum.Parse(typeof(RubberduckHotkey),hotkey.Name))
-                             })
-                             .ToDictionary(kvp => kvp.Hotkey, kvp => (ICommand)kvp.Command);
-                             
-            _secondKeyActions = hotkeys
-                .Where(hotkey => !string.IsNullOrEmpty(hotkey.Key2))
-                .ToDictionary(
-                    hotkey => hotkey.Key2,
-                    hotkey => hotkey.Command);
         }
 
         private void ConfigServiceLanguageChanged(object sender, EventArgs e)
@@ -410,7 +281,6 @@ public void Dispose()
                 item.Value.Item1.Unadvise(item.Value.Item2);
             }
 
-            _hooks.MessageReceived -= hooks_MessageReceived;
             _hooks.Dispose();
         }
     }

RetailCoder.VBE/AutoSave/AutoSave.cs

@@ -20,21 +20,21 @@ public AutoSave(VBE vbe, IGeneralConfigService configService)
         {
             _vbe = vbe;
             _configService = configService;
-            _config = _configService.LoadConfiguration();
 
             _configService.SettingsChanged += ConfigServiceSettingsChanged;
 
-            _timer.Enabled = _config.UserSettings.GeneralSettings.AutoSaveEnabled 
-                && _config.UserSettings.GeneralSettings.AutoSavePeriod != 0;
+            // todo: move this out of ctor
+            //_timer.Enabled = _config.UserSettings.GeneralSettings.AutoSaveEnabled 
+            //    && _config.UserSettings.GeneralSettings.AutoSavePeriod != 0;
 
-            if (_config.UserSettings.GeneralSettings.AutoSavePeriod != 0)
-            {
-                _timer.Interval = _config.UserSettings.GeneralSettings.AutoSavePeriod * 1000;
-                _timer.Elapsed += _timer_Elapsed;
-            }
+            //if (_config.UserSettings.GeneralSettings.AutoSavePeriod != 0)
+            //{
+            //    _timer.Interval = _config.UserSettings.GeneralSettings.AutoSavePeriod * 1000;
+            //    _timer.Elapsed += _timer_Elapsed;
+            //}
         }
 
-        void ConfigServiceSettingsChanged(object sender, EventArgs e)
+        private void ConfigServiceSettingsChanged(object sender, EventArgs e)
         {
             _config = _configService.LoadConfiguration();
 

RetailCoder.VBE/Common/Hotkeys/Hotkey.cs

@@ -1,33 +1,50 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Windows.Forms;
+using System.Windows.Input;
 using Rubberduck.Common.WinAPI;
 
 namespace Rubberduck.Common.Hotkeys
 {
     public class Hotkey : IHotkey
     {
         private readonly string _key;
+        private readonly ICommand _command;
         private readonly IntPtr _hWndVbe;
 
-        public Hotkey(IntPtr hWndVbe, string key, Keys secondKey = Keys.None)
+        public Hotkey(IntPtr hWndVbe, string key, ICommand command, Keys secondKey = Keys.None)
         {
             _hWndVbe = hWndVbe;
 
             IsTwoStepHotkey = secondKey != Keys.None;
             _key = key;
+            _command = command;
             Combo = GetCombo(key);
             SecondKey = secondKey;
         }
 
+        public ICommand Command { get { return _command; } }
         public string Key { get { return _key; } }
         public HotkeyInfo HotkeyInfo { get; private set; }
         public Keys Combo { get; private set; }
         public Keys SecondKey { get; private set; }
         public bool IsTwoStepHotkey { get; private set; }
         public bool IsAttached { get; private set; }
 
+        public event EventHandler<HookEventArgs> MessageReceived;
+
+        public void OnMessageReceived()
+        {
+            var handler = MessageReceived;
+            if (handler != null)
+            {
+                var args = new HookEventArgs(HotkeyInfo.Keys);
+                handler.Invoke(this, args);
+            }
+        }
+
         public void Attach()
         {
             var hotKey = _key;
@@ -71,6 +88,7 @@ private void HookKey(Keys key, uint shift)
 
             HotkeyInfo = new HotkeyInfo(hookId, Combo);
             IsAttached = true;
+            Debug.WriteLine("Hotkey '{0}' hooked successfully to command '{1}'", Key, Command.GetType());
         }
 
         private static readonly IDictionary<char,uint> Modifiers = new Dictionary<char, uint>

RetailCoder.VBE/Common/Hotkeys/IHotkey.cs

@@ -1,10 +1,12 @@
 using System.Windows.Forms;
+using System.Windows.Input;
 
 namespace Rubberduck.Common.Hotkeys
 {
     public interface IHotkey : IAttachable
     {
         string Key { get; }
+        ICommand Command { get; }
         HotkeyInfo HotkeyInfo { get; }
         Keys Combo { get; }
         Keys SecondKey { get; }

RetailCoder.VBE/Common/IAttachable.cs

@@ -1,8 +1,11 @@
+using System;
+
 namespace Rubberduck.Common
 {
     public interface IAttachable
     {
         bool IsAttached { get; }
+        event EventHandler<HookEventArgs> MessageReceived;
 
         void Attach();
         void Detach();

RetailCoder.VBE/Common/IHook.cs

@@ -1,6 +1,6 @@
 namespace Rubberduck.Common
 {
-    public interface ILowLevelKeyboardHook : IHook
+    public interface ILowLevelKeyboardHook : IAttachable
     {
         bool EatNextKey { get; set; }
     }

RetailCoder.VBE/Common/ILowLevelKeyboardHook.cs

@@ -3,9 +3,8 @@
 
 namespace Rubberduck.Common
 {
-    public interface IRubberduckHooks : IHook, IDisposable
+    public interface IRubberduckHooks : IDisposable, IAttachable
     {
-        IEnumerable<IAttachable> Hooks { get; }
-        void AddHook(IAttachable hook);
+        void HookHotkeys();
     }
 }