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

classes from the same package should have higher priority than the imported ones (IDEA-66309)

Browse Source
This commit is contained in:
peter
2011-03-14 20:48:17 +01:00
parent 2ee7d732f1
commit 92988aa6f1
3 changed files with 58 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/util/proximity/ExplicitlyImportedWeigher.java
+38 -12
View File
@@ -23,6 +23,7 @@ import com.intellij.psi.util.ProximityLocation;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.NullableFunction;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author peter
@@ -32,20 +33,46 @@ public class ExplicitlyImportedWeigher extends ProximityWeigher {
PLACE_PACKAGE = NullableLazyKey.create("placePackage", new NullableFunction<ProximityLocation, PsiPackage>() {
@Override
public PsiPackage fun(ProximityLocation location) {
return PsiTreeUtil.getContextOfType(location.getPosition(), PsiPackage.class, false);
PsiElement position = location.getPosition();
if (position == null) return null;
return getContextPackage(position);
}
});
public Comparable weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
@Nullable
private static PsiPackage getContextPackage(PsiElement position) {
PsiFile file = position.getContainingFile();
if (file == null) return null;
PsiFile originalFile = file.getOriginalFile();
while (true) {
PsiElement context = originalFile.getContext();
if (context == null) {
PsiDirectory parent = originalFile.getParent();
if (parent != null) {
return JavaDirectoryService.getInstance().getPackage(parent);
}
return null;
}
PsiFile containingFile = context.getContainingFile();
if (containingFile == null) return null;
originalFile = containingFile.getOriginalFile();
}
}
public Integer weigh(@NotNull final PsiElement element, @NotNull final ProximityLocation location) {
final PsiElement position = location.getPosition();
if (position == null){
return null;
return 0;
}
final PsiFile elementFile = element.getContainingFile();
final PsiFile positionFile = position.getContainingFile();
if (positionFile != null && elementFile != null && positionFile.getOriginalFile().equals(elementFile.getOriginalFile())) {
return true;
return 3;
}
if (element instanceof PsiClass) {
@@ -59,7 +86,7 @@ public class ExplicitlyImportedWeigher extends ProximityWeigher {
final boolean onDemand = importStatement.isOnDemand();
final String imported = importStatement.getQualifiedName();
if (onDemand && qname.startsWith(imported + ".") || !onDemand && qname.equals(imported)) {
return true;
return 1;
}
}
}
@@ -69,14 +96,13 @@ public class ExplicitlyImportedWeigher extends ProximityWeigher {
}
if (element instanceof PsiMember) {
final PsiPackage placePackage = PLACE_PACKAGE.getValue(location);
if (placePackage == null) {
return false;
if (placePackage != null) {
Module elementModule = ModuleUtil.findModuleForPsiElement(element);
if (location.getPositionModule() == elementModule && placePackage.equals(getContextPackage(element))) {
return 2;
}
}
Module elementModule = ModuleUtil.findModuleForPsiElement(element);
return location.getPositionModule() == elementModule &&
placePackage.equals(PsiTreeUtil.getContextOfType(element, PsiPackage.class, false));
}
return false;
return 0;
}
}