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: check low and eq bounds the same for parameterization

Browse Source
This commit is contained in:
Anna Kozlova
2015-07-29 10:03:01 +02:00
parent 1df6b8e711
commit 3b9ea8d4a8
1 changed files with 10 additions and 6 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/InferenceSession.java
+10 -6
View File
@@ -613,6 +613,12 @@ public class InferenceSession {
return false;
}
/**
* T is a reference type, but is not a wildcard-parameterized type, and either
* i) B2 contains a bound of one of the forms α=S or S<:α, where S is a wildcard-parameterized type, or
* ii) B2 contains two bounds of the forms S1 <: α and S2 <: α,
* where S1 and S2 have supertypes that are two different parameterizations of the same generic class or interface.
*/
private static boolean hasWildcardParameterization(InferenceVariable inferenceVariable, PsiClassType targetType) {
if (!FunctionalInterfaceParameterizationUtil.isWildcardParameterized(targetType)) {
final List<PsiType> bounds = inferenceVariable.getBounds(InferenceBound.LOWER);
@@ -624,13 +630,11 @@ public class InferenceSession {
};
if (findParameterizationOfTheSameGenericClass(bounds, differentParameterizationProcessor) != null) return true;
final List<PsiType> eqBounds = inferenceVariable.getBounds(InferenceBound.EQ);
for (PsiType lowBound : bounds) {
final List<PsiType> boundsToCheck = new ArrayList<PsiType>(bounds);
boundsToCheck.addAll(eqBounds);
for (PsiType lowBound : boundsToCheck) {
if (FunctionalInterfaceParameterizationUtil.isWildcardParameterized(lowBound)) {
for (PsiType bound : eqBounds) {
if (lowBound.equals(bound)) {
return true;
}
}
return true;
}
}
}