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

method refs: resolve default constructor

Browse Source
This commit is contained in:
anna
2012-10-04 19:56:37 +02:00
parent 43ddd9311a
commit 4eeaeb4f2f
4 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/java-psi-api/src/com/intellij/psi/LambdaUtil.java
View File

@@ -581,15 +581,14 @@ public class LambdaUtil {
map.remove(methodReferenceExpression);
}
final PsiElement resolve = result.getElement();
if (resolve instanceof PsiMethod) {
final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(left);
final PsiMethod method = getFunctionalInterfaceMethod(resolveResult);
if (method != null) {
final Ref<PsiClass> classRef = new Ref<PsiClass>();
final Ref<PsiSubstitutor> substRef = new Ref<PsiSubstitutor>();
methodReferenceExpression.process(classRef, substRef);
final PsiElement resolve = result.getElement();
if (resolve instanceof PsiMethod) {
final MethodSignature signature1 = method.getSignature(resolveResult.getSubstitutor());
PsiSubstitutor subst = PsiSubstitutor.EMPTY;
subst = subst.putAll(substRef.get());
@@ -601,6 +600,18 @@ public class LambdaUtil {
if (interfaceReturnType != null && methodReturnType != null && interfaceReturnType != PsiType.VOID &&
!TypeConversionUtil.isAssignable(interfaceReturnType, methodReturnType)) return false;
if (areAcceptable(signature1, signature2, classRef.get(), substRef.get(), ((PsiMethod)resolve).isVarArgs())) return true;
} else if (resolve instanceof PsiClass) {
final PsiType interfaceReturnType = getFunctionalInterfaceReturnType(left);
if (interfaceReturnType != null) {
final PsiClassType classType = JavaPsiFacade.getElementFactory(methodReferenceExpression.getProject()).createType((PsiClass)resolve, result.getSubstitutor());
if (TypeConversionUtil.isAssignable(interfaceReturnType, classType)) {
final PsiParameter[] parameters = method.getParameterList().getParameters();
if (parameters.length == 0) return true;
if (parameters.length == 1) {
if (isReceiverType(resolveResult.getSubstitutor().substitute(parameters[0].getType()), classRef.get(), substRef.get())) return true;
}
}
}
}
}
return false;

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

@@ -26,6 +26,7 @@ import com.intellij.psi.impl.source.resolve.ResolveCache;
import com.intellij.psi.impl.source.tree.ChildRole;
import com.intellij.psi.impl.source.tree.JavaElementType;
import com.intellij.psi.infos.CandidateInfo;
import com.intellij.psi.infos.ClassCandidateInfo;
import com.intellij.psi.infos.MethodCandidateInfo;
import com.intellij.psi.scope.ElementClassFilter;
import com.intellij.psi.scope.JavaScopeProcessorEvent;
@@ -255,6 +256,9 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
new MethodReferenceConflictResolver(containingClass, substitutor, signature, beginsWithReferenceType);
final PsiConflictResolver[] resolvers;
if (signature != null) {
if (isConstructor && containingClass.getConstructors().length == 0 && !containingClass.isEnum() && !containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
return new JavaResolveResult[]{new ClassCandidateInfo(containingClass, substitutor)};
}
final PsiType[] parameterTypes = signature.getParameterTypes();
resolvers = new PsiConflictResolver[]{conflictResolver,
new JavaMethodsConflictResolver(PsiMethodReferenceExpressionImpl.this, parameterTypes) {
@@ -312,10 +316,11 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
}
if (beginsWithReferenceType) {
if (containingClass.getContainingClass() == null || !containingClass.hasModifierProperty(PsiModifier.STATIC)) {
final PsiClass gContainingClass = containingClass.getContainingClass();
if (gContainingClass == null || !containingClass.hasModifierProperty(PsiModifier.STATIC)) {
PsiClass aClass = null;
if (PsiTreeUtil.isAncestor(containingClass, PsiMethodReferenceExpressionImpl.this, false)) {
aClass = containingClass;
if (PsiTreeUtil.isAncestor(gContainingClass != null ? gContainingClass : containingClass, PsiMethodReferenceExpressionImpl.this, false)) {
aClass = gContainingClass != null ? gContainingClass : containingClass;
}
if (PsiUtil.getEnclosingStaticElement(PsiMethodReferenceExpressionImpl.this, aClass) != null) {
processor.handleEvent(JavaScopeProcessorEvent.START_STATIC, null);
@@ -354,12 +359,9 @@ public class PsiMethodReferenceExpressionImpl extends PsiReferenceExpressionBase
boolean hasReceiver = false;
final PsiType[] parameterTypes = mySignature.getParameterTypes();
if (parameterTypes.length > 0) {
final PsiClassType.ClassResolveResult classResolveResult = PsiUtil.resolveGenericsClassInType(parameterTypes[0]);
if (LambdaUtil.isReceiverType(parameterTypes[0], myContainingClass, mySubstitutor)) {
if (parameterTypes.length > 0 && LambdaUtil.isReceiverType(parameterTypes[0], myContainingClass, mySubstitutor)) {
hasReceiver = true;
}
}
final List<CandidateInfo> firstCandidates = new ArrayList<CandidateInfo>();
final List<CandidateInfo> secondCandidates = new ArrayList<CandidateInfo>();

36
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/methodRef/DefaultConstructor.java Normal file
View File

@@ -0,0 +1,36 @@
class DefaultConstructor {
interface I1<R> {
R invoke();
}
interface I2<R, A> {
R invoke(A a);
}
static class Outer {
class Inner {
}
static void test1() {
I2<Inner, Outer> i2 = Inner :: new;
<error descr="Incompatible types. Found: '<method reference>', required: 'DefaultConstructor.I2<DefaultConstructor.Outer.Inner,java.lang.String>'">I2<Inner, String> i2str = Inner :: new;</error>
}
void test2() {
I1<Inner> i1 = Inner :: new;
<error descr="Incompatible types. Found: '<method reference>', required: 'DefaultConstructor.I1<java.lang.Integer>'">I1<Integer> i1Int = Inner :: new;</error>
I2<Inner, Outer> i2 = Inner :: new;
}
}
static void test1() {
I2<Outer.Inner, Outer> i2 = Outer.Inner::new;
<error descr="Incompatible types. Found: '<method reference>', required: 'DefaultConstructor.I2<DefaultConstructor.Outer.Inner,java.lang.String>'">I2<Outer.Inner, String> i2str = Outer.Inner::new;</error>
}
void test2() {
I2<Outer.Inner, Outer> i2 = Outer.Inner::new;
<error descr="Incompatible types. Found: '<method reference>', required: 'DefaultConstructor.I2<DefaultConstructor.Outer.Inner,java.lang.String>'">I2<Outer.Inner, String> i2str = Outer.Inner::new;</error>
}
}

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

@@ -101,6 +101,10 @@ public class MethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testDefaultConstructor() throws Exception {
doTest();
}
public void testReturnTypeSpecific() throws Exception {
doTest(true);
}