inline: choose top level inner class to control flow (IDEA-57027)

java/java-impl/src/com/intellij/refactoring/inline/InlineLocalHandler.java

@@ -90,10 +90,14 @@ public class InlineLocalHandler extends JavaInlineActionHandler {
     query.forEach(new Processor<PsiReference>() {
       public boolean process(final PsiReference psiReference) {
         final PsiElement element = psiReference.getElement();
-        final PsiClass psiClass = PsiTreeUtil.getParentOfType(element, PsiClass.class);
-        if (psiClass != containingClass) {
-          innerClassesWithUsages.add(psiClass);
-          innerClassUsages.add(element);
+        PsiClass psiClass = PsiTreeUtil.getParentOfType(element, PsiClass.class);
+        while (psiClass != containingClass && psiClass != null) {
+          final PsiClass parentPsiClass = PsiTreeUtil.getParentOfType(psiClass, PsiClass.class, true);
+          if (parentPsiClass == containingClass) {
+            innerClassesWithUsages.add(psiClass);
+            innerClassUsages.add(element);
+          }
+          psiClass = parentPsiClass;
         }
         return true;
       }

java/java-tests/testData/refactoring/inlineLocal/InnerInnerClass.java

@@ -0,0 +1,21 @@
+public class In {
+
+    void fool() {
+        final boolean delete = narr();
+        new Runnable() {
+            public void run() {
+                new Runnable() {
+                    public void run() {
+                        if (del<caret>ete) {
+
+                        }
+                    }
+                }.run();
+            }
+        };
+    }
+
+    boolean narr() {
+        return false;
+    }
+}

java/java-tests/testData/refactoring/inlineLocal/InnerInnerClass.java.after

@@ -0,0 +1,20 @@
+public class In {
+
+    void fool() {
+        new Runnable() {
+            public void run() {
+                new Runnable() {
+                    public void run() {
+                        if (narr()) {
+
+                        }
+                    }
+                }.run();
+            }
+        };
+    }
+
+    boolean narr() {
+        return false;
+    }
+}

java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java

@@ -34,6 +34,10 @@ public class InlineLocalTest extends LightCodeInsightTestCase {
     doTest(false);
   }
 
+  public void testInnerInnerClass() throws Exception {
+    doTest(true);
+  }
+
   public void testIDEADEV950 () throws Exception {
     doTest(false);
   }