Merge pull request #1126 from SlavaRa/feature/fix_rename_package

[Critical] Fixes a bug which does not allow to rename the package

Author: Meychi

External/Plugins/CodeRefactor/Commands/Rename.cs

@@ -133,6 +133,7 @@ protected override void ExecutionImplementation()
             if (renamePackage != null)
             {
                 renamePackage.RegisterDocumentHelper(AssociatedDocumentHelper);
+                renamePackage.OnRefactorComplete += (o, args) => FireOnRefactorComplete();
                 renamePackage.Execute();
             }
             else

External/Plugins/CodeRefactor/PluginMain.cs

@@ -433,7 +433,8 @@ private void RenameClicked(Object sender, EventArgs e)
         {
             try
             {
-                RenamingHelper.AddToQueue(RefactoringHelper.GetDefaultRefactorTarget());
+                var target = RefactoringHelper.GetDefaultRefactorTarget();
+                if (target != null) RenamingHelper.AddToQueue(target);
             }
             catch (Exception ex)
             {

External/Plugins/CodeRefactor/Provider/RenamingHelper.cs

@@ -24,12 +24,14 @@ public static void AddToQueue(ASResult target)
         }
         public static void AddToQueue(ASResult target, bool outputResults)
         {
-            string originalName = RefactoringHelper.GetRefactorTargetName(target);
-            string label = TextHelper.GetString("Label.NewName");
-            string title = string.Format(TextHelper.GetString("Title.RenameDialog"), originalName);
-            LineEntryDialog askName = new LineEntryDialog(title, label, originalName);
-            if (askName.ShowDialog() == DialogResult.OK)
+            if (target.IsPackage) queue.Add(new Rename(target, outputResults));
+            else
             {
+                string originalName = RefactoringHelper.GetRefactorTargetName(target);
+                string label = TextHelper.GetString("Label.NewName");
+                string title = string.Format(TextHelper.GetString("Title.RenameDialog"), originalName);
+                LineEntryDialog askName = new LineEntryDialog(title, label, originalName);
+                if (askName.ShowDialog() != DialogResult.OK) return;
                 string newName = askName.Line.Trim();
                 if (newName.Length == 0 || newName == originalName) return;
                 queue.Add(new Rename(target, outputResults, newName));
@@ -40,8 +42,8 @@ public static void AddToQueue(ASResult target, bool outputResults)
                     if (list[0].Name == "get") RenameMember(target.InClass, "get_" + originalName, "get_" + newName, outputResults);
                     if (list[1].Name == "set") RenameMember(target.InClass, "set_" + originalName, "set_" + newName, outputResults);
                 }
-                if (currentCommand == null) ExecuteFirst();
             }
+            if (currentCommand == null) ExecuteFirst();
         }
 
         static void RenameMember(ClassModel inClass, string name, string newName, bool outputResults)