Fix hotkeys

Hosch250 · Hosch250 · commit bb48e3de55cb · 2016-06-28T15:22:59.000-05:00
diff --git a/RetailCoder.VBE/Common/RubberduckHooks.cs b/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();
diff --git a/RetailCoder.VBE/Settings/RubberduckHotkey.cs b/RetailCoder.VBE/Settings/RubberduckHotkey.cs
@@ -2,6 +2,7 @@ namespace Rubberduck.Settings
 {
     public enum RubberduckHotkey
     {
+        None,
         ParseAll,
         IndentProcedure,
         IndentModule,
diff --git a/RetailCoder.VBE/UI/Command/CodeExplorerCommand.cs b/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; } }
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/CommandBase.cs b/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
         {
diff --git a/RetailCoder.VBE/UI/Command/FindSymbolCommand.cs b/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);
diff --git a/RetailCoder.VBE/UI/Command/IndentCurrentModuleCommand.cs b/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; } }
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/IndentCurrentProcedureCommand.cs b/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; } }
     }
 }
diff --git a/RetailCoder.VBE/UI/Command/InspectionResultsCommand.cs b/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>
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs b/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)
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorExtractMethodCommand.cs b/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)
diff --git a/RetailCoder.VBE/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs b/RetailCoder.VBE/UI/Command/Refactorings/RefactorMoveCloserToUsageCommand.cs
@@ -3,6 +3,7 @@
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.MoveCloserToUsage;
+using Rubberduck.Settings;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 
@@ -20,6 +21,11 @@ public RefactorMoveCloserToUsageCommand(VBE vbe, RubberduckParserState state, IC
             _wrapperWrapperFactory = wrapperWrapperFactory;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.RefactorMoveCloserToUsage; }
+        }
+
         public override bool CanExecute(object parameter)
         {
             if (Vbe.ActiveCodePane == null || _state.Status != ParserState.Ready)
diff --git a/RetailCoder.VBE/UI/Command/ReparseCommand.cs b/RetailCoder.VBE/UI/Command/ReparseCommand.cs
@@ -1,6 +1,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Input;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Settings;
 using Rubberduck.UI.Command.MenuItems;
 
 namespace Rubberduck.UI.Command
@@ -28,6 +29,11 @@ public ReparseCommand(RubberduckParserState state)
             _state = state;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.ParseAll; }
+        }
+
         public override bool CanExecute(object parameter)
         {
             return _state.Status == ParserState.Pending
diff --git a/RetailCoder.VBE/UI/Command/TestExplorerCommand.cs b/RetailCoder.VBE/UI/Command/TestExplorerCommand.cs
@@ -13,11 +13,14 @@ public TestExplorerCommand(IPresenter presenter)
             _presenter = presenter;
         }
 
+        public override RubberduckHotkey Hotkey
+        {
+            get { return RubberduckHotkey.TestExplorer; }
+        }
+
         public override void Execute(object parameter)
         {
             _presenter.Show();
         }
-
-        public RubberduckHotkey Hotkey { get {return RubberduckHotkey.TestExplorer; } }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ namespace Rubberduck.Settings`
`2`	`2`	`{`
`3`	`3`	`public enum RubberduckHotkey`
`4`	`4`	`{`
	`5`	`+ None,`
`5`	`6`	`ParseAll,`
`6`	`7`	`IndentProcedure,`
`7`	`8`	`IndentModule,`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,14 @@ public CodeExplorerCommand(IPresenter presenter)`
`16`	`16`	`_presenter = presenter;`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ public override RubberduckHotkey Hotkey`
	`20`	`+ {`
	`21`	`+ get { return RubberduckHotkey.CodeExplorer; }`
	`22`	`+ }`
	`23`	`+`
`19`	`24`	`public override void Execute(object parameter)`
`20`	`25`	`{`
`21`	`26`	`_presenter.Show();`
`22`	`27`	`}`
`23`		`-`
`24`		`- public RubberduckHotkey Hotkey { get {return RubberduckHotkey.CodeExplorer; } }`
`25`	`28`	`}`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Runtime.InteropServices;`
`3`	`3`	`using System.Windows.Input;`
	`4`	`+using Rubberduck.Settings;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.UI.Command`
`6`	`7`	`{`
`@@ -15,6 +16,8 @@ public virtual bool CanExecute(object parameter)`
`15`	`16`	`public abstract void Execute(object parameter);`
`16`	`17`
`17`	`18`	`public virtual string ShortcutText { get; set; }`
	`19`	`+`
	`20`	`+ public virtual RubberduckHotkey Hotkey { get { return RubberduckHotkey.None; } }`
`18`	`21`
`19`	`22`	`public event EventHandler CanExecuteChanged`
`20`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,11 @@ public IndentCurrentModuleCommand(VBE vbe, IIndenter indenter)`
`17`	`17`	`_indenter = indenter;`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ public override RubberduckHotkey Hotkey`
	`21`	`+ {`
	`22`	`+ get { return RubberduckHotkey.IndentModule; }`
	`23`	`+ }`
	`24`	`+`
`20`	`25`	`public override bool CanExecute(object parameter)`
`21`	`26`	`{`
`22`	`27`	`return _vbe.ActiveCodePane != null;`
`@@ -26,7 +31,5 @@ public override void Execute(object parameter)`
`26`	`31`	`{`
`27`	`32`	`_indenter.IndentCurrentModule();`
`28`	`33`	`}`
`29`		`-`
`30`		`- public RubberduckHotkey Hotkey { get { return RubberduckHotkey.IndentModule; } }`
`31`	`34`	`}`
`32`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using Rubberduck.VBEditor;`
`9`	`9`	`using System.Collections.Generic;`
`10`	`10`	`using NLog;`
	`11`	`+using Rubberduck.Settings;`
`11`	`12`
`12`	`13`	`namespace Rubberduck.UI.Command.Refactorings`
`13`	`14`	`{`
`@@ -25,6 +26,11 @@ public RefactorExtractMethodCommand(VBE vbe, RubberduckParserState state, IInden`
`25`	`26`	`_indenter = indenter;`
`26`	`27`	`}`
`27`	`28`
	`29`	`+ public override RubberduckHotkey Hotkey`
	`30`	`+ {`
	`31`	`+ get { return RubberduckHotkey.RefactorExtractMethod; }`
	`32`	`+ }`
	`33`	`+`
`28`	`34`	`public override bool CanExecute(object parameter)`
`29`	`35`	`{`
`30`	`36`	`if (Vbe.ActiveCodePane == null \|\| _state.Status != ParserState.Ready)`