From 1cc9209fea638167fa35175800cdf487150fd7b9 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 27 Jun 2014 16:21:37 +0200 Subject: [PATCH] revert --- java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java | 3 --- .../graphInference/constraints/StrictSubtypingConstraint.java | 4 ---- 2 files changed, 7 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java index 216302ed7d44..514087492300 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java @@ -512,9 +512,6 @@ public class PsiImplUtil { if (type instanceof PsiWildcardType) { final PsiWildcardType wildcardType = (PsiWildcardType)type; - if (toplevel.getParent() instanceof PsiLambdaExpression) { - return PsiCapturedWildcardType.create(wildcardType, expression); - } if (PsiUtil.isAccessedForWriting(toplevel)) { return wildcardType.isSuper() ? wildcardType.getBound() : PsiCapturedWildcardType.create(wildcardType, expression); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java index e121a6838168..412b09eadec3 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/StrictSubtypingConstraint.java @@ -119,10 +119,6 @@ public class StrictSubtypingConstraint implements ConstraintFormula { return true; } - if (myS instanceof PsiCapturedWildcardType) { - return false; - } - return true; }