MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

method reference: distinguish captured wildcards by target parameters (IDEA-170340)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-03-28 10:09:30 +02:00
parent 9f3dfc8629
commit 3da240cba6
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/InferenceSession.java
+2 -2
View File
@@ -1603,7 +1603,7 @@ public class InferenceSession {
for (int i = 0; i < functionalMethodParameters.length; i++) {
final PsiType pType = signature.getParameterTypes()[i];
addConstraint(new TypeCompatibilityConstraint(substituteWithInferenceVariables(getParameterType(parameters, i, psiSubstitutor, varargs)),
PsiUtil.captureToplevelWildcards(pType, reference)));
PsiUtil.captureToplevelWildcards(pType, functionalMethodParameters[i])));
}
}
else if (PsiMethodReferenceUtil.isResolvedBySecondSearch(reference, signature, varargs, isStatic, parameters.length)) { //instance methods
@@ -1650,7 +1650,7 @@ public class InferenceSession {
for (int i = 0; i < signature.getParameterTypes().length - 1; i++) {
final PsiType interfaceParamType = signature.getParameterTypes()[i + 1];
addConstraint(new TypeCompatibilityConstraint(substituteWithInferenceVariables(getParameterType(parameters, i, psiSubstitutor, varargs)),
PsiUtil.captureToplevelWildcards(interfaceParamType, reference)));
PsiUtil.captureToplevelWildcards(interfaceParamType, functionalMethodParameters[i])));
}
}
java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
+13 -10
View File
@@ -143,7 +143,7 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
final PsiType[] argTypes = signature.getParameterTypes();
boolean hasReceiver = PsiMethodReferenceUtil.isSecondSearchPossible(argTypes, qualifierResolveResult, reference);
return MethodReferenceConflictResolver.isApplicableByFirstSearch(this, argTypes, hasReceiver, reference, interfaceMethod.isVarArgs()) != null;
return MethodReferenceConflictResolver.isApplicableByFirstSearch(this, argTypes, hasReceiver, reference, interfaceMethod.isVarArgs(), interfaceMethod) != null;
}
};
}
@@ -192,8 +192,7 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
PsiMethodReferenceUtil.QualifierResolveResult qualifierResolveResult,
PsiMethod interfaceMethod,
MethodSignature signature) {
return new MethodReferenceConflictResolver(referenceExpression, qualifierResolveResult, signature,
interfaceMethod != null && interfaceMethod.isVarArgs());
return new MethodReferenceConflictResolver(referenceExpression, qualifierResolveResult, signature, interfaceMethod);
}
private static PsiClassType composeReturnType(PsiClass containingClass, PsiSubstitutor substitutor) {
@@ -203,18 +202,20 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
private static class MethodReferenceConflictResolver extends JavaMethodsConflictResolver {
private final MethodSignature mySignature;
private final PsiMethod myInterfaceMethod;
private final PsiMethodReferenceExpressionImpl myReferenceExpression;
private final PsiMethodReferenceUtil.QualifierResolveResult myQualifierResolveResult;
private final boolean myFunctionalMethodVarArgs;
private MethodReferenceConflictResolver(PsiMethodReferenceExpressionImpl referenceExpression,
PsiMethodReferenceUtil.QualifierResolveResult qualifierResolveResult,
@Nullable MethodSignature signature, boolean varArgs) {
@Nullable MethodSignature signature, PsiMethod interfaceMethod) {
super(referenceExpression, signature != null ? signature.getParameterTypes() : PsiType.EMPTY_ARRAY, PsiUtil.getLanguageLevel(referenceExpression));
myReferenceExpression = referenceExpression;
myQualifierResolveResult = qualifierResolveResult;
myFunctionalMethodVarArgs = varArgs;
myFunctionalMethodVarArgs = interfaceMethod != null && interfaceMethod.isVarArgs();
mySignature = signature;
myInterfaceMethod = interfaceMethod;
}
@Override
@@ -244,7 +245,7 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
for (CandidateInfo conflict : conflicts) {
if (!(conflict instanceof MethodCandidateInfo)) continue;
final Boolean applicableByFirstSearch = isApplicableByFirstSearch(conflict, argTypes, hasReceiver, myReferenceExpression, myFunctionalMethodVarArgs);
final Boolean applicableByFirstSearch = isApplicableByFirstSearch(conflict, argTypes, hasReceiver, myReferenceExpression, myFunctionalMethodVarArgs, myInterfaceMethod);
if (applicableByFirstSearch != null) {
(applicableByFirstSearch ? firstCandidates : secondCandidates).add(conflict);
}
@@ -286,7 +287,8 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
PsiType[] functionalInterfaceParamTypes,
boolean hasReceiver,
PsiMethodReferenceExpression referenceExpression,
boolean functionalMethodVarArgs) {
boolean functionalMethodVarArgs,
PsiMethod interfaceMethod) {
final PsiMethod psiMethod = ((MethodCandidateInfo)conflict).getElement();
@@ -299,13 +301,13 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
}
if ((varargs || functionalInterfaceParamTypes.length == parameterTypes.length) &&
isCorrectAssignment(parameterTypes, functionalInterfaceParamTypes, varargs, referenceExpression, conflict, 0)) {
isCorrectAssignment(parameterTypes, functionalInterfaceParamTypes, interfaceMethod, varargs, referenceExpression, conflict, 0)) {
return true;
}
if (hasReceiver &&
(varargs || functionalInterfaceParamTypes.length == parameterTypes.length + 1) &&
isCorrectAssignment(parameterTypes, functionalInterfaceParamTypes, varargs, referenceExpression, conflict, 1)) {
isCorrectAssignment(parameterTypes, functionalInterfaceParamTypes, interfaceMethod, varargs, referenceExpression, conflict, 1)) {
return false;
}
return null;
@@ -313,13 +315,14 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
private static boolean isCorrectAssignment(PsiType[] parameterTypes,
PsiType[] functionalInterfaceParamTypes,
PsiMethod interfaceMethod,
boolean varargs,
PsiMethodReferenceExpression referenceExpression,
CandidateInfo conflict,
int offset) {
final int min = Math.min(parameterTypes.length, functionalInterfaceParamTypes.length - offset);
for (int i = 0; i < min; i++) {
final PsiType argType = PsiUtil.captureToplevelWildcards(functionalInterfaceParamTypes[i + offset], referenceExpression);
final PsiType argType = PsiUtil.captureToplevelWildcards(functionalInterfaceParamTypes[i + offset], interfaceMethod.getParameterList().getParameters()[i]);
final PsiType parameterType = parameterTypes[i];
if (varargs && i == parameterTypes.length - 1) {
if (!TypeConversionUtil.isAssignable(parameterType, argType) &&
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/DistinguishCapturedWildcardsByDifferentParameters.java
+11
View File
@@ -0,0 +1,11 @@
import java.util.function.BiConsumer;
import java.util.function.Predicate;
class MyTest {
{
BiConsumer<Predicate<? extends Runnable>, Predicate<? extends Runnable>> or = MyTest::<error descr="Invalid method reference: Predicate<capture of ? extends Runnable> cannot be converted to Predicate<E>">or</error>;
}
private static <E extends Runnable> void or(Predicate<E> left, Predicate<E> right) {}
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
+1
View File
@@ -168,6 +168,7 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testMethodInInheritorFoundBySecondSearch() { doTest(); }
public void testNonExactMethodReferenceOnRawClassType() { doTest(); }
public void testMethodREfToContainingMethodWithGenericParam() { doTest(); }
public void testDistinguishCapturedWildcardsByDifferentParameters() throws Exception { doTest(); }
private void doTest() {
doTest(false);