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: choose proper type from equality bounds if present

Browse Source
This commit is contained in:
anna
2013-10-30 14:22:29 +01:00
parent f6a8f67f8c
commit 3c0c498353
2 changed files with 6 additions and 5 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
+1 -1
View File
@@ -419,8 +419,8 @@ public class InferenceSession {
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) break;
}
if (bound != null) {
if (bound instanceof PsiCapturedWildcardType && eqBounds.size() > 1) {
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java
+5 -4
View File
@@ -148,13 +148,14 @@ public class SubtypingConstraint implements ConstraintFormula {
if (myS instanceof PsiWildcardType) {
return inferenceVariable != null && inferenceVariable.isCaptured();
} else {
if (inferenceVariable != null) {
inferenceVariable.addBound(myS, InferenceBound.EQ);
final InferenceVariable inferenceVariableS = session.getInferenceVariable(myS);
if (inferenceVariableS != null) {
inferenceVariableS.addBound(myT, InferenceBound.EQ);
return true;
}
inferenceVariable = session.getInferenceVariable(myS);
if (inferenceVariable != null) {
inferenceVariable.addBound(myT, InferenceBound.EQ);
inferenceVariable.addBound(myS, InferenceBound.EQ);
return true;
}
constraints.add(new SubtypingConstraint(myT, myS, true));