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

when moving file, update itself before retargeting usages (will fix IDEA-67004)

Browse Source
This commit is contained in:
Kirill.Safonov
2011-03-24 19:09:15 +03:00
parent 004927ee79
commit a016faa7f4
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveDirectoryWithClassesProcessor.java
+7 -6
View File
@@ -214,6 +214,13 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
for (PsiElement newElement : oldToNewElementsMapping.values()) {
ChangeContextUtil.decodeContextInfo(newElement, null, null);
}
// fix references in moved files to outer files
for (PsiFile movedFile : movedFiles) {
MoveFileHandler.forElement(movedFile).updateMovedFile(movedFile);
FileReferenceContextUtil.decodeFileReferences(movedFile);
}
myNonCodeUsages = MoveClassesOrPackagesProcessor.retargetUsages(usages, oldToNewElementsMapping);
for (UsageInfo usage : usages) {
if (usage instanceof RemoveOnDemandImportStatementsUsageInfo) {
@@ -223,12 +230,6 @@ public class MoveDirectoryWithClassesProcessor extends BaseRefactoringProcessor
}
}
}
// fix references in moved files to outer files
for (PsiFile movedFile : movedFiles) {
MoveFileHandler.forElement(movedFile).updateMovedFile(movedFile);
FileReferenceContextUtil.decodeFileReferences(movedFile);
}
for (PsiDirectory directory : myDirectories) {
directory.delete();
}