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

Generalize catch fix made aware of try-with-resources

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-01 20:34:18 +01:00
parent 618e0e3ac0
commit 636877d224
5 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/GeneralizeCatchFix.java
+4 -8
View File
@@ -22,12 +22,11 @@ import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
public class GeneralizeCatchFix implements IntentionAction {
// private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.DeleteCatchFix");
private final PsiElement myElement;
private final PsiClassType myUnhandledException;
private PsiTryStatement myTryStatement;
@@ -56,13 +55,11 @@ public class GeneralizeCatchFix implements IntentionAction {
&& myUnhandledException != null
&& myUnhandledException.isValid()
&& myElement.getManager().isInProject(myElement))) return false;
// final enclosing try
// find enclosing try
PsiElement element = myElement;
while (element != null) {
if (element instanceof PsiCodeBlock
&& element.getParent() instanceof PsiTryStatement
&& ((PsiTryStatement) element.getParent()).getTryBlock() == element) {
myTryStatement = (PsiTryStatement) element.getParent();
if (PsiUtil.isTryBlock(element) || element instanceof PsiResourceList) {
myTryStatement = (PsiTryStatement)element.getParent();
break;
}
if (element instanceof PsiMethod || (element instanceof PsiClass && !(element instanceof PsiAnonymousClass))) break;
@@ -91,5 +88,4 @@ public class GeneralizeCatchFix implements IntentionAction {
public boolean startInWriteAction() {
return true;
}
}