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

lambda: incompatible lambda parameters type check fixed according to wildcards (IDEA-99073)

Browse Source
This commit is contained in:
anna
2013-01-16 14:08:52 +01:00
parent 92592d68f4
commit 4cbc38008a
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,8 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(functionalInterfaceType);
for (int i = 0; i < lambdaParameters.length; i++) {
PsiParameter lambdaParameter = lambdaParameters[i];
if (!TypeConversionUtil.isAssignable(LambdaUtil.getSubstitutor(interfaceMethod, resolveResult).substitute(parameters[i].getType()), lambdaParameter.getType())) {
if (!TypeConversionUtil.isAssignable(lambdaParameter.getType(),
GenericsUtil.eliminateWildcards(LambdaUtil.getSubstitutor(interfaceMethod, resolveResult).substitute(parameters[i].getType())))) {
myHolder.add(HighlightInfo.createHighlightInfo(HighlightInfoType.ERROR, lambdaParameter, incompatibleTypesMessage));
break;
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/params/FormalParamsWithWildcards.java Normal file
View File

@@ -0,0 +1,9 @@
class Test {
public interface I<K, V> {
public V put(K k);
}
{
final I<? super Long, CharSequence> i = (Number n) -> n.toString();
}
}

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

@@ -1,7 +1,7 @@
class Test {
{
<error descr="Incompatible types. Found: '<lambda expression>', required: 'java.lang.Comparable'">Comparable c = (String o)->{
Comparable c = (<error descr="Incompatible parameter types in lambda expression">String o</error>)->{
return 0;
};</error>
};
}
}

4
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaParamsTest.java
View File

@@ -41,6 +41,10 @@ public class LambdaParamsTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testFormalParamsWithWildcards() throws Exception {
doTest();
}
private void doTest() throws Exception {
doTest(BASE_PATH + "/" + getTestName(false) + ".java", false, false);
}