MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-09 08:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

new inference: method ref constraint: take into account provided type arguments

Browse Source
This commit is contained in:
Anna Kozlova
2014-02-12 12:43:59 +01:00
parent a35cdbc34a
commit ea25e613a0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java
View File

@@ -165,14 +165,19 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
return false;
}
session.initBounds(method.getTypeParameters());
session.initBounds(containingClass.getTypeParameters());
int idx = 0;
PsiSubstitutor psiSubstitutor = PsiSubstitutor.EMPTY;
for (PsiTypeParameter param : method.getTypeParameters()) {
if (idx < typeParameters.length) {
psiSubstitutor = psiSubstitutor.put(param, typeParameters[idx++]);
}
}
final PsiParameter[] parameters = method.getParameterList().getParameters();
if (targetParameters.length == parameters.length + 1 && !method.isVarArgs()) {
specialCase(session, constraints, substitutor, targetParameters);
}
constraints.add(new TypeCompatibilityConstraint(returnType, referencedMethodReturnType));
constraints.add(new TypeCompatibilityConstraint(returnType, psiSubstitutor.substitute(referencedMethodReturnType)));
}
return true;