MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-30 10:20:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

method ref: don't check method reference qualifier against functional interface (IDEA-141343)

Browse Source
This commit is contained in:
Anna Kozlova
2015-06-11 16:02:01 +03:00
parent d4b8045556
commit 74f9ac5a46
3 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java
View File

@@ -336,7 +336,8 @@ public class ExceptionUtil {
final JavaResolveResult resolveResult = methodReferenceExpression.advancedResolve(false);
final PsiElement resolve = resolveResult.getElement();
if (resolve instanceof PsiMethod) {
return getUnhandledExceptions((PsiMethod)resolve, methodReferenceExpression, topElement, resolveResult.getSubstitutor());
final PsiElement referenceNameElement = methodReferenceExpression.getReferenceNameElement();
return getUnhandledExceptions((PsiMethod)resolve, referenceNameElement, topElement, resolveResult.getSubstitutor());
}
return Collections.emptyList();
}
@@ -667,12 +668,9 @@ public class ExceptionUtil {
// like in void f() throws XXX { new AA(methodThrowingXXX()) { ... }; }
return parent instanceof PsiAnonymousClass && isHandled(parent, exceptionType, topElement);
}
else if (parent instanceof PsiLambdaExpression) {
final PsiType interfaceType = ((PsiLambdaExpression)parent).getFunctionalInterfaceType();
return isDeclaredBySAMMethod(exceptionType, interfaceType);
}
else if (element instanceof PsiMethodReferenceExpression) {
final PsiType interfaceType = ((PsiMethodReferenceExpression)element).getFunctionalInterfaceType();
else if (parent instanceof PsiLambdaExpression ||
parent instanceof PsiMethodReferenceExpression && element == ((PsiMethodReferenceExpression)parent).getReferenceNameElement()) {
final PsiType interfaceType = ((PsiFunctionalExpression)parent).getFunctionalInterfaceType();
return isDeclaredBySAMMethod(exceptionType, interfaceType);
}
else if (parent instanceof PsiClassInitializer) {

17
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/newMethodRef/UnhandledExceptionsInQualifier.java Normal file
View File

@@ -0,0 +1,17 @@
class E1 extends Exception {}
class E2 extends Exception {}
class Test {
interface I {
void m() throws E1;
}
void a(I i) {}
Test b() throws E2 {return this;}
void c() throws E1 {}
void e() throws E1, E2 {}
void d() throws E2 {
a(b()::c);
a(<error descr="Unhandled exception: E2">this::e</error>);
}
}

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

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