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: ignore already handled exceptions (IDEA-137694)

Browse Source
This commit is contained in:
Anna Kozlova
2015-03-18 14:09:58 +01:00
parent 4ba0890182
commit dd1b0c2796
3 changed files with 32 additions and 41 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/constraints/CheckedExceptionCompatibilityConstraint.java
+14 -41
View File
@@ -103,51 +103,24 @@ public class CheckedExceptionCompatibilityConstraint extends InputOutputConstrai
}
final List<PsiType> thrownTypes = new ArrayList<PsiType>();
if (myExpression instanceof PsiLambdaExpression) {
final PsiElement body = ((PsiLambdaExpression)myExpression).getBody();
if (body != null) {
final List<PsiClassType> exceptions = ExceptionUtil.ourThrowsGuard.doPreventingRecursion(myExpression, false, new Computable<List<PsiClassType>>() {
final PsiElement body = myExpression instanceof PsiLambdaExpression ? ((PsiLambdaExpression)myExpression).getBody() : myExpression;
if (body != null) {
final List<PsiClassType> exceptions = ExceptionUtil.ourThrowsGuard.doPreventingRecursion(myExpression, false, new Computable<List<PsiClassType>>() {
@Override
public List<PsiClassType> compute() {
return ExceptionUtil.getUnhandledExceptions(new PsiElement[] {body});
}
});
if (exceptions != null) {
thrownTypes.addAll(ContainerUtil.filter(exceptions, new Condition<PsiClassType>() {
@Override
public List<PsiClassType> compute() {
return ExceptionUtil.getUnhandledExceptions(new PsiElement[] {body});
public boolean value(PsiClassType type) {
return !ExceptionUtil.isUncheckedException(type);
}
});
if (exceptions != null) {
thrownTypes.addAll(ContainerUtil.filter(exceptions, new Condition<PsiClassType>() {
@Override
public boolean value(PsiClassType type) {
return !ExceptionUtil.isUncheckedException(type);
}
}));
}
}
} else {
final PsiMethodReferenceUtil.QualifierResolveResult qualifierResolveResult = PsiMethodReferenceUtil.getQualifierResolveResult((PsiMethodReferenceExpression)myExpression);
final PsiSubstitutor psiSubstitutor = qualifierResolveResult.getSubstitutor();
final PsiMethod method;
if (((PsiMethodReferenceExpression)myExpression).isExact()) {
final PsiElement resolve = ((PsiMethodReferenceExpression)myExpression).getPotentiallyApplicableMember();
if (resolve instanceof PsiMethod) {
method = (PsiMethod)resolve;
} else {
method = null;
}
}
else {
method = interfaceMethod;
}
if (method != null) {
for (PsiType type : method.getThrowsList().getReferencedTypes()) {
type = psiSubstitutor.substitute(type);
if (type instanceof PsiClassType && !ExceptionUtil.isUncheckedException((PsiClassType)type)) {
thrownTypes.add(substitutor.substitute(type));
}
}
}));
}
}
if (expectedNonProperThrownTypes.isEmpty()) {
for (PsiType thrownType : thrownTypes) {
if (!isAddressed(expectedThrownTypes, thrownType)) return false;
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/SkipCheckedExceptionsHandledByInterfaceMethod.java
+14
View File
@@ -0,0 +1,14 @@
import java.io.IOException;
class MethodReferenceErrorHighlight {
{
match(String.class, this::foo);
}
<P> void match(final Class<P> type, UnitApply<P> apply) {}
void foo(String s) throws IOException { throw new IOException(); }
}
interface UnitApply<I> {
void apply(I i) throws Exception;
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/NewMethodRefHighlightingTest.java
+4
View File
@@ -394,6 +394,10 @@ public class NewMethodRefHighlightingTest extends LightDaemonAnalyzerTestCase {
doTest();
}
public void testSkipCheckedExceptionsHandledByInterfaceMethod() throws Exception {
doTest();
}
private void doTest() {
doTest(false);
}