Merge pull request #4297 from mansellan/4296

VB6 - Fix CE rename command

Author: retailcoder

Rubberduck.Refactorings/Rename/RenameRefactoring.cs

@@ -184,7 +184,7 @@ private bool TrySetRenameTargetFromInputTarget(Declaration inputTarget)
         private bool UserConfirmsRenameOfResolvedTarget(string message)
         {
             return _messageBox?.ConfirmYesNo(message, RubberduckUI.RenameDialog_TitleText) ?? false;
-            
+
         }
 
         private Declaration ResolveRenameTargetIfEventHandlerSelected(Declaration selectedTarget)
@@ -435,33 +435,50 @@ private void RenameModule()
             }
 
             var component = _state.ProjectsProvider.Component(_model.Target.QualifiedName.QualifiedModuleName);
-            if (component.Type == ComponentType.Document)
-            {
-                var properties = component.Properties;
-                var property = properties["_CodeName"];
-                {
-                    property.Value = _model.NewName;
-                }
-            }
-            else if (component.Type == ComponentType.UserForm)
+            switch (component.Type)
             {
-                var properties = component.Properties;
-                var property = properties["Caption"];
-                {
-                    if ((string)property.Value == _model.Target.IdentifierName)
+                case ComponentType.Document:
                     {
-                        property.Value = _model.NewName;
+                        var properties = component.Properties;
+                        var property = properties["_CodeName"];
+                        {
+                            property.Value = _model.NewName;
+                        }
+                        break;
+                    }
+                case ComponentType.UserForm:
+                case ComponentType.VBForm:
+                case ComponentType.MDIForm:
+                    {
+                        var properties = component.Properties;
+                        var property = properties["Caption"];
+                        {
+                            if ((string)property.Value == _model.Target.IdentifierName)
+                            {
+                                property.Value = _model.NewName;
+                            }
+                            component.Name = _model.NewName;
+                        }
+                        break;
+                    }
+                default:
+                    {
+                        if (_vbe.Kind == VBEKind.Hosted)
+                        {
+                            // VBA - rename code module
+                            using (var codeModule = component.CodeModule)
+                            {
+                                Debug.Assert(!codeModule.IsWrappingNullReference, "input validation fail: Attempting to rename an ICodeModule wrapping a null reference");
+                                codeModule.Name = _model.NewName;
+                            }
+                        }
+                        else
+                        {
+                            // VB6 - rename component
+                            component.Name = _model.NewName;
+                        }
+                        break;
                     }
-                    component.Name = _model.NewName;
-                }
-            }
-            else
-            {
-                using (var codeModule = component.CodeModule)
-                {
-                    Debug.Assert(!codeModule.IsWrappingNullReference, "input validation fail: Attempting to rename an ICodeModule wrapping a null reference");
-                    codeModule.Name = _model.NewName;
-                }
             }
         }