MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 05:21:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

inference: partially resolve before erasure for target type inference

Browse Source 
IDEA-192208
This commit is contained in:
Anna Kozlova
2018-05-28 15:10:05 +03:00
parent 331c0f0cab
commit ab271fcb5b
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
View File

@@ -654,13 +654,9 @@ public class InferenceSession {
public void registerReturnTypeConstraints(PsiType returnType, PsiType targetType, PsiElement context) {
returnType = substituteWithInferenceVariables(returnType);
if (myErased) {
final InferenceVariable inferenceVariable = getInferenceVariable(returnType);
if (inferenceVariable != null) {
final PsiSubstitutor substitutor = resolveSubset(Collections.singletonList(inferenceVariable), mySiteSubstitutor);
returnType = substitutor.substitute(inferenceVariable);
if (returnType == null) return;
}
addConstraint(new TypeCompatibilityConstraint(targetType, TypeConversionUtil.erasure(returnType)));
PsiSubstitutor currentSubstitutor = resolveSubset(myInferenceVariables, mySiteSubstitutor);
addConstraint(new TypeCompatibilityConstraint(targetType,
TypeConversionUtil.erasure(currentSubstitutor.substitute(returnType))));
}
else if (FunctionalInterfaceParameterizationUtil.isWildcardParameterized(returnType)) {
final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(returnType);

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/FreshVariablesBounds.java Normal file
View File

@@ -0,0 +1,10 @@
abstract class MyTest {
interface A<S> {}
interface B<K> {}
abstract <_B, _P extends A<_B>> _P foo(B<_B> data);
public void m(B b) {
final A a = foo(b);
}
}

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

@@ -191,6 +191,7 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase
public void testVarargsMethodPreferred() { doTest(); }
public void testSameNamedFreshVariables() { doTest(); }
public void testEnsureOrderOfFreshVariablesWhenCaptureNonProperTypes() { doTest(); }
public void testFreshVariablesBounds() { doTest(); }
public void testApplicabilityCheckFailsExpressionTypeCheckPasses() {
doTest();