rename/move empty package as directory: correct refs on dir itself

2026-09-27 10:03:11 +07:00 · 2011-07-13 13:53:00 +04:00
parent 34e204b1fd
commit 47e7f584b7
12 changed files with 109 additions and 45 deletions
@@ -7,6 +7,7 @@ import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.listeners.RefactoringElementListener;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.util.Function;

 import java.util.*;

@@ -83,7 +84,7 @@ public class JavaMoveDirectoryWithClassesHelper extends MoveDirectoryWithClasses
  }

  @Override
-  public void postProcessUsages(UsageInfo[] usages) {
+  public void postProcessUsages(UsageInfo[] usages, Function<PsiDirectory, PsiDirectory> newDirMapper) {
    for (UsageInfo usage : usages) {
      if (usage instanceof RemoveOnDemandImportStatementsUsageInfo) {
        final PsiElement element = usage.getElement();
@@ -0,0 +1,3 @@
+package pack1;
+
+public class S2{}
@@ -0,0 +1,3 @@
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../../src1/target/pack1" xpointer="xpointer(/components/*)"/>
+</root>
@@ -0,0 +1,3 @@
+package pack1;
+
+public class S2{}
@@ -0,0 +1,3 @@
+<root xmlns:xi="http://www.w3.org/2001/XInclude">
+  <xi:include href="../../src1/pack1" xpointer="xpointer(/components/*)"/>
+</root>
@@ -11,9 +11,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileAdapter;
 import com.intellij.openapi.vfs.VirtualFileEvent;
 import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.psi.JavaPsiFacade;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiPackage;
+import com.intellij.psi.*;
 import com.intellij.refactoring.move.moveClassesOrPackages.MoveDirectoryWithClassesProcessor;
 import junit.framework.Assert;

@@ -67,34 +65,28 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase {
    doTest(createAction("pack1", "target"));
  }

-  private PerformAction createAction(final String packageName, final String targetPackageName) {
-    return new PerformAction() {
+  public void testXmlEmptyDirRefs() throws Exception {
+    final String packageName = "pack1";
+    doTest(new MyPerformAction(packageName, "target"){
+      private static final String EMPTY_TXT = "empty.txt";
      @Override
-      public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
-        final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject);
-        final Comparator<PsiDirectory> directoryComparator = new Comparator<PsiDirectory>() {
-          @Override
-          public int compare(PsiDirectory o1, PsiDirectory o2) {
-            return o1.getVirtualFile().getPresentableUrl().compareTo(o2.getVirtualFile().getPresentableUrl());
-          }
-        };
-
-        final PsiPackage sourcePackage = psiFacade.findPackage(packageName);
-        assertNotNull(sourcePackage);
-        final PsiDirectory[] srcDirectories = sourcePackage.getDirectories();
-        assertEquals(srcDirectories.length, 2);
-        Arrays.sort(srcDirectories, directoryComparator);
-
-        final PsiPackage targetPackage = psiFacade.findPackage(targetPackageName);
-        assertNotNull(targetPackage);
-        final PsiDirectory[] targetDirectories = targetPackage.getDirectories();
-        Arrays.sort(targetDirectories, directoryComparator);
-        assertTrue(targetDirectories.length > 0);
-
-        new MoveDirectoryWithClassesProcessor(getProject(), new PsiDirectory[]{srcDirectories[0]}, targetDirectories[0], false, false, true, null).run();
-        FileDocumentManager.getInstance().saveAllDocuments();
+      protected void preprocessSrcDir(PsiDirectory srcDirectory) {
+        final PsiFile empty = srcDirectory.findFile(EMPTY_TXT);
+        assert empty != null;
+        empty.delete();
      }
-    };
+
+      @Override
+      protected void postProcessTargetDir(PsiDirectory targetDirectory) {
+        final PsiDirectory subdirectory = targetDirectory.findSubdirectory(packageName);
+        assert subdirectory != null;
+        subdirectory.createFile(EMPTY_TXT);
+      }
+    });
+  }
+
+  private PerformAction createAction(final String packageName, final String targetPackageName) {
+    return new MyPerformAction(packageName, targetPackageName);
  }

  @Override
@@ -115,4 +107,47 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase {
      }
    });
  }
+
+  private class MyPerformAction implements PerformAction {
+    private final String myPackageName;
+    private final String myTargetPackageName;
+
+    public MyPerformAction(String packageName, String targetPackageName) {
+      myPackageName = packageName;
+      myTargetPackageName = targetPackageName;
+    }
+
+    @Override
+    public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception {
+      final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject);
+      final Comparator<PsiDirectory> directoryComparator = new Comparator<PsiDirectory>() {
+        @Override
+        public int compare(PsiDirectory o1, PsiDirectory o2) {
+          return o1.getVirtualFile().getPresentableUrl().compareTo(o2.getVirtualFile().getPresentableUrl());
+        }
+      };
+
+      final PsiPackage sourcePackage = psiFacade.findPackage(myPackageName);
+      assertNotNull(sourcePackage);
+      final PsiDirectory[] srcDirectories = sourcePackage.getDirectories();
+      assertEquals(srcDirectories.length, 2);
+      Arrays.sort(srcDirectories, directoryComparator);
+
+      final PsiPackage targetPackage = psiFacade.findPackage(myTargetPackageName);
+      assertNotNull(targetPackage);
+      final PsiDirectory[] targetDirectories = targetPackage.getDirectories();
+      Arrays.sort(targetDirectories, directoryComparator);
+      assertTrue(targetDirectories.length > 0);
+      preprocessSrcDir(srcDirectories[0]);
+      new MoveDirectoryWithClassesProcessor(getProject(), new PsiDirectory[]{srcDirectories[0]}, targetDirectories[0], false, false, true, null).run();
+      postProcessTargetDir(targetDirectories[0]);
+      FileDocumentManager.getInstance().saveAllDocuments();
+    }
+
+    protected void postProcessTargetDir(PsiDirectory targetDirectory) {
+    }
+
+    protected void preprocessSrcDir(PsiDirectory srcDirectory) {
+    }
+  }
 }
@@ -4,15 +4,13 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.ProperTextRange;
-import com.intellij.psi.PsiDirectory;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiReference;
+import com.intellij.psi.*;
 import com.intellij.psi.search.searches.ReferencesSearch;
 import com.intellij.refactoring.listeners.RefactoringElementListener;
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFileHandler;
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesUtil;
 import com.intellij.usageView.UsageInfo;
+import com.intellij.util.Function;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

@@ -36,7 +34,7 @@ public abstract class MoveDirectoryWithClassesHelper {
                                  List<PsiFile> movedFiles,
                                  RefactoringElementListener listener);

-  public abstract void postProcessUsages(UsageInfo[] usages);
+  public abstract void postProcessUsages(UsageInfo[] usages, Function<PsiDirectory, PsiDirectory> newDirMapper);

  public abstract void beforeMove(PsiFile psiFile);

@@ -61,15 +59,24 @@ public abstract class MoveDirectoryWithClassesHelper {
          result.add(new MyUsageInfo(reference, file));
        }
      }
+      for (PsiDirectory psiDirectory : directoriesToMove) {
+        for (PsiReference reference : ReferencesSearch.search(psiDirectory)) {
+          result.add(new MyUsageInfo(reference, psiDirectory));
+        }
+      }
    }

    @Override
-    public void postProcessUsages(UsageInfo[] usages) {
+    public void postProcessUsages(UsageInfo[] usages, Function<PsiDirectory, PsiDirectory> newDirMapper) {
      for (UsageInfo usage : usages) {
        if (usage instanceof MyUsageInfo) {
          PsiReference reference = usage.getReference();
          if (reference != null) {
-            reference.bindToElement(((MyUsageInfo)usage).myFile);
+            PsiFileSystemItem file = ((MyUsageInfo)usage).myFile;
+            if (file instanceof PsiDirectory) {
+              file = newDirMapper.fun((PsiDirectory)file);
+            }
+            reference.bindToElement(file);
          }
        }
      }
@@ -106,9 +113,9 @@ public abstract class MoveDirectoryWithClassesHelper {
    }

    private static class MyUsageInfo extends UsageInfo {
-      private final PsiFile myFile;
+      private final PsiFileSystemItem myFile;

-      public MyUsageInfo(@NotNull PsiReference reference, PsiFile file) {
+      public MyUsageInfo(@NotNull PsiReference reference, PsiFileSystemItem file) {
        super(reference);
        myFile = file;
      }
@@ -23,6 +23,7 @@ package com.intellij.refactoring.move.moveClassesOrPackages;
 import com.intellij.CommonBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.psi.PsiDirectory;
@@ -42,6 +43,7 @@ import com.intellij.refactoring.util.RefactoringUIUtil;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.usageView.UsageViewDescriptor;
 import com.intellij.usageView.UsageViewUtil;
+import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
@@ -133,11 +135,7 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
    try {
      //top level directories should be created even if they are empty
      for (PsiDirectory directory : myDirectories) {
-        final TargetDirectoryWrapper targetSubDirectory =
-          myTargetDirectory != null
-          ? new TargetDirectoryWrapper(myTargetDirectory, directory.getName())
-          : getTargetDirectory(directory);
-        targetSubDirectory.findOrCreateTargetDirectory();
+        getResultDirectory(directory).findOrCreateTargetDirectory();
      }
      for (PsiFile psiFile : myFilesToMove.keySet()) {
        myFilesToMove.get(psiFile).findOrCreateTargetDirectory();
@@ -177,13 +175,24 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor

    myNonCodeUsages = CommonMoveUtil.retargetUsages(usages, oldToNewElementsMapping);
    for (MoveDirectoryWithClassesHelper helper : MoveDirectoryWithClassesHelper.findAll()) {
-      helper.postProcessUsages(usages);
+      helper.postProcessUsages(usages, new Function<PsiDirectory, PsiDirectory>() {
+        @Override
+        public PsiDirectory fun(PsiDirectory dir) {
+          return getResultDirectory(dir).getTargetDirectory();
+        }
+      });
    }
    for (PsiDirectory directory : myDirectories) {
      directory.delete();
    }
  }

+  private TargetDirectoryWrapper getResultDirectory(PsiDirectory dir) {
+    return myTargetDirectory != null
+           ? new TargetDirectoryWrapper(myTargetDirectory, dir.getName())
+           : getTargetDirectory(dir);
+  }
+
  @Override
  protected void performPsiSpoilingRefactoring() {
    if (myNonCodeUsages == null) return; //refactoring was aborted