rename hasUnknownTypeParameters -> hasIncompleteTypeParameters
This commit is contained in:
@@ -332,7 +332,7 @@ public class CallResolver {
|
|||||||
ResolvedCallWithTrace<D> resolvedCall = (ResolvedCallWithTrace<D>) results.getResultingCall();
|
ResolvedCallWithTrace<D> resolvedCall = (ResolvedCallWithTrace<D>) results.getResultingCall();
|
||||||
//todo[ResolvedCallImpl]
|
//todo[ResolvedCallImpl]
|
||||||
if (!(resolvedCall instanceof ResolvedCallImpl)) return results;
|
if (!(resolvedCall instanceof ResolvedCallImpl)) return results;
|
||||||
if (!resolvedCall.hasUnknownTypeParameters()) {
|
if (!resolvedCall.hasIncompleteTypeParameters()) {
|
||||||
CallCandidateResolutionContext<D> callCandidateResolutionContext =
|
CallCandidateResolutionContext<D> callCandidateResolutionContext =
|
||||||
CallCandidateResolutionContext.createForCallBeingAnalyzed((ResolvedCallImpl<D>) resolvedCall, context, tracing);
|
CallCandidateResolutionContext.createForCallBeingAnalyzed((ResolvedCallImpl<D>) resolvedCall, context, tracing);
|
||||||
candidateResolver.completeNestedCallsInference(callCandidateResolutionContext);
|
candidateResolver.completeNestedCallsInference(callCandidateResolutionContext);
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ public class CallResolverUtil {
|
|||||||
if (call.isDirty()) {
|
if (call.isDirty()) {
|
||||||
copy.argumentHasNoType();
|
copy.argumentHasNoType();
|
||||||
}
|
}
|
||||||
copy.setHasUnknownTypeParameters(call.hasUnknownTypeParameters());
|
copy.setHasUnknownTypeParameters(call.hasIncompleteTypeParameters());
|
||||||
ConstraintSystem constraintSystem = call.getConstraintSystem();
|
ConstraintSystem constraintSystem = call.getConstraintSystem();
|
||||||
if (constraintSystem != null) {
|
if (constraintSystem != null) {
|
||||||
copy.setConstraintSystem(constraintSystem.copy());
|
copy.setConstraintSystem(constraintSystem.copy());
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ public class CandidateResolver {
|
|||||||
CallCandidateResolutionContext<D> context
|
CallCandidateResolutionContext<D> context
|
||||||
) {
|
) {
|
||||||
ResolvedCallImpl<D> resolvedCall = context.candidateCall;
|
ResolvedCallImpl<D> resolvedCall = context.candidateCall;
|
||||||
assert resolvedCall.hasUnknownTypeParameters();
|
assert resolvedCall.hasIncompleteTypeParameters();
|
||||||
ConstraintSystem constraintSystem = resolvedCall.getConstraintSystem();
|
ConstraintSystem constraintSystem = resolvedCall.getConstraintSystem();
|
||||||
assert constraintSystem != null;
|
assert constraintSystem != null;
|
||||||
|
|
||||||
@@ -217,7 +217,7 @@ public class CandidateResolver {
|
|||||||
boolean isInnerCall
|
boolean isInnerCall
|
||||||
) {
|
) {
|
||||||
ResolvedCallImpl<D> resolvedCall = context.candidateCall;
|
ResolvedCallImpl<D> resolvedCall = context.candidateCall;
|
||||||
assert resolvedCall.hasUnknownTypeParameters();
|
assert resolvedCall.hasIncompleteTypeParameters();
|
||||||
D descriptor = resolvedCall.getCandidateDescriptor();
|
D descriptor = resolvedCall.getCandidateDescriptor();
|
||||||
ConstraintSystem constraintSystem = resolvedCall.getConstraintSystem();
|
ConstraintSystem constraintSystem = resolvedCall.getConstraintSystem();
|
||||||
assert constraintSystem != null;
|
assert constraintSystem != null;
|
||||||
@@ -297,7 +297,7 @@ public class CandidateResolver {
|
|||||||
|
|
||||||
CallCandidateResolutionContext<FunctionDescriptor> contextForArgument =
|
CallCandidateResolutionContext<FunctionDescriptor> contextForArgument =
|
||||||
storedContextForArgument.replaceResolveMode(ResolveMode.TOP_LEVEL_CALL).replaceBindingTrace(context.trace).replaceExpectedType(expectedType);
|
storedContextForArgument.replaceResolveMode(ResolveMode.TOP_LEVEL_CALL).replaceBindingTrace(context.trace).replaceExpectedType(expectedType);
|
||||||
if (contextForArgument.candidateCall.hasUnknownTypeParameters()) {
|
if (contextForArgument.candidateCall.hasIncompleteTypeParameters()) {
|
||||||
completeTypeInferenceDependentOnExpectedTypeForCall(contextForArgument, true);
|
completeTypeInferenceDependentOnExpectedTypeForCall(contextForArgument, true);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
+1
-1
@@ -109,7 +109,7 @@ public class ResolvedCallImpl<D extends CallableDescriptor> implements ResolvedC
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasUnknownTypeParameters() {
|
public boolean hasIncompleteTypeParameters() {
|
||||||
return hasUnknownTypeParameters;
|
return hasUnknownTypeParameters;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+7
-1
@@ -26,7 +26,13 @@ public interface ResolvedCallWithTrace<D extends CallableDescriptor> extends Res
|
|||||||
@NotNull
|
@NotNull
|
||||||
ResolutionStatus getStatus();
|
ResolutionStatus getStatus();
|
||||||
|
|
||||||
boolean hasUnknownTypeParameters();
|
/**
|
||||||
|
* Resolved call can have incomplete type parameters
|
||||||
|
* if ResolutionStatus is INCOMPLETE_TYPE_INFERENCE (might be completed successfully)
|
||||||
|
* or OTHER_ERROR (cannot be completed successfully, but if there's only one candidate, should be completed anyway).
|
||||||
|
* @return true if resolved call has unknown type parameters (inference is incomplete)
|
||||||
|
*/
|
||||||
|
boolean hasIncompleteTypeParameters();
|
||||||
|
|
||||||
boolean isDirty();
|
boolean isDirty();
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -129,7 +129,7 @@ public class VariableAsFunctionResolvedCall implements ResolvedCallWithTrace<Fun
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean hasUnknownTypeParameters() {
|
public boolean hasIncompleteTypeParameters() {
|
||||||
return variableCall.hasUnknownTypeParameters();
|
return variableCall.hasIncompleteTypeParameters();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user