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: merge equals constraints before rejection

Browse Source 
(cherry picked from commit 3a660f4b84a23f42f1355bc7702c6d9904984ee2)
This commit is contained in:
anna
2013-11-25 16:47:29 +01:00
parent bbd2b726a3
commit 530d047004
1 changed files with 7 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/InferenceSession.java
+7 -3
View File
@@ -16,6 +16,7 @@
package com.intellij.psi.impl.source.resolve.graphInference;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.*;
@@ -480,16 +481,19 @@ public class InferenceSession {
inferenceVariable.setInstantiation(null);
continue;
}
PsiType bound = null;
if (eqBounds.size() > 1) {
for (Iterator<PsiType> iterator = eqBounds.iterator(); iterator.hasNext(); ) {
PsiType eqBound = iterator.next();
if (PsiUtil.resolveClassInType(eqBound) == typeParameter) {
PsiType eqBound = acceptBoundsWithRecursiveDependencies(inferenceVariable, iterator.next(), substitutor);
if (PsiUtil.resolveClassInType(eqBound) == typeParameter || Comparing.equal(bound, eqBound)) {
iterator.remove();
} else if (bound == null) {
bound = eqBound;
}
}
if (eqBounds.size() > 1) continue;
}
PsiType bound = eqBounds.isEmpty() ? null : acceptBoundsWithRecursiveDependencies(inferenceVariable, eqBounds.get(0), substitutor);
bound = eqBounds.isEmpty() ? null : acceptBoundsWithRecursiveDependencies(inferenceVariable, eqBounds.get(0), substitutor);
if (bound != null) {
inferenceVariable.setInstantiation(bound);
} else {