@Nullable proximity context (EA-23391)

This commit is contained in:
peter.gromov
2010-11-11 17:27:06 +03:00
parent 3777d81091
commit 5764587331
3 changed files with 5 additions and 3 deletions
@@ -32,7 +32,7 @@ public class ProximityLocation implements UserDataHolder {
private final Module myPositionModule;
private final ProcessingContext myContext;
public ProximityLocation(final PsiElement position, final Module positionModule) {
public ProximityLocation(@Nullable final PsiElement position, final Module positionModule) {
this(position, positionModule, new ProcessingContext());
}
@@ -1375,7 +1375,7 @@ public abstract class ChooseByNameBase {
private final ChooseByNameModel myModel;
private final PsiProximityComparator myProximityComparator;
private PathProximityComparator(final ChooseByNameModel model, final PsiElement context) {
private PathProximityComparator(final ChooseByNameModel model, @Nullable final PsiElement context) {
myModel = model;
myProximityComparator = new PsiProximityComparator(context);
}
@@ -49,7 +49,7 @@ public class PsiProximityComparator implements Comparator<Object> {
};
private static final Key<Module> MODULE_BY_LOCATION = Key.create("ModuleByLocation");
public PsiProximityComparator(PsiElement context) {
public PsiProximityComparator(@Nullable PsiElement context) {
myContext = context;
}
@@ -68,6 +68,8 @@ public class PsiProximityComparator implements Comparator<Object> {
return - proximity1.compareTo(proximity2);
}
if (myContext == null) return 0;
Module contextModule = ModuleUtil.findModuleForPsiElement(myContext);
if (contextModule == null) return 0;