Merge pull request #3403 from mansellan/3389

UserForm designer rename command improvements.

Author: retailcoder

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

@@ -15,7 +15,7 @@ public FormDesignerRefactorRenameCommandMenuItem(CommandBase command)
 
         public override bool EvaluateCanExecute(RubberduckParserState state)
         {
-            return state != null && state.Status == ParserState.Ready;
+            return state.Status == ParserState.Ready && Command.CanExecute(null);
         }
     }
 }

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

@@ -1,32 +1,31 @@
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
+using Rubberduck.Parsing.Grammar;
 using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.UI.Refactorings.Rename;
+using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command.Refactorings
 {
     [ComVisible(false)]
     public class FormDesignerRefactorRenameCommand : RefactorCommandBase
     {
-        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
 
         public FormDesignerRefactorRenameCommand(IVBE vbe, RubberduckParserState state, IMessageBox messageBox) 
             : base (vbe)
         {
-            _vbe = vbe;
             _state = state;
             _messageBox = messageBox;
         }
 
         protected override bool EvaluateCanExecute(object parameter)
         {
-            return _state.Status == ParserState.Ready;
+            return _state.Status == ParserState.Ready && GetTarget() != null;
         }
 
         protected override void OnExecute(object parameter)
@@ -45,35 +44,37 @@ protected override void OnExecute(object parameter)
             }
         }
 
-        private Declaration GetTarget()
+        private Declaration GetTarget(QualifiedModuleName? qualifiedModuleName = null)
         {
-            var project = _vbe.ActiveVBProject;
-            var component = _vbe.SelectedVBComponent;
+            (var projectId, var component) = qualifiedModuleName.HasValue 
+                ? (qualifiedModuleName.Value.ProjectId, qualifiedModuleName.Value.Component)
+                : (Vbe.ActiveVBProject.ProjectId, Vbe.SelectedVBComponent);
+                        
+            if (component?.HasDesigner ?? false)
             {
-                if (Vbe.SelectedVBComponent != null && Vbe.SelectedVBComponent.HasDesigner)
+                if (qualifiedModuleName.HasValue)
                 {
-                    var designer = ((dynamic)component.Target).Designer;
-
-                    if (designer.selected.count == 1)
-                    {
-                        var control = designer.selected.item(0);
-                        var result = _state.AllUserDeclarations
-                            .FirstOrDefault(item => item.DeclarationType == DeclarationType.Control
-                                                    && project.HelpFile == item.ProjectId
-                                                    && item.ComponentName == component.Name
-                                                    && item.IdentifierName == control.Name);
-
-                        Marshal.ReleaseComObject(control);
-                        Marshal.ReleaseComObject(designer);
-                        return result;
-                    } else {
-                        var message = string.Format(RubberduckUI.RenameDialog_AmbiguousSelection);
-                        _messageBox.Show(message, RubberduckUI.RenameDialog_Caption, MessageBoxButtons.OK,
-                            MessageBoxIcon.Exclamation);
-                    }
+                    return _state.DeclarationFinder
+                        .MatchName(qualifiedModuleName.Value.Name)
+                        .SingleOrDefault(m => m.ProjectId == projectId
+                            && m.DeclarationType.HasFlag(qualifiedModuleName.Value.ComponentType)
+                            && m.ComponentName == component.Name);
                 }
-            }
-
+                
+                var selectedCount = component.SelectedControls.Count;
+                if (selectedCount > 1) { return null; }
+                
+                // Cannot use DeclarationType.UserForm, parser only assigns UserForms the ClassModule flag
+                (var selectedType, var selectedName) = selectedCount == 0
+                    ? (DeclarationType.ClassModule, component.Name)
+                    : (DeclarationType.Control, component.SelectedControls[0].Name);
+                
+                return _state.DeclarationFinder
+                    .MatchName(selectedName)
+                    .SingleOrDefault(m => m.ProjectId == projectId
+                        && m.DeclarationType.HasFlag(selectedType)
+                        && m.ComponentName == component.Name);
+             }
             return null;
         }
     }