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

method refs: restore error on invalid array creation

Browse Source
This commit is contained in:
Anna Kozlova
2014-02-21 21:42:49 +01:00
parent 07de1517e5
commit 0f39a4ca18
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,11 +17,9 @@ package com.intellij.psi.impl.source.tree.java;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.TextRange;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiManagerEx;
import com.intellij.psi.impl.source.resolve.ParameterTypeInferencePolicy;
@@ -62,18 +60,14 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
super(JavaElementType.METHOD_REF_EXPRESSION);
}
public static boolean onArrayType(PsiClass containingClass, MethodSignature signature) {
private static boolean arrayCreationSignature(MethodSignature signature) {
if (arrayCompatibleSignature(signature.getParameterTypes(), new Function<PsiType[], PsiType>() {
@Override
public PsiType fun(PsiType[] types) {
return types[0];
}
})) {
if (containingClass != null) {
final Project project = containingClass.getProject();
final LanguageLevel level = PsiUtil.getLanguageLevel(containingClass);
return containingClass == JavaPsiFacade.getElementFactory(project).getArrayClass(level);
}
return true;
}
return false;
}
@@ -438,9 +432,9 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
substitutor = session.infer();
}
ClassCandidateInfo candidateInfo = null;
if ((containingClass.getContainingClass() == null || !isLocatedInStaticContext(containingClass)) &&
signature.getParameterTypes().length == 0 ||
onArrayType(containingClass, signature)) {
final boolean isArray = containingClass == JavaPsiFacade.getElementFactory(getProject()).getArrayClass(PsiUtil.getLanguageLevel(containingClass));
if (!isArray && (containingClass.getContainingClass() == null || !isLocatedInStaticContext(containingClass)) && signature.getParameterTypes().length == 0 ||
isArray && arrayCreationSignature(signature)) {
candidateInfo = new ClassCandidateInfo(containingClass, substitutor);
}
return candidateInfo == null ? JavaResolveResult.EMPTY_ARRAY : new JavaResolveResult[]{candidateInfo};

11
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/IncorrectArrayCreationSignature.java Normal file
View File

@@ -0,0 +1,11 @@
class Test {
interface I {
Object m();
}
void m(I i) {}
{
m<error descr="'m(Test.I)' in 'Test' cannot be applied to '(<method reference>)'">(String[]::new)</error>;
}
}

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

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