From dd1c5d9cee4db81ef8cdfde688152ddaedb994c6 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 6 Feb 2014 11:28:17 +0100 Subject: [PATCH] new inference: incorporation of capture constraint: captured wildcard treatment --- .../resolve/graphInference/InferenceIncorporationPhase.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java index 781e83c6edad..e39545c27137 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java @@ -69,6 +69,9 @@ public class InferenceIncorporationPhase { LOG.assertTrue(parameters.length == typeArgs.length); for (int i = 0; i < typeArgs.length; i++) { PsiType aType = typeArgs[i]; + if (aType instanceof PsiCapturedWildcardType) { + aType = ((PsiCapturedWildcardType)aType).getWildcard(); + } final InferenceVariable inferenceVariable = mySession.getInferenceVariable(parameters[i]); LOG.assertTrue(inferenceVariable != null);