closes #237

Author: SlavaRa

External/Plugins/CodeRefactor/CodeRefactor.csproj

@@ -114,6 +114,7 @@
     <Compile Include="Provider\DocumentHelper.cs" />
     <Compile Include="Provider\MovingHelper.cs" />
     <Compile Include="Provider\RefactoringHelper.cs" />
+    <Compile Include="Provider\RenamingHelper.cs" />
     <Compile Include="Provider\UserInterfaceManager.cs" />
     <Compile Include="RefactorItem.cs" />
     <Compile Include="Settings.cs" />

External/Plugins/CodeRefactor/Commands/Rename.cs

@@ -111,16 +111,8 @@ public Rename(ASResult target, Boolean outputResults, String newName, Boolean ig
                 }
                 return;
             }
-            Boolean isEnum = target.Type.IsEnum();
-            Boolean isVoid = target.Type.IsVoid();
-            Boolean isClass = !isVoid && target.IsStatic && (target.Member == null || RefactoringHelper.CheckFlag(target.Member.Flags, FlagType.Constructor));
 
-            if (!string.IsNullOrEmpty(newName))
-                this.newName = newName;
-            else if (isEnum || isClass)
-                this.newName = GetNewName(target.Type.Name);
-            else
-                this.newName = GetNewName(target.Member.Name);
+            this.newName = !string.IsNullOrEmpty(newName) ? newName : GetNewName(RefactoringHelper.GetRefactorTargetName(target));
 
             if (string.IsNullOrEmpty(this.newName)) return;
 

External/Plugins/CodeRefactor/PluginMain.cs

@@ -423,8 +423,7 @@ private void RenameClicked(Object sender, EventArgs e)
         {
             try
             {
-                Rename command = new Rename(true);
-                command.Execute();
+                RenamingHelper.AddToQueue(RefactoringHelper.GetDefaultRefactorTarget());
             }
             catch (Exception ex)
             {

External/Plugins/CodeRefactor/Provider/RefactoringHelper.cs

@@ -102,6 +102,15 @@ public static ASResult GetDefaultRefactorTarget()
             return DeclarationLookupResult(sci, position);
         }
 
+        public static string GetRefactorTargetName(ASResult target)
+        {
+            ClassModel type = target.Type;
+            MemberModel member = target.Member;
+            if (type.IsEnum() || !type.IsVoid() && target.IsStatic && (member == null || (member.Flags & FlagType.Constructor) > 0))
+                return type.Name;
+            return member.Name;
+        }
+
         /// <summary>
         /// Retrieves the refactoring target based on the file.
         /// </summary>

External/Plugins/CodeRefactor/Provider/RenamingHelper.cs

@@ -0,0 +1,78 @@
+using CodeRefactor.Commands;
+using PluginCore.FRService;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using ASCompletion.Completion;
+using ASCompletion.Context;
+using ASCompletion.Model;
+using PluginCore.Localization;
+using PluginCore.Managers;
+using ProjectManager.Helpers;
+
+namespace CodeRefactor.Provider
+{
+    class RenamingHelper
+    {
+        static readonly List<Rename> queue = new List<Rename>();
+        static Rename currentCommand;
+
+        public static void AddToQueue(ASResult target)
+        {
+            AddToQueue(target, true);
+        }
+        public static void AddToQueue(ASResult target, bool outputResults)
+        {
+            string name = RefactoringHelper.GetRefactorTargetName(target);
+            string label = TextHelper.GetString("Label.NewName");
+            string title = string.Format(TextHelper.GetString("Title.RenameDialog"), name);
+            LineEntryDialog askName = new LineEntryDialog(title, label, name);
+            if (askName.ShowDialog() == DialogResult.OK && askName.Line.Trim().Length > 0 && askName.Line.Trim() != name)
+            {
+                string newName = askName.Line.Trim();
+                queue.Add(new Rename(target, outputResults, newName));
+                if (ASContext.Context.CurrentModel.haXe && target.Member != null &&
+                    (target.Member.Flags & (FlagType.Getter | FlagType.Setter)) > 0)
+                {
+                    List<MemberModel> list = target.Member.Parameters;
+                    if (list[0].Name == "get") RenameMember(target.InClass, $"get_{name}", $"get_{newName}", outputResults);
+                    if (list[1].Name == "set") RenameMember(target.InClass, $"set_{name}", $"set_{newName}", outputResults);
+                }
+                if (currentCommand == null) ExecuteFirst();
+            }
+        }
+
+        static void RenameMember(ClassModel inClass, string name, string newName, bool outputResults)
+        {
+            MemberModel m = inClass.Members.Cast<MemberModel>().FirstOrDefault(it => it.Name == name);
+            if (m == null) return;
+            ASResult result = new ASResult();
+            ASComplete.FindMember(name, inClass, result, FlagType.Dynamic | FlagType.Function, 0);
+            queue.Add(new Rename(result, outputResults, newName));
+        }
+
+        static void ExecuteFirst()
+        {
+            try
+            {
+                currentCommand = queue[0];
+                queue.Remove(currentCommand);
+                currentCommand.OnRefactorComplete += OnRefactorComplete;
+                currentCommand.Execute();
+            }
+            catch (Exception ex)
+            {
+                queue.Clear();
+                currentCommand = null;
+                ErrorManager.ShowError(ex);
+            }
+        }
+
+        static void OnRefactorComplete(object sender, RefactorCompleteEventArgs<IDictionary<string, List<SearchMatch>>> e)
+        {
+            if (queue.Count > 0) ExecuteFirst();
+            else currentCommand = null;
+        }
+    }
+}