Fixed KT-6011 Smart completion works for argument of wrong method

#KT-6011 Fixed
This commit is contained in:
Valentin Kipyatkov
2014-10-15 15:05:08 +04:00
parent b18b888161
commit 2365db1367
7 changed files with 37 additions and 4 deletions
@@ -23,6 +23,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.Call;
import org.jetbrains.jet.lang.psi.ValueArgument;
import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus;
import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.JetType;
@@ -37,6 +38,12 @@ public abstract class DelegatingResolvedCall<D extends CallableDescriptor> imple
this.resolvedCall = resolvedCall;
}
@NotNull
@Override
public ResolutionStatus getStatus() {
return resolvedCall.getStatus();
}
@NotNull
@Override
public Call getCall() {
@@ -28,9 +28,6 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor;
public interface MutableResolvedCall<D extends CallableDescriptor> extends ResolvedCall<D> {
@NotNull
ResolutionStatus getStatus();
void addStatus(@NotNull ResolutionStatus status);
void setStatusToSuccess();
@@ -23,6 +23,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.psi.Call;
import org.jetbrains.jet.lang.psi.ValueArgument;
import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus;
import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind;
import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.jet.lang.types.JetType;
@@ -31,6 +32,9 @@ import java.util.List;
import java.util.Map;
public interface ResolvedCall<D extends CallableDescriptor> {
@NotNull
ResolutionStatus getStatus();
/** The call that was resolved to this ResolvedCall */
@NotNull
Call getCall();