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

method refs: mark as potentially incompatible expression based reference of non-static method with incorrect number of parameters; contradict spec (15.12.2.1)

Browse Source
This commit is contained in:
Anna Kozlova
2014-11-26 13:36:00 +01:00
parent f852923268
commit 68cc2ec0a2
4 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-psi-api/src/com/intellij/psi/PsiMethodReferenceUtil.java
View File

@@ -178,7 +178,7 @@ public class PsiMethodReferenceUtil {
PsiClassType.ClassResolveResult result = PsiUtil.resolveGenericsClassInType(type);
containingClass = result.getElement();
if (containingClass != null) {
substitutor = result.getSubstitutor();
return new QualifierResolveResult(containingClass, result.getSubstitutor(), true);
}
}
}

9
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiMethodReferenceExpressionImpl.java
View File

@@ -97,8 +97,8 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
final PsiElement element = resolveResult.getElement();
if (element instanceof PsiMethod) {
final boolean isStatic = ((PsiMethod)element).hasModifierProperty(PsiModifier.STATIC);
final int parametersCount = ((PsiMethod)element).getParameterList().getParametersCount();
if (qualifierResolveResult.isReferenceTypeQualified() && getReferenceNameElement() instanceof PsiIdentifier) {
final int parametersCount = ((PsiMethod)element).getParameterList().getParametersCount();
if (parametersCount == interfaceArity && isStatic) {
return true;
}
@@ -106,8 +106,11 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
return true;
}
if (((PsiMethod)element).isVarArgs()) return true;
} else if (!isStatic) {
return true;
}
else if (!isStatic) {
if (parametersCount == interfaceArity || ((PsiMethod)element).isVarArgs()) {
return true;
}
}
} else if (element instanceof PsiClass) {
return true;

40
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/PotentialCompatibilityWithInvalidShape.java Normal file
View File

@@ -0,0 +1,40 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.function.Function;
class Test {
private List<String> query(String request) {
System.out.println(request);
return null;
}
private List<String> <warning descr="Private method 'query(java.lang.String, java.lang.Object)' is never used">query</warning>(String request, Object context) {
System.out.println(request + context);
return null;
}
private List<String> <warning descr="Private method 'query1()' is never used">query1</warning>(){ return null;}
private List<String> <warning descr="Private method 'query1(java.lang.String)' is never used">query1</warning>(String request) {
System.out.println(request);
return null;
}
private List<String> <warning descr="Private method 'query1(java.lang.String, java.lang.Object)' is never used">query1</warning>(String request, Object context) {
System.out.println(request + context);
return null;
}
private static <Message, Reply> Set<Message> replyWith(Function<Message, List<Reply>> futureFn){
System.out.println(futureFn);
return null;
}
private static <Message, Reply> Set<Message> <warning descr="Private method 'replyWith(java.util.concurrent.Callable<java.util.List<Reply>>)' is never used">replyWith</warning>(Callable<List<Reply>> fn) {
System.out.println(fn);
return null;
}
{
Set<String> m = replyWith(this::query);
System.out.println(m);
Set<String> m1 = replyWith<error descr="Ambiguous method call: both 'Test.replyWith(Function<String, List<String>>)' and 'Test.replyWith(Callable<List<String>>)' match">(this::query1)</error>;
System.out.println(m1);
}
}

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

@@ -334,6 +334,10 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
doTest(true);
}
public void testPotentialCompatibilityWithInvalidShape() throws Exception {
doTest(true);
}
private void doTest() {
doTest(false);
}