From 7969ac3b4b4e4513e0b7dcfb9dc68e1c816bea8e Mon Sep 17 00:00:00 2001
From: "Roman.Ivanov" <Roman.Ivanov@jetbrains.com>
Date: Wed, 23 May 2018 16:14:20 +0700
Subject: [PATCH] AddExceptionToExistingCatch: simplify: IDEA-CR-30935

---
 .../quickfix/AddExceptionToExistingCatchFix.java    | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java
index cb99997c219e..268eff02be96 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToExistingCatchFix.java
@@ -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);