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

lambda: relax incompatible return type in case of void functional types

Browse Source
This commit is contained in:
anna
2012-12-17 17:30:52 +01:00
parent 44ab4d534a
commit 963b2ed293
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-psi-api/src/com/intellij/psi/LambdaHighlightingUtil.java
View File

@@ -41,10 +41,10 @@ public class LambdaHighlightingUtil {
if (body instanceof PsiCodeBlock) {
if (!LambdaUtil.getReturnExpressions(lambdaExpression).isEmpty()) return "Unexpected return value";
} else if (body instanceof PsiExpression) {
final PsiType type = ((PsiExpression)body).getType();
/*final PsiType type = ((PsiExpression)body).getType();
if (type != PsiType.VOID) {
return "Incompatible return type " + (type == PsiType.NULL || type == null ? "<null>" : type.getPresentableText()) +" in lambda expression";
}
}*/
}
} else if (functionalInterfaceReturnType != null) {
final List<PsiExpression> returnExpressions = LambdaUtil.getReturnExpressions(lambdaExpression);

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/IncompatibleReturnTypes.java
View File

@@ -7,7 +7,7 @@ class Test1 {
VoidReturnType aI = () -> System.out.println();
VoidReturnType aI1 = () -> {System.out.println();};
VoidReturnType aI2 = <error descr="Unexpected return value">() -> {return 1;}</error>;
VoidReturnType aI3 = <error descr="Incompatible return type int in lambda expression">() -> 1</error>;
VoidReturnType aI3 = () -> 1;
VoidReturnType aI4 = () -> {return;};
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/TypeArgsConsistencyWithoutParams.java
View File

@@ -20,7 +20,7 @@ class Test5 {
static <T> void bar(I<T> i){}
{
bar(<error descr="Incompatible return type <null> in lambda expression">() -> null</error>);
bar(<error descr="Incompatible parameter types in lambda expression">() -> null</error>);
}
}
class Test6 {
@@ -31,7 +31,7 @@ class Test6 {
static <T> void bar(I<T> i){}
{
bar(<error descr="Incompatible return type <null> in lambda expression">() -> null</error>);
bar(() -> null);
bar(() -> {});
}
}