MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

move: filter out nested dirs/files on actionPerformed, update should be fast (IDEA-111413)

Browse Source
This commit is contained in:
Anna Kozlova
2014-06-05 16:05:42 +04:00
parent e887cc365b
commit aa9a7b18bc
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/JavaMoveFilesOrDirectoriesHandler.java
+10 -9
View File
@@ -36,14 +36,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.*;
public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHandler {
@Override
public boolean canMove(PsiElement[] elements, PsiElement targetContainer) {
final PsiElement[] srcElements = adjustForMove(null, elements, targetContainer);
assert srcElements != null;
return super.canMove(srcElements, targetContainer);
}
@Override
public PsiElement adjustTargetForMove(DataContext dataContext, PsiElement targetContainer) {
if (targetContainer instanceof PsiPackage) {
@@ -60,6 +52,11 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan
@Override
public PsiElement[] adjustForMove(Project project, PsiElement[] sourceElements, PsiElement targetElement) {
sourceElements = super.adjustForMove(project, sourceElements, targetElement);
if (sourceElements == null) {
return null;
}
Set<PsiElement> result = new LinkedHashSet<PsiElement>();
for (PsiElement sourceElement : sourceElements) {
result.add(sourceElement instanceof PsiClass ? sourceElement.getContainingFile() : sourceElement);
@@ -70,6 +67,10 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan
@Override
public void doMove(final Project project, PsiElement[] elements, PsiElement targetContainer, MoveCallback callback) {
elements = adjustForMove(project, elements, targetContainer);
if (elements == null) {
return;
}
MoveFilesOrDirectoriesUtil
.doMove(project, elements, new PsiElement[]{targetContainer}, callback, new Function<PsiElement[], PsiElement[]>() {
@Override
@@ -89,7 +90,7 @@ public class JavaMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHan
adjustedElements.add(containingFile);
continue;
}
}
}
}
adjustedElements.add(element);
}
platform/lang-impl/src/com/intellij/refactoring/move/moveFilesOrDirectories/MoveFilesOrDirectoriesHandler.java
+11 -6
View File
@@ -50,11 +50,6 @@ public class MoveFilesOrDirectoriesHandler extends MoveHandlerDelegate {
}
}
PsiElement[] filteredElements = PsiTreeUtil.filterAncestors(elements);
if (filteredElements.length != elements.length) {
// there are nested dirs
return false;
}
return super.canMove(elements, targetContainer);
}
@@ -72,13 +67,23 @@ public class MoveFilesOrDirectoriesHandler extends MoveHandlerDelegate {
doMove(project, elements, targetContainer, null);
}
@Nullable
@Override
public PsiElement[] adjustForMove(Project project, PsiElement[] sourceElements, PsiElement targetElement) {
return PsiTreeUtil.filterAncestors(sourceElements);
}
@Override
public void doMove(final Project project, final PsiElement[] elements, final PsiElement targetContainer, @Nullable final MoveCallback callback) {
if (!LOG.assertTrue(targetContainer == null || targetContainer instanceof PsiDirectory || targetContainer instanceof PsiDirectoryContainer,
"container: " + targetContainer + "; elements: " + Arrays.toString(elements) + "; working handler: " + toString())) {
return;
}
MoveFilesOrDirectoriesUtil.doMove(project, adjustForMove(project, elements, targetContainer), new PsiElement[] {targetContainer}, callback);
final PsiElement[] adjustedElements = adjustForMove(project, elements, targetContainer);
if (adjustedElements != null) {
MoveFilesOrDirectoriesUtil.doMove(project, adjustedElements, new PsiElement[] {targetContainer}, callback);
}
}
@Override