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

AddExceptionToExistingCatch: simplify: IDEA-CR-30935

Browse Source
This commit is contained in:
Roman.Ivanov
2018-05-23 16:14:20 +07:00
parent eb6241f0ff
commit 7969ac3b4b
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java
+2 -11
View File
@@ -153,10 +153,10 @@ public class AddExceptionToExistingCatchFix extends PsiElementBaseIntentionActio
PsiElement parent = element.getParent();
List<PsiTryStatement> parents = new SmartList<>();
while (parent != null) {
if (parent instanceof PsiLambdaExpression || parent instanceof PsiMember) break;
if (parent instanceof PsiLambdaExpression || parent instanceof PsiMember || parent instanceof PsiFile) break;
if (parent instanceof PsiTryStatement) {
PsiTryStatement tryStatement = (PsiTryStatement)parent;
if (tryStatement.getFinallyBlock() != current && !isInCatch(current, tryStatement)) {
if (tryStatement.getFinallyBlock() != current && !(current instanceof PsiCatchSection)) {
parents.add((PsiTryStatement)parent);
}
}
@@ -166,15 +166,6 @@ public class AddExceptionToExistingCatchFix extends PsiElementBaseIntentionActio
return parents;
}
private static boolean isInCatch(PsiElement current, PsiTryStatement tryStatement) {
for (PsiCatchSection block : tryStatement.getCatchSections()) {
if (block == current) {
return true;
}
}
return false;
}
private String getMessage() {
if (myCatches.size() == 1 && myExceptions.size() == 1) {
PsiClassType exceptionType = myExceptions.get(0);