Merge pull request #5474 from MDoerner/DoNotAllowFolderDragIntoItself

retailcoder · web-flow · commit 6d8dc24dd052 · 2020-04-24T19:17:26.000-04:00
Prohibit dragging and dropping a folder into itself
diff --git a/Rubberduck.Core/UI/CodeExplorer/Commands/DragAndDrop/CodeExplorerMoveToFolderDragAndDropCommand.cs b/Rubberduck.Core/UI/CodeExplorer/Commands/DragAndDrop/CodeExplorerMoveToFolderDragAndDropCommand.cs
@@ -31,7 +31,8 @@ private bool SpecialEvaluateCanExecute(object parameter)
         {
             var (targetFolder, node) = (ValueTuple<string, ICodeExplorerNode>)parameter;
             return !string.IsNullOrEmpty(targetFolder)
-                   && (node is CodeExplorerCustomFolderViewModel
+                   && (node is CodeExplorerCustomFolderViewModel folderViewModel
+                       && folderViewModel.FullPath != targetFolder
                     || node is CodeExplorerComponentViewModel componentViewModel
                         && componentViewModel.Declaration is ModuleDeclaration);
         }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ private bool SpecialEvaluateCanExecute(object parameter)`
`31`	`31`	`{`
`32`	`32`	`var (targetFolder, node) = (ValueTuple<string, ICodeExplorerNode>)parameter;`
`33`	`33`	`return !string.IsNullOrEmpty(targetFolder)`
`34`		`- && (node is CodeExplorerCustomFolderViewModel`
	`34`	`+ && (node is CodeExplorerCustomFolderViewModel folderViewModel`
	`35`	`+ && folderViewModel.FullPath != targetFolder`
`35`	`36`	`\|\| node is CodeExplorerComponentViewModel componentViewModel`
`36`	`37`	`&& componentViewModel.Declaration is ModuleDeclaration);`
`37`	`38`	`}`