MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

check if super wildcard is within its bounds (IDEA-95065)

Browse Source
This commit is contained in:
anna
2012-11-15 21:35:23 +01:00
parent 6f21decc3d
commit 2c3fd187d5
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
View File

@@ -262,7 +262,7 @@ public class GenericsHighlightUtil {
final PsiClassType[] bounds = classParameter.getSuperTypes();
for (PsiClassType type1 : bounds) {
PsiType bound = substitutor.substitute(type1);
if (checkNotInBounds(type, bound)) {
if (!bound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && checkNotInBounds(type, bound)) {
PsiClass boundClass = bound instanceof PsiClassType ? ((PsiClassType)bound).resolve() : null;
@NonNls final String messageKey = boundClass == null || referenceClass == null || referenceClass.isInterface() == boundClass.isInterface()
@@ -297,7 +297,7 @@ public class GenericsHighlightUtil {
return checkExtendsWildcardCaptureFailure((PsiWildcardType)type, bound);
}
else if (((PsiWildcardType)type).isSuper()) {
return checkNotAssignable(bound, ((PsiWildcardType)type).getSuperBound());
return checkNotAssignable(bound, ((PsiWildcardType)type).getSuperBound(), false);
}
}
else if (type instanceof PsiArrayType) {

20
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/SuperWildcardIsNotWithinItsBound.java Normal file
View File

@@ -0,0 +1,20 @@
class TopGene<T> {
}
class MidRaw extends TopGene {
}
class BottomGene<T> extends MidRaw {
}
class GeneType<T extends TopGene<String>> {
}
class GeneUser {
public void success(GeneType<? extends BottomGene<String>> p) {
}
public void fail(GeneType<<error descr="Type parameter '? super BottomGene<String>' is not within its bound; should extend 'TopGene<java.lang.String>'">? super BottomGene<String></error>> p) {
}
}

1
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
View File

@@ -198,6 +198,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testRawOnParameterized() throws Exception { doTest(false); }
public void testFailedInferenceWithBoxing() throws Exception { doTest(false); }
public void testFixedFailedInferenceWithBoxing() throws Exception { doTest17Incompatibility(false); }
public void testSuperWildcardIsNotWithinItsBound() throws Exception { doTest17Incompatibility(false); }
public void testJavaUtilCollections_NoVerify() throws Exception {
PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule()));