Close #977

Author: Hosch250

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -117,7 +117,7 @@ private CommandBarControl InitializeChildControl(ICommandMenuItem item)
             SetButtonImage(child, item.Image, item.Mask);
 
             child.BeginGroup = item.BeginGroup;
-            child.Tag = item.Key;
+            child.Tag = item.GetType().FullName;
             child.Caption = item.Caption.Invoke();
 
             Debug.WriteLine("Menu item '{0}' created; hash code: {1} (command hash code {2})", child.Caption, child.GetHashCode(), item.Command.GetHashCode());
@@ -131,7 +131,7 @@ private CommandBarControl InitializeChildControl(ICommandMenuItem item)
 
         private void child_Click(CommandBarButton Ctrl, ref bool CancelDefault)
         {
-            var item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => menu.Key == Ctrl.Tag) as ICommandMenuItem;
+            var item = _items.Select(kvp => kvp.Key).SingleOrDefault(menu => menu.GetType().FullName == Ctrl.Tag) as ICommandMenuItem;
             if (item == null || Ctrl.GetHashCode() == _lastHashCode)
             {
                 return;

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

@@ -24,6 +24,8 @@ public CodePaneRefactorRenameCommand(VBE vbe, RubberduckParserState state, IActi
 
         public override void Execute(object parameter)
         {
+            if (Vbe.ActiveCodePane == null) { return; }
+
             using (var view = new RenameDialog())
             {
                 var factory = new RenamePresenterFactory(Vbe, view, _state, new MessageBox(), _wrapperWrapperFactory);

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

@@ -48,21 +48,16 @@ private Declaration GetTarget()
                             d.DeclarationType == DeclarationType.Project && d.IdentifierName == Vbe.ActiveVBProject.Name);
             }
 
-            if (Vbe.ActiveCodePane == null || Vbe.ActiveCodePane.CodeModule != Vbe.SelectedVBComponent.CodeModule)
-            {
-                return _state.AllUserDeclarations.SingleOrDefault(
-                        t => t.IdentifierName == Vbe.SelectedVBComponent.Name &&
-                             t.Project == Vbe.ActiveVBProject &&
-                             new[]
-                                 {
-                                     DeclarationType.Class,
-                                     DeclarationType.Document,
-                                     DeclarationType.Module,
-                                     DeclarationType.UserForm
-                                 }.Contains(t.DeclarationType));
-            }
-
-            return null;
+            return _state.AllUserDeclarations.SingleOrDefault(
+                    t => t.IdentifierName == Vbe.SelectedVBComponent.Name &&
+                            t.Project == Vbe.ActiveVBProject &&
+                            new[]
+                                {
+                                    DeclarationType.Class,
+                                    DeclarationType.Document,
+                                    DeclarationType.Module,
+                                    DeclarationType.UserForm
+                                }.Contains(t.DeclarationType));
         }
     }
 }