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: reject multiple eq bounds

Browse Source
This commit is contained in:
anna
2013-11-07 20:49:32 +01:00
parent fe23143c0b
commit 465762a96e
1 changed files with 10 additions and 9 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 -9
View File
@@ -427,16 +427,17 @@ public class InferenceSession {
inferenceVariable.setInstantiation(null);
continue;
}
PsiType bound = null;
for (PsiType eqBound : eqBounds) {
if (eqBound == null) continue;
if (bound != null && !isProperType(eqBound)) continue;
bound = acceptBoundsWithRecursiveDependencies(typeParameter, eqBound, substitutor);
}
if (bound != null) {
if (bound instanceof PsiCapturedWildcardType && eqBounds.size() > 1) {
continue;
if (eqBounds.size() > 1) {
for (Iterator<PsiType> iterator = eqBounds.iterator(); iterator.hasNext(); ) {
PsiType eqBound = iterator.next();
if (PsiUtil.resolveClassInType(eqBound) == typeParameter) {
iterator.remove();
}
}
if (eqBounds.size() > 1) continue;
}
PsiType bound = eqBounds.isEmpty() ? null : acceptBoundsWithRecursiveDependencies(typeParameter, eqBounds.get(0), substitutor);
if (bound != null) {
inferenceVariable.setInstantiation(bound);
} else {
PsiType lub = null;