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

new inference: incomplete methods ready

Browse Source 
(cherry picked from commit 59177525941b8cb78cb8f99d7402e9528c8894ad)
This commit is contained in:
anna
2013-11-21 12:57:28 +01:00
parent 9ac34fc2ce
commit a6e99dd587
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/CheckedExceptionCompatibilityConstraint.java
View File

@@ -78,7 +78,6 @@ public class CheckedExceptionCompatibilityConstraint extends InputOutputConstrai
if (!session.isProperType(substitutor.substitute(parameter.getType()))) return false;
}
final PsiType returnType = interfaceMethod.getReturnType();
LOG.assertTrue(returnType != null, interfaceMethod);
if (!session.isProperType(substitutor.substitute(returnType))) return false;
final List<PsiType>

5
java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/graphInference/constraints/PsiMethodReferenceCompatibilityConstraint.java
View File

@@ -54,7 +54,6 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
final PsiSubstitutor substitutor = LambdaUtil.getSubstitutor(interfaceMethod, classResolveResult);
final PsiParameter[] targetParameters = interfaceMethod.getParameterList().getParameters();
final PsiType returnType = substitutor.substitute(interfaceMethod.getReturnType());
LOG.assertTrue(returnType != null, interfaceMethod);
final PsiType[] typeParameters = myExpression.getTypeParameters();
if (!myExpression.isExact()) {
for (PsiParameter parameter : targetParameters) {
@@ -105,7 +104,7 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
} else {
return false;
}
if (returnType != PsiType.VOID) {
if (returnType != PsiType.VOID && returnType != null) {
if (applicableMethodReturnType == PsiType.VOID) {
return false;
}
@@ -126,7 +125,7 @@ public class PsiMethodReferenceCompatibilityConstraint implements ConstraintForm
return false;
}
if (PsiType.VOID.equals(returnType)) {
if (PsiType.VOID.equals(returnType) || returnType == null) {
return true;
}