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: include constraint without input variables first

Browse Source 
(cherry picked from commit f971c6fad15e7037cba08ba474bc8965ba7dc130)
This commit is contained in:
anna
2013-11-25 16:47:27 +01:00
parent 492398bd2e
commit ec99a45340
1 changed files with 12 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
+12 -3
View File
@@ -608,7 +608,8 @@ public class InferenceSession {
final Set<InferenceVariable> outputVariables = new HashSet<InferenceVariable>();
for (ConstraintFormula constraint : additionalConstraints) {
if (constraint instanceof InputOutputConstraintFormula) {
final Set<InferenceVariable> outputVars = ((InputOutputConstraintFormula)constraint).getOutputVariables(((InputOutputConstraintFormula)constraint).getInputVariables(this), this);
final Set<InferenceVariable> inputVariables = ((InputOutputConstraintFormula)constraint).getInputVariables(this);
final Set<InferenceVariable> outputVars = ((InputOutputConstraintFormula)constraint).getOutputVariables(inputVariables, this);
if (outputVars != null) {
outputVariables.addAll(outputVars);
}
@@ -635,7 +636,15 @@ public class InferenceSession {
varsToResolve.addAll(inputVariables);
}
}
} else {
else {
subset.add(constraint);
Set<InferenceVariable> outputVars = ((InputOutputConstraintFormula)constraint).getOutputVariables(null, this);
if (outputVars != null) {
varsToResolve.addAll(outputVars);
}
}
}
else {
subset.add(constraint);
}
}
@@ -649,7 +658,7 @@ public class InferenceSession {
return false;
}
PsiSubstitutor substitutor = resolveBounds(varsToResolve, mySiteSubstitutor, true);
PsiSubstitutor substitutor = resolveBounds(varsToResolve, mySiteSubstitutor, false);
for (ConstraintFormula additionalConstraint : additionalConstraints) {
additionalConstraint.apply(substitutor);