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

new inference: eq bounds should not contain primitive values, so no filter for instantiations is needed

Browse Source
This commit is contained in:
Anna Kozlova
2015-11-24 20:00:29 +01:00
parent fc288cf04d
commit bc988bc67b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/FunctionalInterfaceParameterizationUtil.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class FunctionalInterfaceParameterizationUtil {
return null;
}
final PsiSubstitutor substitutor = session.retrieveNonPrimitiveEqualsBounds(session.getInferenceVariables());
final PsiSubstitutor substitutor = session.getInstantiations(session.getInferenceVariables());
final PsiType[] newTypeParameters = new PsiType[parameters.length];
for (int i = 0; i < typeParameters.length; i++) {
PsiTypeParameter typeParameter = typeParameters[i];
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+2 -2
View File
@@ -554,11 +554,11 @@ public class InferenceSession {
candidateProperties != null && candidateProperties.isVarargs();
}
public PsiSubstitutor retrieveNonPrimitiveEqualsBounds(Collection<InferenceVariable> variables) {
public PsiSubstitutor getInstantiations(Collection<InferenceVariable> variables) {
PsiSubstitutor substitutor = PsiSubstitutor.EMPTY;
for (InferenceVariable variable : variables) {
final PsiType equalsBound = getEqualsBound(variable, substitutor);
if (!(equalsBound instanceof PsiPrimitiveType)) {
if (equalsBound != null && !PsiType.NULL.equals(equalsBound)) {
substitutor = substitutor.put(variable, equalsBound);
}
}