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

push down: sort out rebinding references in order to process imports first

Browse Source
This commit is contained in:
anna
2009-11-03 19:31:41 +03:00
parent ed5800cedc
commit 6f47731d8c
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
+7 -3
View File
@@ -42,9 +42,7 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.*;
public class PushDownProcessor extends BaseRefactoringProcessor {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.memberPushDown.PushDownProcessor");
@@ -376,6 +374,12 @@ public class PushDownProcessor extends BaseRefactoringProcessor {
if (newMember != null) {
decodeRefs(newMember, targetClass);
//rebind imports first
Collections.sort(refsToRebind, new Comparator<PsiReference>() {
public int compare(PsiReference o1, PsiReference o2) {
return PsiUtil.BY_POSITION.compare(o1.getElement(), o2.getElement());
}
});
for (PsiReference psiReference : refsToRebind) {
JavaCodeStyleManagerImpl.getInstance(myProject).shortenClassReferences(psiReference.bindToElement(newMember));
}