Merge pull request #1018 from SlavaRa/feature/CodeRefactor_MoveDialog

Dialog for Move refactoring command

Author: Meychi

External/Plugins/CodeRefactor/CodeRefactor.csproj

@@ -98,6 +98,12 @@
     <Compile Include="Controls\DividedCheckedListBox.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Controls\MoveDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Controls\MoveDialog.Designer.cs">
+      <DependentUpon>MoveDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="Controls\ProgressDialog.cs">
       <SubType>Form</SubType>
     </Compile>

External/Plugins/CodeRefactor/Commands/Move.cs

@@ -36,15 +36,14 @@ namespace CodeRefactor.Commands
 {
     class Move : RefactorCommand<IDictionary<string, List<SearchMatch>>>
     {
-
         public Dictionary<string, string> OldPathToNewPath;
         public bool OutputResults;
-        private bool renaming;
+        private readonly bool renaming;
+        private readonly bool updatePackages;
         private List<MoveTargetHelper> targets;
         private List<string> filesToReopen;
         private int currentTargetIndex;
         private ASResult currentTargetResult;
-
         private bool targetsOutsideClasspath;
 
         #region Constructors
@@ -56,15 +55,32 @@ public Move(Dictionary<string, string>oldPathToNewPath) : this(oldPathToNewPath,
         {
         }
 
+        /// <summary>
+        /// A new Move refactoring command.
+        /// </summary>
+        /// <param name="outputResults">If true, will send the found results to the trace log and results panel</param>
         public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults) : this(oldPathToNewPath, outputResults, false)
         {
         }
 
-        public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults, bool renaming)
+        /// <summary>
+        /// A new Move refactoring command.
+        /// </summary>
+        /// <param name="outputResults">If true, will send the found results to the trace log and results panel</param>
+        public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults, bool renaming) : this(oldPathToNewPath, outputResults, renaming, false)
+        {
+        }
+
+        /// <summary>
+        /// A new Move refactoring command.
+        /// </summary>
+        /// <param name="outputResults">If true, will send the found results to the trace log and results panel</param>
+        public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults, bool renaming, bool updatePackages)
         {
             OldPathToNewPath = oldPathToNewPath;
             OutputResults = outputResults;
             this.renaming = renaming;
+            this.updatePackages = updatePackages;
             Results = new Dictionary<string, List<SearchMatch>>();
         }
 
@@ -82,35 +98,43 @@ protected override void ExecutionImplementation()
             RegisterDocumentHelper(AssociatedDocumentHelper);
 
             CreateListOfMoveTargets();
-
+            DialogResult dialogResult;
             if (targetsOutsideClasspath)
             {
-                msg = TextHelper.GetString("Info.MovingOutsideClasspath");
-                title = TextHelper.GetString("FlashDevelop.Title.WarningDialog");
-                if (MessageBox.Show(msg, title, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                if (updatePackages) dialogResult = DialogResult.Yes;
+                else
+                {
+                    msg = TextHelper.GetString("Info.MovingOutsideClasspath");
+                    title = TextHelper.GetString("FlashDevelop.Title.WarningDialog");
+                    dialogResult = MessageBox.Show(msg, title, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
+                }
+                if (dialogResult == DialogResult.Yes)
                 {
                     MoveTargets();
                     ReopenInitialFiles();
                 }
                 FireOnRefactorComplete();
                 return;
             }
-
-            if (renaming)
+            if (updatePackages) dialogResult = DialogResult.Yes;
+            else
             {
-                msg = TextHelper.GetString("Info.RenamingDirectory");
-                foreach (string path in OldPathToNewPath.Keys)
+                if (renaming)
                 {
-                    title = string.Format(TextHelper.GetString("Title.RenameDialog"), Path.GetFileName(path));
-                    break;
+                    msg = TextHelper.GetString("Info.RenamingDirectory");
+                    foreach (string path in OldPathToNewPath.Keys)
+                    {
+                        title = string.Format(TextHelper.GetString("Title.RenameDialog"), Path.GetFileName(path));
+                        break;
+                    }
                 }
+                else
+                {
+                    msg = TextHelper.GetString("Info.MovingFile");
+                    title = TextHelper.GetString("Title.MoveDialog");
+                }
+                dialogResult = MessageBox.Show(msg, title, MessageBoxButtons.YesNoCancel);
             }
-            else
-            {
-                msg = TextHelper.GetString("Info.MovingFile");
-                title = TextHelper.GetString("Title.MoveDialog");
-            }
-            var dialogResult = MessageBox.Show(msg, title, MessageBoxButtons.YesNoCancel);
             if (dialogResult == DialogResult.Cancel)
             {
                 FireOnRefactorComplete();
@@ -150,11 +174,11 @@ private void CreateListOfMoveTargets()
             {
                 string oldPath = item.Key;
                 string newPath = item.Value;
-                ITabbedDocument doc;
                 if (File.Exists(oldPath))
                 {
                     newPath = Path.Combine(newPath, Path.GetFileName(oldPath));
 
+                    ITabbedDocument doc;
                     if (AssociatedDocumentHelper.InitiallyOpenedFiles.TryGetValue(oldPath, out doc))
                     {
                         doc.Save();