From a2ad6fd3b62bbdc38768cd4c1c7a76d9d7780188 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 6 Nov 2013 13:15:21 +0100 Subject: [PATCH] new inference: accept captured wildcard opening during subtype constraint reduction --- .../graphInference/constraints/SubtypingConstraint.java | 5 +++++ 1 file changed, 5 insertions(+) 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 cfda8a0f0e36..d519c7470cee 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 @@ -114,6 +114,11 @@ public class SubtypingConstraint implements ConstraintFormula { if (tBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) { return true; } + + if (myS instanceof PsiCapturedWildcardType) { + myS = ((PsiCapturedWildcardType)myS).getWildcard(); + } + if (myS instanceof PsiWildcardType) { final PsiType sBound = ((PsiWildcardType)myS).getBound(); if (sBound != null && ((PsiWildcardType)myS).isExtends()) {