From 03db6fd8a8cb2b0d8d6bcb3a040c0b7ed7e11109 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 5 Jun 2015 12:02:51 +0200 Subject: [PATCH] new inference: remove special handling of captured wildcard equals --- .../graphInference/constraints/SubtypingConstraint.java | 2 -- .../constraints/TypeEqualityConstraint.java | 8 -------- 2 files changed, 10 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java index 30445757cdb9..178d57b7c17c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/SubtypingConstraint.java @@ -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; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java index 03b20b3fb443..f3fc0c725b12 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/TypeEqualityConstraint.java @@ -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;