Merge pull request #1121 from SlavaRa/feature/888

Fixes issue #888

Author: Meychi

External/Plugins/CodeRefactor/Commands/Rename.cs

@@ -5,7 +5,6 @@
 using ASCompletion.Completion;
 using ASCompletion.Context;
 using ASCompletion.Model;
-using CodeRefactor.Controls;
 using CodeRefactor.Provider;
 using PluginCore;
 using PluginCore.Controls;
@@ -23,18 +22,14 @@ namespace CodeRefactor.Commands
     /// </summary>
     public class Rename : RefactorCommand<IDictionary<String, List<SearchMatch>>>
     {
-        private String newName;
         private Boolean outputResults;
         private FindAllReferences findAllReferencesCommand;
         private Move renamePackage;
-
         private String oldFileName;
         private String newFileName;
 
-        public String NewName
-        {
-            get { return this.newName; }
-        }
+        public string TargetName { get; }
+        public string NewName { get; }
 
         /// <summary>
         /// A new Rename refactoring command.
@@ -102,19 +97,21 @@ public Rename(ASResult target, Boolean outputResults, String newName, Boolean ig
                         string path = Path.Combine(aPath.Path, package);
                         if (aPath.IsValid && Directory.Exists(path))
                         {
-                            this.newName = string.IsNullOrEmpty(newName) ? GetNewName(Path.GetFileName(path)) : newName;
-                            if (string.IsNullOrEmpty(this.newName)) return;
-                            renamePackage = new Move(new Dictionary<string, string> { { path, this.newName } }, true, true);
+                            TargetName = Path.GetFileName(path);
+                            this.NewName = string.IsNullOrEmpty(newName) ? GetNewName(TargetName) : newName;
+                            if (string.IsNullOrEmpty(this.NewName)) return;
+                            renamePackage = new Move(new Dictionary<string, string> { { path, this.NewName } }, true, true);
                             return;
                         }
                     }
                 }
                 return;
             }
 
-            this.newName = !string.IsNullOrEmpty(newName) ? newName : GetNewName(RefactoringHelper.GetRefactorTargetName(target));
+            TargetName = RefactoringHelper.GetRefactorTargetName(target);
+            this.NewName = !string.IsNullOrEmpty(newName) ? newName : GetNewName(TargetName);
 
-            if (string.IsNullOrEmpty(this.newName)) return;
+            if (string.IsNullOrEmpty(this.NewName)) return;
 
             // create a FindAllReferences refactor to get all the changes we need to make
             // we'll also let it output the results, at least until we implement a way of outputting the renamed results later
@@ -133,7 +130,7 @@ protected override void ExecutionImplementation()
             if (renamePackage != null)
             {
                 renamePackage.RegisterDocumentHelper(AssociatedDocumentHelper);
-                renamePackage.OnRefactorComplete += (o, args) => FireOnRefactorComplete();
+                renamePackage.OnRefactorComplete += OnRenamePackageComplete;
                 renamePackage.Execute();
             }
             else
@@ -160,13 +157,19 @@ protected override void ExecutionImplementation()
         /// </summary>
         public override Boolean IsValid()
         {
-            return renamePackage != null ? renamePackage.IsValid() : !string.IsNullOrEmpty(this.newName);
+            return renamePackage != null ? renamePackage.IsValid() : !string.IsNullOrEmpty(this.NewName);
         }
 
         #endregion
 
         #region Private Helper Methods
 
+        void OnRenamePackageComplete(object sender, RefactorCompleteEventArgs<IDictionary<string, List<SearchMatch>>> args)
+        {
+            Results = args.Results;
+            FireOnRefactorComplete();
+        }
+
         private bool ValidateTargets()
         {
             ASResult target = findAllReferencesCommand.CurrentTarget;
@@ -192,19 +195,8 @@ private bool ValidateTargets()
             if (!isEnum && !isClass && !isGlobalFunction && !isGlobalNamespace)
                 return true;
 
-            FileModel inFile;
-            String originName;
-
-            if (isEnum || isClass)
-            {
-                inFile = target.Type.InFile;
-                originName = target.Type.Name;
-            }
-            else
-            {
-                inFile = target.Member.InFile;
-                originName = target.Member.Name;
-            }
+            var member = isEnum || isClass ? target.Type : target.Member;
+            FileModel inFile = member.InFile;
 
             // Is this possible? should return false? I'm inclined to think so
             if (inFile == null) return true;
@@ -213,7 +205,7 @@ private bool ValidateTargets()
             String oldName = Path.GetFileNameWithoutExtension(oldFileName);
 
             // Private classes and similars
-            if (string.IsNullOrEmpty(oldName) || !oldName.Equals(originName))
+            if (string.IsNullOrEmpty(oldName) || !oldName.Equals(member.Name))
                 return true;
 
             String fullPath = Path.GetFullPath(inFile.FileName);
@@ -243,7 +235,7 @@ private void OnFindAllReferencesCompleted(Object sender, RefactorCompleteEventAr
                 var doc = AssociatedDocumentHelper.LoadDocument(entry.Key);
                 var sci = doc.SciControl;
                 // replace matches in the current file with the new name
-                RefactoringHelper.ReplaceMatches(entry.Value, sci, this.newName);
+                RefactoringHelper.ReplaceMatches(entry.Value, sci, this.NewName);
                 //Uncomment if we want to keep modified files
                 //if (sci.IsModify) AssociatedDocumentHelper.MarkDocumentToKeep(entry.Key);
                 doc.Save();
@@ -290,7 +282,6 @@ private void RenameFile(IDictionary<string, List<SearchMatch>> results)
                     project.SetDocumentClass(newFileName, true);
                     project.Save();
                 }
-
             }
 
             if (results.ContainsKey(oldFileName))
