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

new overload resolution: don't treat array type of functional interfaces as functional interface (IDEA-148726)

Browse Source
This commit is contained in:
Anna Kozlova
2015-12-02 16:57:49 +01:00
parent 80ff639c5d
commit e8111b751e
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1510,7 +1510,9 @@ public class InferenceSession {
for (int i = 0; i < paramsLength; i++) {
PsiType sType = getParameterType(parameters1, i, siteSubstitutor1, false);
PsiType tType = session.substituteWithInferenceVariables(getParameterType(parameters2, i, siteSubstitutor1, varargs));
if (LambdaUtil.isFunctionalType(sType) && LambdaUtil.isFunctionalType(tType) && !relates(sType, tType)) {
if (sType instanceof PsiClassType &&
tType instanceof PsiClassType &&
LambdaUtil.isFunctionalType(sType) && LambdaUtil.isFunctionalType(tType) && !relates(sType, tType)) {
if (!isFunctionalTypeMoreSpecific(sType, tType, session, args[i])) {
return false;
}
@@ -1590,7 +1592,8 @@ public class InferenceSession {
final List<PsiExpression> returnExpressions = LambdaUtil.getReturnExpressions((PsiLambdaExpression)arg);
if (LambdaUtil.isFunctionalType(sReturnType) && LambdaUtil.isFunctionalType(tReturnType) &&
if (sReturnType instanceof PsiClassType && tReturnType instanceof PsiClassType &&
LambdaUtil.isFunctionalType(sReturnType) && LambdaUtil.isFunctionalType(tReturnType) &&
!TypeConversionUtil.isAssignable(TypeConversionUtil.erasure(sReturnType), TypeConversionUtil.erasure(tReturnType)) &&
!TypeConversionUtil.isAssignable(TypeConversionUtil.erasure(tReturnType), TypeConversionUtil.erasure(sReturnType))) {

15
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/FunctionalInterfacesAtVarargsPositionMostSpecificCheck.java Normal file
View File

@@ -0,0 +1,15 @@
class Test {
private static <T> void test(Class<T> cls, Runnable... objs) {
System.out.println(cls);
System.out.println(objs);
}
private static <K> void <warning descr="Private method 'test(K, java.lang.Runnable...)' is never used">test</warning>(K obj, Runnable... objs) {
System.out.println(obj);
System.out.println(objs);
}
public static void main(String[] args) {
test(String.class, new Runnable[1]);
}
}

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

@@ -179,6 +179,10 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testFunctionalInterfacesAtVarargsPositionMostSpecificCheck() throws Exception {
doTest();
}
private void doTest() {
doTest(true);
}