added current selection label to RubberduckCommandBar

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -104,6 +104,7 @@ private void _hooks_MessageReceived(object sender, HookEventArgs e)
 
         private void HandleMouseMessage()
         {
+            _stateBar.SetSelectionText(_parser.State.FindSelectedDeclaration(_vbe.ActiveCodePane));
             _appMenus.EvaluateCanExecute(_parser.State);
         }
 

RetailCoder.VBE/Common/MouseHook.cs

@@ -41,7 +41,7 @@ private IntPtr HookCallback(int nCode, IntPtr wParam, IntPtr lParam)
                 Debug.WriteLine(exception);
             }
 
-            return IntPtr.Zero;
+            return User32.CallNextHookEx(_hookId, nCode, wParam, lParam);
         }
 
         private void OnMessageReceived()
@@ -85,12 +85,14 @@ public void Detach()
                 return;
             }
 
+            IsAttached = false;
             if (!User32.UnhookWindowsHookEx(_hookId))
             {
+                _hookId = IntPtr.Zero;
                 throw new Win32Exception();
             }
 
-            IsAttached = false;
+            _hookId = IntPtr.Zero;
             Debug.WriteLine("{0}: {1}", GetType().Name, IsAttached ? "Attached" : "Detached");
         }
     }

RetailCoder.VBE/Common/RubberduckHooks.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -91,7 +92,7 @@ public void Attach()
 
                 IsAttached = true;
             }
-            catch (Exception exception)
+            catch (Win32Exception exception)
             {
                 Debug.WriteLine(exception);
             }
@@ -111,13 +112,12 @@ public void Detach()
                     hook.Detach();
                     hook.MessageReceived -= hook_MessageReceived;
                 }
-
-                IsAttached = false;
             }
-            catch (Exception exception)
+            catch (Win32Exception exception)
             {
                 Debug.WriteLine(exception);
             }
+            IsAttached = false;
         }
 
         private void hook_MessageReceived(object sender, HookEventArgs e)
@@ -166,9 +166,9 @@ private IntPtr WindowProc(IntPtr hWnd, uint uMsg, IntPtr wParam, IntPtr lParam)
                             suppress = HandleHotkeyMessage(wParam);
                             break;
 
-                        //case WM.ACTIVATEAPP:
-                        //    HandleActivateAppMessage(wParam);
-                        //    break;
+                        case WM.ACTIVATEAPP:
+                            HandleActivateAppMessage(wParam);
+                            break;
                     }
                 }
 

RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs

@@ -2,9 +2,13 @@
 using System.Diagnostics;
 using Microsoft.Office.Core;
 using Microsoft.Vbe.Interop;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Properties;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
+using Rubberduck.VBEditor;
+using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
+using ParserState = Rubberduck.Parsing.VBA.ParserState;
 
 namespace Rubberduck.UI.Command.MenuItems
 {
@@ -16,6 +20,7 @@ public class RubberduckCommandBar
 
         private CommandBarButton _refreshButton;
         private CommandBarButton _statusButton;
+        private CommandBarButton _selectionButton;
 
         public RubberduckCommandBar(RubberduckParserState state, VBE vbe, IShowParserErrorsCommand command)
         {
@@ -36,13 +41,38 @@ private void _statusButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
 
         public void SetStatusText(string value = null)
         {
-            _statusButton.Caption = value ?? RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status);
+            UiDispatcher.Invoke(() => _statusButton.Caption = value ?? RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
+        }
+
+        public void SetSelectionText(Declaration declaration)
+        {
+            UiDispatcher.Invoke(() =>
+            {
+                if (declaration == null && _vbe.ActiveCodePane != null)
+                {
+                    var selection = _vbe.ActiveCodePane.GetSelection();
+                    SetSelectionText(selection);
+                }
+                else if (declaration != null)
+                {
+                    _selectionButton.Caption = string.Format("{0} ({1}): {2} ({3})", 
+                        declaration.QualifiedName.QualifiedModuleName,
+                        declaration.QualifiedSelection.Selection,
+                        declaration.IdentifierName,
+                        RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType));
+                }
+            });
+        }
+
+        private void SetSelectionText(QualifiedSelection selection)
+        {
+            UiDispatcher.Invoke(() => _selectionButton.Caption = selection.ToString());
         }
 
         private void State_StateChanged(object sender, EventArgs e)
         {
             Debug.WriteLine("RubberduckCommandBar handles StateChanged...");
-            UiDispatcher.Invoke(() => SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status)));
+            SetStatusText(RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
         }
 
         public event EventHandler Refresh;
@@ -72,6 +102,11 @@ public void Initialize()
             _statusButton.Tag = "Status";
             _statusButton.Click += _statusButton_Click;
 
+            _selectionButton = (CommandBarButton)commandbar.Controls.Add(MsoControlType.msoControlButton);
+            _selectionButton.Style = MsoButtonStyle.msoButtonCaption;
+            _selectionButton.BeginGroup = true;
+            _selectionButton.Enabled = false;
+
             commandbar.Visible = true;
         }
 

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -487,11 +487,19 @@ public Declaration FindSelectedDeclaration(CodePane activeCodePane)
 
             if (!selection.Equals(default(QualifiedSelection)))
             {
-                _selectedDeclaration = AllDeclarations
-                    .SingleOrDefault(item => item.DeclarationType != DeclarationType.Project &&
-                        item.DeclarationType != DeclarationType.ModuleOption &&
-                        (IsSelectedDeclaration(selection, item) ||
-                        item.References.Any(reference => IsSelectedReference(selection, reference))));
+                var matches = AllDeclarations
+                    .Where(item => item.DeclarationType != DeclarationType.Project &&
+                                   item.DeclarationType != DeclarationType.ModuleOption &&
+                                   (IsSelectedDeclaration(selection, item) ||
+                                    item.References.Any(reference => IsSelectedReference(selection, reference))));
+                try
+                {
+                    _selectedDeclaration = matches.SingleOrDefault();
+                }
+                catch (InvalidOperationException exception)
+                {
+                    Debug.WriteLine(exception);
+                }
             }
 
             if (_selectedDeclaration != null)

RubberduckTests/Inspections/ImplicitPublicMemberInspectionTests.cs

@@ -16,9 +16,10 @@ public class ImplicitPublicMemberInspectionTests
         [TestMethod]
         public void ImplicitPublicMember_ReturnsResult_Sub()
         {
-            const string inputCode =
-@"Sub Foo()
-End Sub";
+            const string inputCode = @"
+Sub Foo()
+End Sub
+";
 
             //Arrange
             var builder = new MockVbeBuilder();