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

new inference: incorporation with capture: treat type param's extends bounds as one as glb (IDEA-142145)

Browse Source
This commit is contained in:
Anna Kozlova
2015-09-02 17:04:31 +03:00
parent 9a7d951e1e
commit 984b65ef65
3 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceIncorporationPhase.java
+18 -13
View File
@@ -113,15 +113,23 @@ public class InferenceIncorporationPhase {
if (mySession.getInferenceVariable(eqBound) == null) return false;
}
final PsiClassType[] paramBounds = parameters[i].getExtendsListTypes();
final PsiClassType[] paramBounds = inferenceVariable.getParameter().getExtendsListTypes();
PsiType glb = null;
for (PsiClassType paramBound : paramBounds) {
if (glb == null) {
glb = paramBound;
}
else {
glb = GenericsUtil.getGreatestLowerBound(glb, paramBound);
}
}
if (!((PsiWildcardType)aType).isBounded()) {
for (PsiType upperBound : upperBounds) {
if (mySession.getInferenceVariable(upperBound) == null) {
for (PsiClassType paramBound : paramBounds) {
addConstraint(new StrictSubtypingConstraint(upperBound, mySession.substituteWithInferenceVariables(paramBound)));
}
if (glb != null && mySession.getInferenceVariable(upperBound) == null) {
addConstraint(new StrictSubtypingConstraint(upperBound, mySession.substituteWithInferenceVariables(glb)));
}
}
@@ -137,10 +145,9 @@ public class InferenceIncorporationPhase {
if (mySession.getInferenceVariable(upperBound) == null) {
if (paramBounds.length == 1 && paramBounds[0].equalsToText(CommonClassNames.JAVA_LANG_OBJECT) || paramBounds.length == 0) {
addConstraint(new StrictSubtypingConstraint(upperBound, extendsBound));
} else if (extendsBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT)) {
for (PsiClassType paramBound : paramBounds) {
addConstraint(new StrictSubtypingConstraint(upperBound, mySession.substituteWithInferenceVariables(paramBound)));
}
}
else if (extendsBound.equalsToText(CommonClassNames.JAVA_LANG_OBJECT) && glb != null) {
addConstraint(new StrictSubtypingConstraint(upperBound, mySession.substituteWithInferenceVariables(glb)));
}
}
}
@@ -154,10 +161,8 @@ public class InferenceIncorporationPhase {
final PsiType superBound = ((PsiWildcardType)aType).getSuperBound();
for (PsiType upperBound : upperBounds) {
if (mySession.getInferenceVariable(upperBound) == null) {
for (PsiClassType paramBound : paramBounds) {
addConstraint(new StrictSubtypingConstraint(mySession.substituteWithInferenceVariables(paramBound), upperBound));
}
if (glb != null && mySession.getInferenceVariable(upperBound) == null) {
addConstraint(new StrictSubtypingConstraint(mySession.substituteWithInferenceVariables(glb), upperBound));
}
}
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/IncorporationWithCaptureCalcGlbToGetOneTypeParameterBound.java
+14
View File
@@ -0,0 +1,14 @@
import java.util.List;
class Test {
public <E> EntityContainer<?, E, ?> findNestedContainer(Class<E> entityClass) {
return null;
}
public <E2 > EntityContainer<?, E2, ?> readNestedEntity(Class<E2> entityClass) {
return findNestedContainer(entityClass);
}
private interface EntityContainer<K extends List<E>, E, M extends Test & List<E>> {}
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
+4
View File
@@ -295,6 +295,10 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase
doTest();
}
public void testIncorporationWithCaptureCalcGlbToGetOneTypeParameterBound() throws Exception {
doTest();
}
private void doTest() throws Exception {
doTest(false);
}