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

inference: incorporation with capture and fresh variables (IDEA-145566)

Browse Source
This commit is contained in:
Anna Kozlova
2015-09-28 20:18:34 +02:00
parent c47f236282
commit d5a31ea205
3 changed files with 31 additions and 3 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
+11 -3
View File
@@ -21,6 +21,7 @@ import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.graphInference.constraints.ConstraintFormula;
import com.intellij.psi.impl.source.resolve.graphInference.constraints.StrictSubtypingConstraint;
import com.intellij.psi.impl.source.resolve.graphInference.constraints.TypeEqualityConstraint;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.Processor;
import java.util.*;
@@ -110,7 +111,7 @@ public class InferenceIncorporationPhase {
if (aType instanceof PsiWildcardType) {
for (PsiType eqBound : eqBounds) {
if (mySession.getInferenceVariable(eqBound) == null) return false;
if (!isInferenceVariableOrFreshTypeParameter(eqBound)) return false;
}
final PsiClassType[] paramBounds = inferenceVariable.getParameter().getExtendsListTypes();
@@ -134,7 +135,7 @@ public class InferenceIncorporationPhase {
}
for (PsiType lowerBound : lowerBounds) {
if (mySession.getInferenceVariable(lowerBound) == null) return false;
if (isInferenceVariableOrFreshTypeParameter(lowerBound)) return false;
}
} else if (((PsiWildcardType)aType).isExtends()) {
@@ -153,7 +154,7 @@ public class InferenceIncorporationPhase {
}
for (PsiType lowerBound : lowerBounds) {
if (mySession.getInferenceVariable(lowerBound) == null) return false;
if (isInferenceVariableOrFreshTypeParameter(lowerBound)) return false;
}
} else {
@@ -180,6 +181,13 @@ public class InferenceIncorporationPhase {
return true;
}
private static Boolean isInferenceVariableOrFreshTypeParameter(PsiType eqBound) {
final PsiClass psiClass = PsiUtil.resolveClassInClassTypeOnly(eqBound);
if (psiClass instanceof InferenceVariable ||
psiClass instanceof PsiTypeParameter && InferenceSession.isFreshVariable((PsiTypeParameter)psiClass)) return true;
return false;
}
boolean isFullyIncorporated() {
boolean needFurtherIncorporation = false;
for (InferenceVariable inferenceVariable : mySession.getInferenceVariables()) {
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/ReturnConstraintsWithCaptureIncorporationOfFreshVariables.java
+16
View File
@@ -0,0 +1,16 @@
import java.util.List;
import java.util.function.Function;
class Test {
void foo(Function<String, List<String>> f) {
DS<List<String>> ds = flatMap(f);
}
public <R> Operator<R, ?> flatMap(Function<String, R> flatMapper) {
return null;
}
}
class Operator<OUT, O extends Operator<OUT, O>> extends DS<OUT> {}
class DS<OUT> {}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java
+4
View File
@@ -303,6 +303,10 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase
doTest();
}
public void testReturnConstraintsWithCaptureIncorporationOfFreshVariables() throws Exception {
doTest();
}
private void doTest() throws Exception {
doTest(false);
}