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

local redundant throws should respect exception subclasses when checking inherited method exceptions

Browse Source
This commit is contained in:
Dmitry Batkovich
2018-07-02 18:41:09 +03:00
parent f3b53dec78
commit 89e0474bad
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/unneededThrows/RedundantThrowsDeclarationLocalInspection.java
+3 -7
View File
@@ -82,22 +82,18 @@ public class RedundantThrowsDeclarationLocalInspection extends AbstractBaseJavaL
if (candidates.isEmpty()) return null;
if (needCheckOverridingMethods) {
Set<String> thrownExceptionShortNames = candidates.stream().map(refAndType -> refAndType.type.getClassName()).collect(Collectors.toSet());
Predicate<PsiMethod> methodContainsThrownExceptions = m -> Arrays.stream(m.getThrowsList().getReferencedTypes())
.map(PsiClassType::getClassName)
.anyMatch(thrownExceptionShortNames::contains);
Predicate<PsiMethod> methodContainsThrownExceptions = m -> m.getThrowsList().getReferencedTypes().length != 0;
Stream<PsiMethod> overridingMethods = JavaOverridingMethodUtil.getOverridingMethodsIfCheapEnough(method, null, methodContainsThrownExceptions);
if (overridingMethods == null) return null;
Iterator<PsiMethod> overridingMethodIt = overridingMethods.iterator();
while (overridingMethodIt.hasNext()) {
PsiMethod m = overridingMethodIt.next();
PsiClassType[] overridingMethodThrownException = m.getThrowsList().getReferencedTypes();
PsiClassType[] overridingMethodThrownExceptions = m.getThrowsList().getReferencedTypes();
candidates.removeIf(refAndType -> {
PsiClassType type = refAndType.type;
return ArrayUtil.contains(type, overridingMethodThrownException);
return Arrays.stream(overridingMethodThrownExceptions).anyMatch(type::isAssignableFrom);
});
if (candidates.isEmpty()) return null;