Minor. rename

This commit is contained in:
Stanislav Erokhin
2016-02-20 14:51:28 +03:00
parent 3e366f6b2d
commit ae7b048fdb
@@ -180,10 +180,10 @@ public class CallResolver {
return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<D>>() { return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<D>>() {
@Override @Override
public OverloadResolutionResults<D> invoke() { public OverloadResolutionResults<D> invoke() {
TaskContextForMigration<D> contextForMigration = new TaskContextForMigration<D>( ResolutionTask<D> resolutionTask = new ResolutionTask<D>(
kind, name, null kind, name, null
); );
return doResolveCallOrGetCachedResults(context, contextForMigration, tracing); return doResolveCallOrGetCachedResults(context, resolutionTask, tracing);
} }
}); });
} }
@@ -207,10 +207,10 @@ public class CallResolver {
return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<D>>() { return callResolvePerfCounter.time(new Function0<OverloadResolutionResults<D>>() {
@Override @Override
public OverloadResolutionResults<D> invoke() { public OverloadResolutionResults<D> invoke() {
TaskContextForMigration<D> contextForMigration = new TaskContextForMigration<D>( ResolutionTask<D> resolutionTask = new ResolutionTask<D>(
ResolveKind.GIVEN_CANDIDATES, null, candidates ResolveKind.GIVEN_CANDIDATES, null, candidates
); );
return doResolveCallOrGetCachedResults(context, contextForMigration, tracing); return doResolveCallOrGetCachedResults(context, resolutionTask, tracing);
} }
}); });
} }
@@ -485,20 +485,20 @@ public class CallResolver {
Set<ResolutionCandidate<FunctionDescriptor>> candidates = Collections.singleton(candidate); Set<ResolutionCandidate<FunctionDescriptor>> candidates = Collections.singleton(candidate);
TaskContextForMigration<FunctionDescriptor> contextForMigration = ResolutionTask<FunctionDescriptor> resolutionTask =
new TaskContextForMigration<FunctionDescriptor>( new ResolutionTask<FunctionDescriptor>(
ResolveKind.GIVEN_CANDIDATES, null, candidates ResolveKind.GIVEN_CANDIDATES, null, candidates
); );
return doResolveCallOrGetCachedResults(basicCallResolutionContext, contextForMigration, tracing); return doResolveCallOrGetCachedResults(basicCallResolutionContext, resolutionTask, tracing);
} }
}); });
} }
private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> doResolveCallOrGetCachedResults( private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> doResolveCallOrGetCachedResults(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull TaskContextForMigration<D> contextForMigration, @NotNull ResolutionTask<D> resolutionTask,
@NotNull TracingStrategy tracing @NotNull TracingStrategy tracing
) { ) {
Call call = context.call; Call call = context.call;
@@ -510,7 +510,7 @@ public class CallResolver {
BindingContextUtilsKt.recordScope(newContext.trace, newContext.scope, newContext.call.getCalleeExpression()); BindingContextUtilsKt.recordScope(newContext.trace, newContext.scope, newContext.call.getCalleeExpression());
BindingContextUtilsKt.recordDataFlowInfo(newContext, newContext.call.getCalleeExpression()); BindingContextUtilsKt.recordDataFlowInfo(newContext, newContext.call.getCalleeExpression());
OverloadResolutionResultsImpl<D> results = doResolveCall(newContext, contextForMigration, tracing); OverloadResolutionResultsImpl<D> results = doResolveCall(newContext, resolutionTask, tracing);
DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace(); DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace();
if (deltasTraceForTypeInference != null) { if (deltasTraceForTypeInference != null) {
deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall); deltasTraceForTypeInference.addOwnDataTo(traceToResolveCall);
@@ -570,7 +570,7 @@ public class CallResolver {
@NotNull @NotNull
private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> doResolveCall( private <D extends CallableDescriptor> OverloadResolutionResultsImpl<D> doResolveCall(
@NotNull BasicCallResolutionContext context, @NotNull BasicCallResolutionContext context,
@NotNull TaskContextForMigration<D> contextForMigration, @NotNull ResolutionTask<D> resolutionTask,
@NotNull TracingStrategy tracing @NotNull TracingStrategy tracing
) { ) {
if (context.checkArguments == CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) { if (context.checkArguments == CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS) {
@@ -591,20 +591,19 @@ public class CallResolver {
} }
} }
if (contextForMigration.resolveKind != ResolveKind.GIVEN_CANDIDATES) { if (resolutionTask.resolveKind != ResolveKind.GIVEN_CANDIDATES) {
assert contextForMigration.name != null; assert resolutionTask.name != null;
return (OverloadResolutionResultsImpl<D>) return (OverloadResolutionResultsImpl<D>)
newCallResolver.runResolve(context, contextForMigration.name, contextForMigration.resolveKind, tracing); newCallResolver.runResolve(context, resolutionTask.name, resolutionTask.resolveKind, tracing);
} }
else { else {
assert contextForMigration.givenCandidates != null; assert resolutionTask.givenCandidates != null;
return newCallResolver.runResolveForGivenCandidates(context, tracing, contextForMigration.givenCandidates); return newCallResolver.runResolveForGivenCandidates(context, tracing, resolutionTask.givenCandidates);
} }
} }
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private static class ResolutionTask<D extends CallableDescriptor> {
private static class TaskContextForMigration<D extends CallableDescriptor> {
@Nullable @Nullable
final Name name; final Name name;
@@ -615,7 +614,7 @@ public class CallResolver {
@NotNull @NotNull
final ResolveKind resolveKind; final ResolveKind resolveKind;
private TaskContextForMigration( private ResolutionTask(
@NotNull ResolveKind kind, @NotNull ResolveKind kind,
@Nullable Name name, @Nullable Name name,
@Nullable Collection<ResolutionCandidate<D>> candidates @Nullable Collection<ResolutionCandidate<D>> candidates