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

lambda: correct message when lambda params are incompatible (IDEA-91016)

Browse Source
This commit is contained in:
Anna Kozlova
2012-09-04 21:04:02 +04:00
parent 5e80cdafb8
commit f73177c04e
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightVisitorImpl.java
View File

@@ -41,6 +41,7 @@ import com.intellij.psi.javadoc.PsiDocTagValue;
import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.psi.util.TypeConversionUtil;
import com.intellij.psi.xml.XmlAttributeValue;
import gnu.trove.THashMap;
import gnu.trove.TObjectIntHashMap;
@@ -255,6 +256,25 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
final String incompatibleReturnTypesMessage = LambdaUtil.checkReturnTypeCompatible(expression, LambdaUtil.getFunctionalInterfaceReturnType(functionalInterfaceType));
if (incompatibleReturnTypesMessage != null) {
myHolder.add(HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, expression, incompatibleReturnTypesMessage));
} else {
final PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(functionalInterfaceType);
if (interfaceMethod != null) {
final PsiParameter[] parameters = interfaceMethod.getParameterList().getParameters();
final PsiParameter[] lambdaParameters = expression.getParameterList().getParameters();
final String incompatibleTypesMessage = "Incompatible parameter types in lambda expression";
if (lambdaParameters.length != parameters.length) {
myHolder.add(HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, expression, incompatibleTypesMessage));
} else {
final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(functionalInterfaceType);
for (int i = 0; i < lambdaParameters.length; i++) {
PsiParameter lambdaParameter = lambdaParameters[i];
if (!TypeConversionUtil.isAssignable(resolveResult.getSubstitutor().substitute(parameters[i].getType()), lambdaParameter.getType())) {
myHolder.add(HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, lambdaParameter, incompatibleTypesMessage));
break;
}
}
}
}
}
}
}

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

@@ -27,7 +27,7 @@ class Test {
I i = flag ? (() -> 123) : (() -> 222);
I i1 = flag ? (<error descr="Missing return value">() -> {}</error>) : (() -> 222);
Object i2 = flag ? (<error descr="Target type of a lambda conversion must be an interface">() -> 42</error>) : (<error descr="Target type of a lambda conversion must be an interface">() -> 222</error>);
<error descr="Incompatible types. Found: '<lambda expression>', required: 'Test.I'">I i3 = flag ? ((x) -> 42) : (() -> 222);</error>
I i3 = flag ? (<error descr="Incompatible parameter types in lambda expression">(x) -> 42</error>) : (() -> 222);
I i4 = flag ? (() -> 42) : new I() {
@Override
public int m() {

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/params/FormalParams.java
View File

@@ -11,8 +11,8 @@ class Foo {
};
void bazz() {
bar<error descr="'bar(I)' in 'Foo' cannot be applied to '(<lambda expression>)'">((String s) -> {
System.out.println(s);})</error>;
bar((<error descr="Incompatible parameter types in lambda expression">String s</error>) -> {
System.out.println(s);});
bar((int i) -> {System.out.println(i);});
}
void bar(I i){}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/params/IncompatibleTypes.java
View File

@@ -1,7 +1,7 @@
class XXX {
Runnable bar() {
<error descr="Incompatible types. Found: '<lambda expression>', required: 'java.lang.Runnable'">return (o)->{
return <error descr="Incompatible parameter types in lambda expression">(o)->{
System.out.println();
};</error>
}</error>;
}
}