Revert "[FE 1.0] Resolve collection literals through the new type inference infra"
This reverts commit a542de715a.
This commit is contained in:
@@ -261,21 +261,16 @@ public class CallResolver {
|
|||||||
@NotNull Collection<FunctionDescriptor> functionDescriptors
|
@NotNull Collection<FunctionDescriptor> functionDescriptors
|
||||||
) {
|
) {
|
||||||
BasicCallResolutionContext callResolutionContext = BasicCallResolutionContext.create(context, call, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS);
|
BasicCallResolutionContext callResolutionContext = BasicCallResolutionContext.create(context, call, CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS);
|
||||||
|
List<OldResolutionCandidate<FunctionDescriptor>> candidates = CollectionsKt.map(functionDescriptors, descriptor ->
|
||||||
|
OldResolutionCandidate.create(
|
||||||
|
call,
|
||||||
|
descriptor,
|
||||||
|
null,
|
||||||
|
ExplicitReceiverKind.NO_EXPLICIT_RECEIVER,
|
||||||
|
null));
|
||||||
|
|
||||||
OverloadResolutionResults<FunctionDescriptor> resolutionResults = PSICallResolver.runResolutionAndInferenceForGivenDescriptors(
|
return computeTasksFromCandidatesAndResolvedCall(
|
||||||
callResolutionContext,
|
callResolutionContext, candidates, TracingStrategyImpl.create(expression, call));
|
||||||
functionDescriptors,
|
|
||||||
TracingStrategyImpl.create(expression, call),
|
|
||||||
null,
|
|
||||||
null
|
|
||||||
);
|
|
||||||
|
|
||||||
if (resolutionResults.isSingleResult()) {
|
|
||||||
context.trace.record(BindingContext.RESOLVED_CALL, call, resolutionResults.getResultingCall());
|
|
||||||
context.trace.record(BindingContext.CALL, call.getCallElement(), call);
|
|
||||||
}
|
|
||||||
|
|
||||||
return resolutionResults;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
|
|||||||
Reference in New Issue
Block a user