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: remove special handling of captured wildcard equals

Browse Source
This commit is contained in:
Anna Kozlova
2015-06-08 11:24:32 +03:00
parent 4d0a8d47aa
commit 03db6fd8a8
2 changed files with 0 additions and 10 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/constraints/SubtypingConstraint.java
-2
View File
@@ -48,8 +48,6 @@ public class SubtypingConstraint implements ConstraintFormula {
SubtypingConstraint that = (SubtypingConstraint)o;
if ( myS instanceof PsiCapturedWildcardType && myS != that.myS) return false;
if (myS != null ? !myS.equals(that.myS) : that.myS != null) return false;
if (myT != null ? !myT.equals(that.myT) : that.myT != null) return false;
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java
-8
View File
@@ -109,11 +109,6 @@ public class TypeEqualityConstraint implements ConstraintFormula {
return true;
}
if (myT instanceof PsiCapturedWildcardType && myS instanceof PsiCapturedWildcardType) {
return new TypeEqualityConstraint(((PsiCapturedWildcardType)myT).getWildcard(),
((PsiCapturedWildcardType)myS).getWildcard()).reduce(session, constraints);
}
return false;
}
@@ -130,9 +125,6 @@ public class TypeEqualityConstraint implements ConstraintFormula {
TypeEqualityConstraint that = (TypeEqualityConstraint)o;
if (myS instanceof PsiCapturedWildcardType && myS != that.myS) return false;
if (myT instanceof PsiCapturedWildcardType && myT != that.myT) return false;
if (myS != null ? !myS.equals(that.myS) : that.myS != null) return false;
if (myT != null ? !myT.equals(that.myT) : that.myT != null) return false;