new inference: process type arguments withing bounds

(cherry picked from commit 18c175ea17eb26b4baec7cc1f7b9579849783a5e)
This commit is contained in:
anna
2013-11-25 16:47:35 +01:00
parent f7fd8525b9
commit 0c02d873d8
@@ -19,9 +19,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession;
import com.intellij.psi.impl.source.resolve.graphInference.PsiPolyExpressionUtil;
import com.intellij.psi.impl.source.tree.java.PsiMethodCallExpressionImpl;
import com.intellij.psi.impl.source.tree.java.PsiMethodReferenceExpressionImpl;
import com.intellij.psi.infos.MethodCandidateInfo;
import com.intellij.psi.util.PsiUtil;
import java.util.Arrays;
@@ -71,7 +69,9 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
LOG.assertTrue(applicableMember != null);
int idx = 0;
for (PsiTypeParameter param : ((PsiTypeParameterListOwner)applicableMember).getTypeParameters()) {
psiSubstitutor = psiSubstitutor.put(param, typeParameters[idx++]);
if (idx < typeParameters.length) {
psiSubstitutor = psiSubstitutor.put(param, typeParameters[idx++]);
}
}
final PsiParameter[] parameters = applicableMember instanceof PsiMethod ? ((PsiMethod)applicableMember).getParameterList().getParameters() : PsiParameter.EMPTY_ARRAY;
if (targetParameters.length == parameters.length + 1) {