Moved max priority constant to PriorityProvider.

This commit is contained in:
Evgeny Gerashchenko
2013-03-28 20:08:35 +04:00
parent 0fee69fe07
commit 13d856db8e
2 changed files with 8 additions and 4 deletions
@@ -31,9 +31,6 @@ import java.util.Collection;
import java.util.List;
public class ResolutionTaskHolder<D extends CallableDescriptor, F extends D> {
private static final int MIN_PRIORITY = 0;
private static final int MAX_PRIORITY = 3;
private final JetReferenceExpression reference;
private final BasicCallResolutionContext basicCallResolutionContext;
private final PriorityProvider<ResolutionCandidate<D>> priorityProvider;
@@ -97,7 +94,7 @@ public class ResolutionTaskHolder<D extends CallableDescriptor, F extends D> {
}
candidateList.addAll(nonLocalExtensions);
for (int priority = MAX_PRIORITY; priority >= MIN_PRIORITY; priority--) {
for (int priority = priorityProvider.getMaxPriority(); priority >= 0; priority--) {
final int finalPriority = priority;
for (Collection<ResolutionCandidate<D>> candidates : candidateList) {
Collection<ResolutionCandidate<D>> filteredCandidates = Collections2.filter(candidates, new Predicate<ResolutionCandidate<D>>() {
@@ -117,5 +114,7 @@ public class ResolutionTaskHolder<D extends CallableDescriptor, F extends D> {
public interface PriorityProvider<D> {
int getPriority(D candidate);
int getMaxPriority();
}
}
@@ -92,6 +92,11 @@ public class TaskPrioritizer {
return (isVisible(call) ? 2 : 0) + (isSynthesized(call) ? 1 : 0);
}
@Override
public int getMaxPriority() {
return 3;
}
private boolean isVisible(ResolutionCandidate<D> call) {
if (call == null) return false;
D candidateDescriptor = call.getDescriptor();