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

new inference: void compatible according to return values

Browse Source
This commit is contained in:
Anna Kozlova
2013-09-23 19:50:38 +04:00
parent 939fc453f5
commit 7bc0048fc8
1 changed files with 5 additions and 5 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/constraints/LambdaExpressionCompatibilityConstraint.java
+5 -5
View File
@@ -2,7 +2,6 @@ package com.intellij.psi.impl.source.resolve.graphInference.constraints;
import com.intellij.psi.*;
import com.intellij.psi.impl.source.resolve.graphInference.InferenceSession;
import com.intellij.psi.impl.source.resolve.graphInference.InferenceVariable;
import com.intellij.psi.util.PsiUtil;
import java.util.List;
@@ -52,16 +51,17 @@ public class LambdaExpressionCompatibilityConstraint implements ConstraintFormul
final PsiType returnType = interfaceMethod.getReturnType();
if (returnType != null) {
final List<PsiExpression> returnExpressions = LambdaUtil.getReturnExpressions(myExpression);
if (returnType.equals(PsiType.VOID)) {
if (!myExpression.isVoidCompatible() && !(myExpression.getBody() instanceof PsiExpression)) {
if (!returnExpressions.isEmpty() && !(myExpression.getBody() instanceof PsiExpression)) {
return false;
}
} else {
if (myExpression.isVoidCompatible()) { //not value-compatible
if (returnExpressions.isEmpty()) { //not value-compatible
return false;
}
for (PsiExpression returnExpressions : LambdaUtil.getReturnExpressions(myExpression)) {
constraints.add(new ExpressionCompatibilityConstraint(returnExpressions, substitutor.substitute(returnType)));
for (PsiExpression returnExpression : returnExpressions) {
constraints.add(new ExpressionCompatibilityConstraint(returnExpression, substitutor.substitute(returnType)));
}
}
}