diff --git a/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaCatchRemover.java b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaCatchRemover.java index 204cfe71d527..97508d7a7c1f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaCatchRemover.java +++ b/java/java-impl/src/com/intellij/codeInsight/unwrap/JavaCatchRemover.java @@ -28,11 +28,12 @@ public class JavaCatchRemover extends JavaUnwrapper { @Override public boolean isApplicableTo(PsiElement e) { - return e instanceof PsiCatchSection && tryHasSeveralCatches(e); + return e instanceof PsiCatchSection && tryHasSeveralCatchesOrResourcesDefined(e); } - private boolean tryHasSeveralCatches(PsiElement el) { - return ((PsiTryStatement)el.getParent()).getCatchBlocks().length > 1; + private static boolean tryHasSeveralCatchesOrResourcesDefined(PsiElement el) { + PsiTryStatement tryStatement = (PsiTryStatement)el.getParent(); + return tryStatement.getCatchBlocks().length > 1 || tryStatement.getResourceList() != null; } @Override