diff options
author | Tor Norbye <tnorbye@google.com> | 2013-08-16 08:53:25 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2013-08-16 08:53:25 -0700 |
commit | 4db7dfd37df60de478b5d99be0554bc0e06dfdba (patch) | |
tree | 01e1b92d88bbb2b9cdf0941627054e7933c11ead /java/java-psi-impl/src/com | |
parent | bb2fc4a79dd544c91510116bc692e0b8b09d2341 (diff) | |
download | idea-4db7dfd37df60de478b5d99be0554bc0e06dfdba.tar.gz |
Snapshot dc8d47d344cb8e7b04ed2af7a93fd95627f38ee0 from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: I7d6b4a705cb79fae78d9e845acad2d50fa3f4402
Diffstat (limited to 'java/java-psi-impl/src/com')
-rw-r--r-- | java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java index 6dde4206470f..bbe39b386ded 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java @@ -572,10 +572,6 @@ public class PsiResolveHelperImpl implements PsiResolveHelper { final boolean captureWildcard) { if (arg instanceof PsiWildcardType && !captureWildcard) return FAILED_INFERENCE; if (arg != PsiType.NULL) { - if (arg instanceof PsiWildcardType) { - final PsiType bound = ((PsiWildcardType)arg).getBound(); - if (bound instanceof PsiClassType && ((PsiClassType)bound).isRaw()) return Pair.create(null, constraintType); - } return new Pair<PsiType, ConstraintType>(arg, constraintType); } return null; |