Possible fix of EA-34996
This commit is contained in:
@@ -328,11 +328,7 @@ public class CallResolver {
|
|||||||
// We have some candidates that failed for some reason
|
// We have some candidates that failed for some reason
|
||||||
// And we have a suspect: the function literal argument
|
// And we have a suspect: the function literal argument
|
||||||
// Now, we try to remove this argument and see if it helps
|
// Now, we try to remove this argument and see if it helps
|
||||||
Collection<ResolutionCandidate<D>> newCandidates = Lists.newArrayList();
|
ResolutionTask<D, F> newContext = new ResolutionTask<D, F>(task.getCandidates(), task.reference, TemporaryBindingTrace.create(task.trace), task.scope, new DelegatingCall(task.call) {
|
||||||
for (ResolutionCandidate<D> candidate : task.getCandidates()) {
|
|
||||||
newCandidates.add(ResolutionCandidate.create(candidate.getDescriptor(), candidate.isSafeCall())); //todo check receivers are not necessary
|
|
||||||
}
|
|
||||||
ResolutionTask<D, F> newContext = new ResolutionTask<D, F>(newCandidates, task.reference, TemporaryBindingTrace.create(task.trace), task.scope, new DelegatingCall(task.call) {
|
|
||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public List<JetExpression> getFunctionLiteralArguments() {
|
public List<JetExpression> getFunctionLiteralArguments() {
|
||||||
|
|||||||
+2
@@ -222,6 +222,8 @@ import static org.jetbrains.jet.lang.resolve.calls.ValueArgumentsToParametersMap
|
|||||||
status = ERROR;
|
status = ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
assert (candidateCall.getThisObject().exists() == candidateCall.getResultingDescriptor().getExpectedThisObject().exists()) : "Shouldn't happen because of TaskPrioritizer: " + candidateCall.getCandidateDescriptor();
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user