From ede194d41cb7672df51aafd2639ad02ee2174674 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Fri, 10 Aug 2018 18:58:53 +0200
Subject: [PATCH] inline super class: rebind forward references when it's
 target inner class is moved (IDEA-197170)

---
 .../memberPushDown/JavaPushDownDelegate.java        |  4 +++-
 .../orderOfInnerClasses/after/Test.java             | 13 +++++++++++++
 .../orderOfInnerClasses/before/Super.java           | 10 ++++++++++
 .../orderOfInnerClasses/before/Test.java            |  4 ++++
 .../java/refactoring/InlineSuperClassTest.java      |  1 +
 5 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/after/Test.java
 create mode 100644 java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Super.java
 create mode 100644 java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Test.java

diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
index 40b06857a51a..ee840dddac62 100644
--- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
+++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/JavaPushDownDelegate.java
@@ -516,7 +516,9 @@ public class JavaPushDownDelegate extends PushDownDelegate<MemberInfo, PsiMember
               psiClass = targetClass;
             } else if (psiClass.getContainingClass() == sourceClass) {
               psiClass = targetClass.findInnerClassByName(psiClass.getName(), false);
-              LOG.assertTrue(psiClass != null);
+              if (psiClass == null) {
+                return;
+              }
             }
 
             if (!(qualifier instanceof PsiThisExpression) && !(qualifier instanceof PsiSuperExpression) && ref instanceof PsiReferenceExpression) {
diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/after/Test.java b/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/after/Test.java
new file mode 100644
index 000000000000..aedbeba23229
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/after/Test.java
@@ -0,0 +1,13 @@
+class Test {
+  public Test() {
+  }
+
+    private static class Inner1 {
+      Inner2 dummy = Inner2.DUMMY;
+    }
+
+    private static class Inner2 {
+
+      public static final Inner2 DUMMY = new Inner2();
+    }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Super.java b/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Super.java
new file mode 100644
index 000000000000..5e4404f2024d
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Super.java
@@ -0,0 +1,10 @@
+class Super {
+  private static class Inner1 {
+    Inner2 dummy = Inner2.DUMMY;
+  }
+
+  private static class Inner2 {
+
+    public static final Inner2 DUMMY = new Inner2();
+  }
+}
diff --git a/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Test.java b/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Test.java
new file mode 100644
index 000000000000..a08031d688a3
--- /dev/null
+++ b/java/java-tests/testData/refactoring/inlineSuperClass/orderOfInnerClasses/before/Test.java
@@ -0,0 +1,4 @@
+class Test extends Super{
+  public Test() {
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java b/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java
index 6bc438bc2aab..adc5b1c0ed27 100644
--- a/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/refactoring/InlineSuperClassTest.java
@@ -83,6 +83,7 @@ public class InlineSuperClassTest extends MultiFileTestCase {
     doTest(false, true);
   }
   public void testThisQualificationInsideAnonymous() { doTest(); }
+  public void testOrderOfInnerClasses() { doTest(); }
 
   private void doTest() {
     doTest(false, false);