Merge pull request #1321 from retailcoder/next

mousehook and current selection fixes ...still not perfect though

Author: retailcoder

RetailCoder.VBE/App.cs

@@ -142,9 +142,10 @@ public void Startup()
                 UiDispatcher.Invoke(() =>
                 {
                     _parser.State.OnParseRequested(this);
-                    _hooks.HookHotkeys();
                 });
             }, new StaTaskScheduler()).ConfigureAwait(false);
+
+            _hooks.HookHotkeys();
         }
 
         #region sink handlers. todo: move to another class

RetailCoder.VBE/UI/Command/FindAllImplementationsCommand.cs

@@ -115,7 +115,7 @@ private Declaration FindTarget(object parameter)
                 return declaration;
             }
 
-            return _state.FindSelecteDeclaration(_vbe.ActiveCodePane);
+            return _state.FindSelectedDeclaration(_vbe.ActiveCodePane);
         }
 
         private IEnumerable<Declaration> FindImplementations(Declaration target)

RetailCoder.VBE/UI/Command/FindAllReferencesCommand.cs

@@ -110,7 +110,7 @@ private Declaration FindTarget(object parameter)
                 return declaration;
             }
 
-            return _state.FindSelecteDeclaration(_vbe.ActiveCodePane);
+            return _state.FindSelectedDeclaration(_vbe.ActiveCodePane);
         }
     }
 }

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

@@ -32,7 +32,7 @@ public override bool CanExecute(object parameter)
                 return false;
             }
 
-            var target = _state.FindSelecteDeclaration(Vbe.ActiveCodePane);
+            var target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane);
             return _state.Status == ParserState.Ready && target != null;
         }
 

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

@@ -28,7 +28,7 @@ public override bool CanExecute(object parameter)
                 return false;
             }
 
-            var target = _state.FindSelecteDeclaration(pane);
+            var target = _state.FindSelectedDeclaration(pane);
 
             var canExecute = target != null 
                 && target.DeclarationType == DeclarationType.Variable

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

@@ -29,7 +29,7 @@ public override bool CanExecute(object parameter)
                 return false;
             }
 
-            //var target = _state.FindSelecteDeclaration(Vbe.ActiveCodePane); // nope. logic is a bit more complex here.
+            //var target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane); // nope. logic is a bit more complex here.
 
             var selection = Vbe.ActiveCodePane.GetSelection();
             var targetInterface = _state.AllUserDeclarations.FindInterface(selection);

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

@@ -29,7 +29,7 @@ public override bool CanExecute(object parameter)
                 return false;
             }
 
-            var target = _state.FindSelecteDeclaration(Vbe.ActiveCodePane);
+            var target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane);
             var canExecute = target != null 
                 && (target.DeclarationType == DeclarationType.Variable || target.DeclarationType == DeclarationType.Constant)
                 && target.References.Any();

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -474,7 +474,7 @@ public bool IsModified(QualifiedModuleName key)
         private QualifiedSelection _lastSelection;
         private Declaration _selectedDeclaration;
 
-        public Declaration FindSelecteDeclaration(CodePane activeCodePane)
+        public Declaration FindSelectedDeclaration(CodePane activeCodePane)
         {
             var selection = activeCodePane.GetSelection();
             if (selection.Equals(_lastSelection))
@@ -493,6 +493,12 @@ public Declaration FindSelecteDeclaration(CodePane activeCodePane)
                         (IsSelectedDeclaration(selection, item) ||
                         item.References.Any(reference => IsSelectedReference(selection, reference))));
             }
+
+            if (_selectedDeclaration != null)
+            {
+                Debug.WriteLine("Current selection ({0}) is '{1}' ({2})", selection, _selectedDeclaration.IdentifierName, _selectedDeclaration.DeclarationType);
+            }
+
             return _selectedDeclaration;
         }
 

Rubberduck.SmartIndenter/Indenter.cs

@@ -55,7 +55,7 @@ public void IndentCurrentProcedure()
 
             if (string.IsNullOrEmpty(procName))
             {
-                procName = null;
+                return;
             }
 
             var startLine = pane.CodeModule.get_ProcStartLine(procName, procKind);