Merge pull request #1358 from retailcoder/next

last-minute changes

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -44,8 +44,6 @@ public class App : IDisposable
         private readonly IDictionary<VBProjectsEventsSink, Tuple<IConnectionPoint, int>> _referencesEventsConnectionPoints =
             new Dictionary<VBProjectsEventsSink, Tuple<IConnectionPoint, int>>();
 
-        private readonly IDictionary<Type, Action> _hookActions;
-
         public App(VBE vbe, IMessageBox messageBox,
             IRubberduckParser parser,
             IGeneralConfigService configService,
@@ -84,13 +82,6 @@ public App(VBE vbe, IMessageBox messageBox,
 
             _projectsEventsConnectionPoint.Advise(sink, out _projectsEventsCookie);
 
-            _hookActions = new Dictionary<Type, Action>
-            {
-                { typeof(MouseHook), HandleMouseMessage },
-                { typeof(KeyboardHook), HandleKeyboardMessage },
-            };
-            
-            
             UiDispatcher.Initialize();
         }
 
@@ -107,29 +98,22 @@ private void State_StatusMessageUpdate(object sender, RubberduckStatusMessageEve
         }
 
         private void _hooks_MessageReceived(object sender, HookEventArgs e)
-        {
-            var hookType = sender.GetType();
-            Action action;
-            if (_hookActions.TryGetValue(hookType, out action))
-            {
-                action.Invoke();
-            }
-        }
-
-        private void HandleMouseMessage()
-        {
-            RefreshSelection();
-        }
-
-        private void HandleKeyboardMessage()
         {
             RefreshSelection();
         }
 
+        private ParserState _lastStatus;
         private void RefreshSelection()
         {
             _stateBar.SetSelectionText(_parser.State.FindSelectedDeclaration(_vbe.ActiveCodePane));
-            _appMenus.EvaluateCanExecute(_parser.State);
+
+            var currentStatus = _parser.State.Status;
+            if (_lastStatus != currentStatus)
+            {
+                _appMenus.EvaluateCanExecute(_parser.State);
+            }
+
+            _lastStatus = currentStatus;
         }
 
         private void _configService_SettingsChanged(object sender, EventArgs e)

RetailCoder.VBE/Common/DeclarationExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -449,12 +450,16 @@ public static Declaration FindTarget(this IEnumerable<Declaration> declarations,
                 foreach (var reference in declaration.References)
                 {
                     var proc = (dynamic)reference.Context.Parent;
-                    VBAParser.ArgsCallContext paramList;
+                    var paramList = proc ;
 
                     // This is to prevent throws when this statement fails:
                     // (VBAParser.ArgsCallContext)proc.argsCall();
-                    try { paramList = (VBAParser.ArgsCallContext)proc.argsCall(); }
-                    catch { continue; }
+                    var method = ((Type) proc.GetType()).GetMethod("argsCall");
+                    if (method != null)
+                    {
+                        try { paramList = method.Invoke(proc, null); }
+                        catch { continue; }
+                    }
 
                     if (paramList == null) { continue; }
 

RetailCoder.VBE/Inspections/UntypedFunctionUsageInspection.cs

@@ -44,7 +44,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
         {
             var declarations = BuiltInDeclarations
                     // note: these *should* be functions, but somehow they're not defined as such
-                .Where(item => _tokens.Any(token => item.References.Any() && (item.IdentifierName == token || item.IdentifierName == "_B_var_" + token)));
+                .Where(item => _tokens.Any(token => (item.IdentifierName == token || item.IdentifierName == "_B_var_" + token)) && item.References.Any());
 
             return declarations.SelectMany(declaration => declaration.References
                 .Select(item => new UntypedFunctionUsageInspectionResult(this, string.Format(Description, declaration.IdentifierName), item.QualifiedModuleName, item.Context)));

RetailCoder.VBE/Inspections/VariableTypeNotDeclaredInspection.cs

@@ -21,7 +21,7 @@ public override IEnumerable<InspectionResultBase> GetInspectionResults()
             var issues = from item in UserDeclarations
                          where (item.DeclarationType == DeclarationType.Variable
                             || item.DeclarationType == DeclarationType.Constant
-                            || item.DeclarationType == DeclarationType.Parameter)
+                            || (item.DeclarationType == DeclarationType.Parameter && !item.IsArray()))
                          && !item.IsTypeSpecified()
                          select new VariableTypeNotDeclaredInspectionResult(this, item);
 

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

@@ -41,6 +41,7 @@ private void _statusButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
 
         public void SetStatusText(string value = null)
         {
+            Debug.WriteLine(string.Format("RubberduckCommandBar status text changes to '{0}'.", value));
             UiDispatcher.Invoke(() => _statusButton.Caption = value ?? RubberduckUI.ResourceManager.GetString("ParserState_" + _state.Status));
         }
 
@@ -50,6 +51,7 @@ public void SetSelectionText(Declaration declaration)
             {
                 var selection = _vbe.ActiveCodePane.GetSelection();
                 SetSelectionText(selection);
+                _selectionButton.TooltipText = _selectionButton.Caption;
             }
             else if (declaration != null && !declaration.IsBuiltIn && declaration.DeclarationType != DeclarationType.Class && declaration.DeclarationType != DeclarationType.Module)
             {
@@ -58,6 +60,9 @@ public void SetSelectionText(Declaration declaration)
                     declaration.QualifiedSelection.Selection,
                     declaration.IdentifierName,
                     RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType));
+                _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
+                    ? _selectionButton.Caption
+                    : declaration.DescriptionString;
             }
             else if (declaration != null)
             {
@@ -67,6 +72,9 @@ public void SetSelectionText(Declaration declaration)
                     declaration.IdentifierName,
                     RubberduckUI.ResourceManager.GetString("DeclarationType_" + declaration.DeclarationType),
                     selection.Selection);
+                _selectionButton.TooltipText = string.IsNullOrEmpty(declaration.DescriptionString)
+                    ? _selectionButton.Caption
+                    : declaration.DescriptionString;
             }
         }
 

RetailCoder.VBE/UI/Command/Refactorings/FormDesignerRefactorRenameCommand.cs

@@ -59,9 +59,10 @@ private Declaration GetTarget()
                     }
 
                     return _state.AllUserDeclarations
-                        .FirstOrDefault(item => item.IdentifierName == control.Name &&
-                                                item.ComponentName == Vbe.SelectedVBComponent.Name &&
-                                                Vbe.ActiveVBProject.HelpFile == item.ProjectId);
+                        .FirstOrDefault(item => item.DeclarationType == DeclarationType.Control
+                            && Vbe.ActiveVBProject.HelpFile == item.ProjectId
+                            && item.ComponentName == Vbe.SelectedVBComponent.Name
+                            && item.IdentifierName == control.Name);
                 }
             }