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

rename: do not delete containing directory during move/rename (IDEA-130992)

Browse Source 
(cherry picked from commit 77712e308bb0edd5b164b4c95c2ad4c8a6a30648)
This commit is contained in:
Anna Kozlova
2014-10-13 19:20:54 +02:00
parent fc84427492
commit 0438d80f4f
5 changed files with 59 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/rename/RenamePsiPackageProcessor.java
+30 -29
View File
@@ -71,35 +71,7 @@ public class RenamePsiPackageProcessor extends RenamePsiElementProcessor {
final String oldName = psiPackage.getQualifiedName();
final String newName = getNewName();
if (!Comparing.strEqual(StringUtil.getPackageName(oldName), StringUtil.getPackageName(newName))) {
final ProjectFileIndex index = ProjectRootManager.getInstance(myProject).getFileIndex();
final PsiDirectory[] directories = psiPackage.getDirectories();
invokeRefactoring(new MoveDirectoryWithClassesProcessor(myProject, directories, null, isSearchInComments(),
isSearchInNonJavaFiles(), false, null) {
@Override
public TargetDirectoryWrapper getTargetDirectory(final PsiDirectory dir) {
final VirtualFile sourceRoot = index.getSourceRootForFile(dir.getVirtualFile());
LOG.assertTrue(sourceRoot != null);
return new TargetDirectoryWrapper(dir.getManager().findDirectory(sourceRoot), newName.replaceAll("\\.", "\\/"));
}
@Override
public void performRefactoring(UsageInfo[] usages) {
super.performRefactoring(usages);
for (PsiDirectory directory : directories) {
directory.delete();
}
}
@Override
protected String getTargetName() {
return newName;
}
@Override
protected String getCommandName() {
return "Rename package";
}
});
invokeRefactoring(createRenameMoveProcessor(newName, psiPackage, isSearchInComments(), isSearchInNonJavaFiles()));
} else {
super.doAction();
}
@@ -107,6 +79,35 @@ public class RenamePsiPackageProcessor extends RenamePsiElementProcessor {
};
}
public static MoveDirectoryWithClassesProcessor createRenameMoveProcessor(final String newName,
final PsiPackage psiPackage,
final boolean searchInComments,
final boolean searchInNonJavaFiles) {
final Project project = psiPackage.getProject();
final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
final PsiDirectory[] directories = psiPackage.getDirectories();
return new MoveDirectoryWithClassesProcessor(project, directories, null, searchInComments,
searchInNonJavaFiles, false, null) {
@Override
public TargetDirectoryWrapper getTargetDirectory(final PsiDirectory dir) {
final VirtualFile sourceRoot = index.getSourceRootForFile(dir.getVirtualFile());
LOG.assertTrue(sourceRoot != null);
return new TargetDirectoryWrapper(dir.getManager().findDirectory(sourceRoot), newName.replaceAll("\\.", "\\/"));
}
@Override
protected String getTargetName() {
return newName;
}
@Override
protected String getCommandName() {
return "Rename package";
}
};
}
public void renameElement(final PsiElement element,
final String newName,
final UsageInfo[] usages,
java/java-tests/testData/refactoring/movePackageAsDir/renamePackage/after/src1/pack1/pack2/S1.java
+3
View File
@@ -0,0 +1,3 @@
package pack1.pack2;
public class S1{}
java/java-tests/testData/refactoring/movePackageAsDir/renamePackage/before/src1/pack1/S1.java
+3
View File
@@ -0,0 +1,3 @@
package pack1;
public class S1{}
java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java
+17 -1
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesProcessor;
import com.intellij.refactoring.rename.RenamePsiPackageProcessor;
import com.intellij.testFramework.PsiTestUtil;
import junit.framework.Assert;
import org.jetbrains.annotations.NotNull;
@@ -50,6 +51,21 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase {
doTest(createAction("pack1", "target"));
}
public void testRenamePackage() throws Exception {
final PerformAction action = new PerformAction() {
@Override
public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject);
final PsiPackage sourcePackage = psiFacade.findPackage("pack1");
assertNotNull(sourcePackage);
RenamePsiPackageProcessor.createRenameMoveProcessor("pack1.pack2", sourcePackage, false, false).run();
FileDocumentManager.getInstance().saveAllDocuments();
}
};
doTest(action);
}
public void testMovePackageWithTxtFilesInside() throws Exception {
doTest(createAction("pack1", "target"));
}
@@ -139,7 +155,7 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase {
});
}
private PerformAction createAction(final String packageName, final String targetPackageName) {
private MyPerformAction createAction(final String packageName, final String targetPackageName) {
return new MyPerformAction(packageName, targetPackageName);
}
platform/lang-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java
+6 -1
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.RefactoringBundle;
@@ -195,7 +196,11 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
});
}
for (PsiDirectory directory : myDirectories) {
directory.delete();
final TargetDirectoryWrapper wrapper = myNestedDirsToMove.get(directory);
final PsiDirectory targetDirectory = wrapper.getTargetDirectory();
if (targetDirectory == null || !PsiTreeUtil.isAncestor(directory, targetDirectory, false)) {
directory.delete();
}
}
}
catch (IncorrectOperationException e) {