Merge branch 'next' into next

Author: retailcoder

README.md

@@ -95,12 +95,6 @@ This library makes localizing WPF applications at runtime using resx files a bre
 
 > Licensed under [The Code Project Open License](http://www.codeproject.com/info/cpol10.aspx) with the [author's permission](http://www.codeproject.com/Messages/5272045/Re-License.aspx) to re-release under the GPLv3.
 
-###[Using Raw Input from C# to handle multiple keyboards](http://www.codeproject.com/Articles/17123/Using-Raw-Input-from-C-to-handle-multiple-keyboard)
-
-A library using the Raw Input API for reacting to low level keyboard/mouse events.
-
-> Licensed under [The Code Project Open License](http://www.codeproject.com/info/cpol10.aspx).
-
 ##Icons
 
 We didn't come up with these icons ourselves! Here's who did what:

RetailCoder.VBE/App.cs

@@ -3,28 +3,23 @@
 using Infralution.Localization.Wpf;
 using NLog;
 using Rubberduck.Common;
-using Rubberduck.Parsing;
-using Rubberduck.Parsing.Symbols;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
 using Rubberduck.UI;
 using Rubberduck.UI.Command.MenuItems;
 using System;
 using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.MenuItems.CommandBars;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VersionCheck;
+using Application = System.Windows.Forms.Application;
 
 namespace Rubberduck
 {
     public sealed class App : IDisposable
     {
-        private readonly IVBE _vbe;
         private readonly IMessageBox _messageBox;
-        private readonly IParseCoordinator _parser;
         private readonly AutoSave.AutoSave _autoSave;
         private readonly IGeneralConfigService _configService;
         private readonly IAppMenu _appMenus;
@@ -39,85 +34,27 @@ public sealed class App : IDisposable
 
         public App(IVBE vbe, 
             IMessageBox messageBox,
-            IParseCoordinator parser,
             IGeneralConfigService configService,
             IAppMenu appMenus,
             RubberduckCommandBar stateBar,
             IRubberduckHooks hooks,
             IVersionCheck version,
             CommandBase checkVersionCommand)
         {
-            _vbe = vbe;
             _messageBox = messageBox;
-            _parser = parser;
             _configService = configService;
-            _autoSave = new AutoSave.AutoSave(_vbe, _configService);
+            _autoSave = new AutoSave.AutoSave(vbe, _configService);
             _appMenus = appMenus;
             _stateBar = stateBar;
             _hooks = hooks;
             _version = version;
             _checkVersionCommand = checkVersionCommand;
 
-            _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
-            _parser.State.StateChanged += Parser_StateChanged;
-            _parser.State.StatusMessageUpdate += State_StatusMessageUpdate;
-
+            
             UiDispatcher.Initialize();
         }
 
-        private void State_StatusMessageUpdate(object sender, RubberduckStatusMessageEventArgs e)
-        {
-            var message = e.Message;
-            if (message == ParserState.LoadingReference.ToString())
-            {
-                // note: ugly hack to enable Rubberduck.Parsing assembly to do this
-                message = RubberduckUI.ParserState_LoadingReference;
-            }
-
-            _stateBar.SetStatusLabelCaption(message, _parser.State.ModuleExceptions.Count);
-        }
-
-        private void _hooks_MessageReceived(object sender, HookEventArgs e)
-        {
-            RefreshSelection();
-        }
-
-        private ParserState _lastStatus;
-        private Declaration _lastSelectedDeclaration;
-
-        private void RefreshSelection()
-        {
-            var pane = _vbe.ActiveCodePane;
-            {
-                Declaration selectedDeclaration = null;
-                if (!pane.IsWrappingNullReference)
-                {
-                    selectedDeclaration = _parser.State.FindSelectedDeclaration(pane);
-                    var refCount = selectedDeclaration == null ? 0 : selectedDeclaration.References.Count();
-                    var caption = _stateBar.GetContextSelectionCaption(_vbe.ActiveCodePane, selectedDeclaration);
-                    _stateBar.SetContextSelectionCaption(caption, refCount);
-                }
-
-                var currentStatus = _parser.State.Status;
-                if (ShouldEvaluateCanExecute(selectedDeclaration, currentStatus))
-                {
-                    _appMenus.EvaluateCanExecute(_parser.State);
-                    _stateBar.EvaluateCanExecute(_parser.State);
-                }
-
-                _lastStatus = currentStatus;
-                _lastSelectedDeclaration = selectedDeclaration;
-            }
-        }
-
-        private bool ShouldEvaluateCanExecute(Declaration selectedDeclaration, ParserState currentStatus)
-        {
-            return _lastStatus != currentStatus ||
-                   (selectedDeclaration != null && !selectedDeclaration.Equals(_lastSelectedDeclaration)) ||
-                   (selectedDeclaration == null && _lastSelectedDeclaration != null);
-        }
-
         private void _configService_SettingsChanged(object sender, ConfigurationChangedEventArgs e)
         {
             _config = _configService.LoadConfiguration();
@@ -163,8 +100,7 @@ public void Startup()
             _stateBar.Initialize();
             _hooks.HookHotkeys(); // need to hook hotkeys before we localize menus, to correctly display ShortcutTexts
             _appMenus.Localize();
-            _stateBar.SetStatusLabelCaption(ParserState.Pending);
-            _stateBar.EvaluateCanExecute(_parser.State);
+
             UpdateLoggingLevel();
 
             if (_config.UserSettings.GeneralSettings.CheckVersion)
@@ -185,14 +121,6 @@ public void Shutdown()
             }
         }
 
-        private void Parser_StateChanged(object sender, EventArgs e)
-        {
-            Logger.Debug("App handles StateChanged ({0}), evaluating menu states...", _parser.State.Status);
-            _appMenus.EvaluateCanExecute(_parser.State);
-            _stateBar.EvaluateCanExecute(_parser.State);
-            _stateBar.SetStatusLabelCaption(_parser.State.Status, _parser.State.ModuleExceptions.Count);
-        }
-
         private void LoadConfig()
         {
             _config = _configService.LoadConfiguration();
@@ -263,17 +191,6 @@ public void Dispose()
                 return;
             }
 
-            if (_parser != null && _parser.State != null)
-            {
-                _parser.State.StateChanged -= Parser_StateChanged;
-                _parser.State.StatusMessageUpdate -= State_StatusMessageUpdate;
-            }
-
-            if (_hooks != null)
-            {
-                _hooks.MessageReceived -= _hooks_MessageReceived;
-            }
-
             if (_configService != null)
             {
                 _configService.SettingsChanged -= _configService_SettingsChanged;

RetailCoder.VBE/AppMenu.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.UI;
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
@@ -10,10 +12,17 @@ namespace Rubberduck
     public class AppMenu : IAppMenu, IDisposable
     {
         private readonly IReadOnlyList<IParentMenuItem> _menus;
+        private readonly IParseCoordinator _parser;
+        private readonly ISelectionChangeService _selectionService;
 
-        public AppMenu(IEnumerable<IParentMenuItem> menus)
+        public AppMenu(IEnumerable<IParentMenuItem> menus, IParseCoordinator parser, ISelectionChangeService selectionService)
         {
             _menus = menus.ToList();
+            _parser = parser;
+            _selectionService = selectionService;
+
+            _parser.State.StateChanged += OnParserStateChanged;
+            _selectionService.SelectedDeclarationChanged += OnSelectedDeclarationChange;
         }
 
         public void Initialize()
@@ -24,6 +33,16 @@ public void Initialize()
             }
         }
 
+        public void OnSelectedDeclarationChange(object sender, DeclarationChangedEventArgs e)
+        {
+            EvaluateCanExecute(_parser.State);
+        }
+
+        private void OnParserStateChanged(object sender, EventArgs e)
+        {            
+            EvaluateCanExecute(_parser.State);
+        }
+
         public void EvaluateCanExecute(RubberduckParserState state)
         {
             foreach (var menu in _menus)
@@ -42,6 +61,9 @@ public void Localize()
 
         public void Dispose()
         {
+            _parser.State.StateChanged -= OnParserStateChanged;
+            _selectionService.SelectedDeclarationChanged -= OnSelectedDeclarationChange;
+
             // note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
             //foreach (var menu in _menus.Where(menu => menu.Item != null))
             //{