Merge pull request #1105 from SlavaRa/feature/CoeRefactor_ProjectManager_ContextMenu_Move

Adds item "Move" to context menu of Project Manager

Author: elsassph

External/Plugins/CodeRefactor/Controls/MoveDialog.Designer.cs

@@ -11,15 +11,23 @@ namespace CodeRefactor.Controls
 {
     public partial class MoveDialog : Form
     {
-        static IEnumerable<string> GetClasspaths(string path)
+        IEnumerable<string> GetClasspaths(string path)
         {
             return GetClasspaths(path, null);
         }
-        static IEnumerable<string> GetClasspaths(string path, string projectDirName)
+        IEnumerable<string> GetClasspaths(string path, string projectDirName)
         {
-            string[] directories = Directory.GetDirectories(path, "*", SearchOption.AllDirectories);
-            List<string> result = new List<string> {GetClasspath(path, projectDirName)};
-            result.AddRange(directories.Select(it => GetClasspath(it, projectDirName)));
+            var directories = new List<string> {path};
+            directories.AddRange(Directory.GetDirectories(path, "*", SearchOption.AllDirectories));
+            directories.RemoveAll(it =>
+            {
+                foreach (var movingFile in MovingFiles)
+                {
+                    if (it.StartsWith(movingFile) || Path.GetDirectoryName(movingFile) == it) return true;
+                }
+                return false;
+            });
+            var result = directories.Select(it => GetClasspath(it, projectDirName));
             return result;
         }
 
@@ -114,15 +122,6 @@ void FillTree()
             if (tree.Items.Count > 0) tree.SelectedIndex = 0;
         }
 
-        bool GetCanProcess()
-        {
-            object selectedItem = tree.SelectedItem;
-            if (selectedItem == null) return false;
-            string selectedPath = selectedItem.ToString();
-            if (!Path.IsPathRooted(selectedPath)) selectedPath = Path.GetFullPath(selectedPath);
-            return MovingFiles.All(file => Path.GetDirectoryName(file) != selectedPath);
-        }
-
         void OnShowExternalClasspathsCheckStateChanged(object sender, EventArgs e)
         {
             RefreshTree();
@@ -157,12 +156,7 @@ void OnTreeMouseDoubleClick(object sender, MouseEventArgs e)
             int indexFromPoint = tree.IndexFromPoint(e.Location);
             if (indexFromPoint == -1) return;
             tree.SelectedItem = tree.Items[indexFromPoint];
-            if (GetCanProcess()) DialogResult = DialogResult.OK;
-        }
-
-        void OnTreeSelectedValueChanged(object sender, EventArgs eventArgs)
-        {
-            processButton.Enabled = GetCanProcess();
+            DialogResult = DialogResult.OK;
         }
 
         protected override void OnKeyDown(KeyEventArgs e)

External/Plugins/CodeRefactor/Controls/MoveDialog.cs

@@ -15,7 +15,9 @@
 using PluginCore.Localization;
 using PluginCore.Managers;
 using PluginCore.Utilities;
+using ProjectManager;
 using ProjectManager.Actions;
+using ProjectManager.Controls.TreeView;
 using ProjectManager.Helpers;
 
 namespace CodeRefactor
@@ -35,6 +37,7 @@ public class PluginMain : IPlugin
         private RefactorMenu refactorMainMenu;
         private Settings settingObject;
         private String settingFilename;
+        TreeView projectTreeView;
 
         #region Required Properties
 
@@ -94,11 +97,11 @@ public Object Settings
         {
             get { return this.settingObject; }
         }
-        
+
         #endregion
 
         #region Required Methods
-        
+
         /// <summary>
         /// Initializes the plugin
         /// </summary>
@@ -116,7 +119,7 @@ public void Dispose()
         {
             this.SaveSettings();
         }
-        
+
         /// <summary>
         /// Handles the incoming events
         /// </summary>
@@ -135,6 +138,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                     EventManager.DispatchEvent(this, new DataEvent(EventType.Command, "CodeRefactor.ContextMenu", this.refactorContextMenu));
                     // Watch resolved context for menu item updating...
                     ASComplete.OnResolvedContextChanged += OnResolvedContextChanged;
+                    DirectoryNode.OnDirectoryNodeRefresh += OnDirectoryNodeRefresh;
                     this.UpdateMenuItems();
                     break;
 
@@ -157,7 +161,7 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                             }
                             else if (IsValidForRename(oldPath, newPath))
                             {
-                                RenameFile(oldPath, newPath);
+                                MoveFile(oldPath, newPath);
                                 e.Handled = true;
                             }
                             break;