@@ -303,7 +294,7 @@ private void RenameFile(IDictionary<string, List<SearchMatch>> results)
         }
 
         /// <summary>
-        /// 
+        /// Outputs the results to the TraceManager
         /// </summary>
         private void ReportResults()
         {

External/Plugins/CodeRefactor/Provider/RefactoringHelper.cs

@@ -99,7 +99,7 @@ public static ASResult GetDefaultRefactorTarget()
             ScintillaControl sci = PluginBase.MainForm.CurrentDocument.SciControl;
             if (!ASContext.Context.IsFileValid || (sci == null)) return null;
             int position = sci.WordEndPosition(sci.CurrentPos, true);
-            return DeclarationLookupResult(sci, position);
+            return ASComplete.GetExpressionType(sci, position);
         }
 
         public static string GetRefactorTargetName(ASResult target)

External/Plugins/CodeRefactor/Provider/RenamingHelper.cs

@@ -7,6 +7,7 @@
 using ASCompletion.Completion;
 using ASCompletion.Context;
 using ASCompletion.Model;
+using PluginCore;
 using PluginCore.Localization;
 using PluginCore.Managers;
 using ProjectManager.Helpers;
@@ -17,14 +18,20 @@ class RenamingHelper
     {
         static readonly List<Rename> queue = new List<Rename>();
         static Rename currentCommand;
+        static StartState startState;
 
         public static void AddToQueue(ASResult target)
         {
             AddToQueue(target, true);
         }
         public static void AddToQueue(ASResult target, bool outputResults)
         {
-            if (target.IsPackage) queue.Add(new Rename(target, outputResults));
+            Rename cmd = null;
+            if (target.IsPackage)
+            {
+                cmd = new Rename(target, outputResults);
+                queue.Add(cmd);
+            }
             else
             {
                 string originalName = RefactoringHelper.GetRefactorTargetName(target);
@@ -34,7 +41,8 @@ public static void AddToQueue(ASResult target, bool outputResults)
                 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));
+                cmd = new Rename(target, outputResults, newName);
+                queue.Add(cmd);
                 if (ASContext.Context.CurrentModel.haXe && target.Member != null &&
                     (target.Member.Flags & (FlagType.Getter | FlagType.Setter)) > 0)
                 {
@@ -43,7 +51,18 @@ public static void AddToQueue(ASResult target, bool outputResults)
                     if (list[1].Name == "set") RenameMember(target.InClass, "set_" + originalName, "set_" + newName, outputResults);
                 }
             }
-            if (currentCommand == null) ExecuteFirst();
+            if (currentCommand != null) return;
+            if (cmd != null)
+            {
+                var doc = PluginBase.MainForm.CurrentDocument;
+                startState = new StartState
+                {
+                    FileName = doc.FileName,
+                    CursorPosition = doc.SciControl.CurrentPos,
+                    Cmd = cmd
+                };
+            }
+            ExecuteFirst();
         }
 
         static void RenameMember(ClassModel inClass, string name, string newName, bool outputResults)
@@ -55,7 +74,7 @@ static void RenameMember(ClassModel inClass, string name, string newName, bool o
             if (result.Member == null) return;
             queue.Add(new Rename(result, outputResults, newName));
         }
-
+         
         static void ExecuteFirst()
         {
             try
@@ -76,7 +95,47 @@ static void ExecuteFirst()
         static void OnRefactorComplete(object sender, RefactorCompleteEventArgs<IDictionary<string, List<SearchMatch>>> e)
         {
             if (queue.Count > 0) ExecuteFirst();
-            else currentCommand = null;
+            else
+            {
+                if (startState != null) RestoreStartState();
+                currentCommand = null;
+                startState = null;
+            }
         }
+
+        static void RestoreStartState()
+        {
+            var fileName = startState.FileName;
+            var cursorPosition = startState.CursorPosition;
+            var cmd = startState.Cmd;
+            var charsDiff = cmd.NewName.Length - cmd.TargetName.Length;
+            foreach (var entry in cmd.Results)
+            {
+                if (entry.Key != fileName) continue;
+                SearchMatch match = null;
+                foreach (var tmpMatch in entry.Value)
+                {
+                    var start = tmpMatch.Index - charsDiff;
+                    if (cursorPosition >= start)
+                    {
+                        charsDiff += charsDiff;
+                        match = tmpMatch;
+                    }
+                    else break;
+                }
+                var doc = (ITabbedDocument) PluginBase.MainForm.OpenEditableDocument(fileName);
+                var sci = doc.SciControl;
+                var pos = sci.PositionFromLine(match.Line - 1) + match.Column;
+                sci.SetSel(pos, pos);
+                break;
+            }
+        }
+    }
+
+    class StartState
+    {
+        public string FileName;
+        public int CursorPosition;
+        public Rename Cmd;
     }
 }