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: process mutual dependencies

Browse Source 
(cherry picked from commit 72dcb6d8ce54a6be5f236a9c3cae0350293375cd)
This commit is contained in:
anna
2013-11-25 16:47:15 +01:00
parent c8c35ded4c
commit d881e4bdef
1 changed files with 8 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
+8 -6
View File
@@ -488,13 +488,13 @@ public class InferenceSession {
}
if (eqBounds.size() > 1) continue;
}
PsiType bound = eqBounds.isEmpty() ? null : acceptBoundsWithRecursiveDependencies(typeParameter, eqBounds.get(0), substitutor);
PsiType bound = eqBounds.isEmpty() ? null : acceptBoundsWithRecursiveDependencies(inferenceVariable, eqBounds.get(0), substitutor);
if (bound != null) {
inferenceVariable.setInstantiation(bound);
} else {
PsiType lub = null;
for (PsiType lowerBound : lowerBounds) {
lowerBound = acceptBoundsWithRecursiveDependencies(typeParameter, lowerBound, substitutor);
lowerBound = acceptBoundsWithRecursiveDependencies(inferenceVariable, lowerBound, substitutor);
if (isProperType(lowerBound)) {
if (lub == null) {
lub = lowerBound;
@@ -513,7 +513,7 @@ public class InferenceSession {
glb = PsiType.getJavaLangRuntimeException(myManager, GlobalSearchScope.allScope(myManager.getProject()));
} else {
for (PsiType upperBound : upperBounds) {
upperBound = acceptBoundsWithRecursiveDependencies(typeParameter, upperBound, substitutor);
upperBound = acceptBoundsWithRecursiveDependencies(inferenceVariable, upperBound, substitutor);
if (isProperType(upperBound)) {
if (glb == null) {
glb = upperBound;
@@ -555,9 +555,11 @@ public class InferenceSession {
return commonThrowable;
}
private PsiType acceptBoundsWithRecursiveDependencies(PsiTypeParameter typeParameter, PsiType bound, PsiSubstitutor substitutor) {
if (!isProperType(bound)) {
final PsiSubstitutor subst = PsiUtil.resolveClassInType(bound) != typeParameter ? substitutor.put(typeParameter, null) : substitutor;
private PsiType acceptBoundsWithRecursiveDependencies(InferenceVariable inferenceVariable, PsiType bound, PsiSubstitutor substitutor) {
final HashSet<InferenceVariable> dependencies = new HashSet<InferenceVariable>();
final boolean collectDependencies = collectDependencies(bound, dependencies);
if (collectDependencies) {
final PsiSubstitutor subst = !dependencies.contains(inferenceVariable) ? substitutor.put(inferenceVariable.getParameter(), null) : substitutor;
return subst.substitute(bound);
}
return bound;