@@ -177,6 +181,10 @@ public void HandleEvent(Object sender, NotifyEvent e, HandlingPriority priority)
                         case "ASCompletion.ContextualGenerator.AddOptions":
                             OnAddRefactorOptions(de.Data as List<ICompletionListItem>);
                             break;
+
+                        case ProjectManagerEvents.TreeSelectionChanged:
+                            OnTreeSelectionChanged();
+                            break;
                     }
                     break;
             }
@@ -199,12 +207,20 @@ private static bool IsValidForRename(string oldPath, string newPath)
         /// <summary>
         /// Checks if the file or directory is valid for move command
         /// </summary>
-        private static bool IsValidForMove(string oldPath, string newPath)
+        static bool IsValidForMove(string oldPath)
         {
             return PluginBase.CurrentProject != null
-                && (File.Exists(oldPath) || Directory.Exists(oldPath))
-                && IsValidFile(oldPath)
-                && Regex.Match(Path.GetFileNameWithoutExtension(newPath), REG_IDENTIFIER, RegexOptions.Singleline).Success;
+                   && (File.Exists(oldPath) || Directory.Exists(oldPath))
+                   && IsValidFile(oldPath);
+        }
+
+        /// <summary>
+        /// Checks if the file or directory is valid for move command
+        /// </summary>
+        static bool IsValidForMove(string oldPath, string newPath)
+        {
+            newPath = Path.GetFileNameWithoutExtension(newPath);
+            return IsValidForMove(oldPath) && Regex.Match(newPath, REG_IDENTIFIER, RegexOptions.Singleline).Success;
         }
 
         /// <summary>
@@ -220,9 +236,9 @@ private static bool IsValidFile(string file)
         }
 
         #endregion
-   
+
         #region Event Handling
-        
+
         /// <summary>
         /// Initializes important variables
         /// </summary>
@@ -447,7 +463,12 @@ private void RenameClicked(Object sender, EventArgs e)
         /// </summary>
         static void MoveClicked(object sender, EventArgs e)
         {
-            MoveDialog dialog = new MoveDialog(PluginBase.MainForm.CurrentDocument.FileName);
+            MoveFile(PluginBase.MainForm.CurrentDocument.FileName);
+        }
+
+        static void MoveFile(string fileName)
+        {
+            MoveDialog dialog = new MoveDialog(fileName);
             if (dialog.ShowDialog() != DialogResult.OK) return;
             Dictionary<string, string> oldPathToNewPath = new Dictionary<string, string>();
             foreach (string file in dialog.MovingFiles)
@@ -460,7 +481,7 @@ static void MoveClicked(object sender, EventArgs e)
         /// <summary>
         /// 
         /// </summary>
-        private void RenameFile(string oldPath, string newPath)
+        private void MoveFile(string oldPath, string newPath)
         {
             try
             {
@@ -713,6 +734,40 @@ void OnAddRefactorOptions(List<ICompletionListItem> list)
             }
         }
 
+        void OnDirectoryNodeRefresh(DirectoryNode node)
+        {
+            projectTreeView = node.TreeView;
+        }
+
+        void OnTreeSelectionChanged()
+        {
+            if (projectTreeView == null) return;
+            string path = null;
+            var node = projectTreeView.SelectedNode as GenericNode;
+            if (node != null) path = node.BackingPath;
+            if (string.IsNullOrEmpty(path)) return;
+            path = Path.GetFullPath(path);
+            if (!IsValidForMove(path)) return;
+            var menu = (ProjectContextMenu) projectTreeView.ContextMenuStrip;
+            var index = menu.Items.IndexOf(menu.Rename);
+            if (index == -1) return;
+            var item = new ToolStripMenuItem(TextHelper.GetString("Label.Move"));
+            item.ShortcutKeys = PluginBase.MainForm.GetShortcutItemKeys("RefactorMenu.Move");
+            item.Click += OnMoveItemClick;
+            menu.Items.Insert(index + 1, item);
+        }
+
+        void OnMoveItemClick(object sender, EventArgs eventArgs)
+        {
+            string path = null;
+            var node = projectTreeView.SelectedNode as GenericNode;
+            if (node != null) path = node.BackingPath;
+            if (string.IsNullOrEmpty(path)) return;
+            path = Path.GetFullPath(path);
+            if (!IsValidForMove(path)) return;
+            MoveFile(path);
+        }
+
         #endregion
     }
 }