move to inner: do not raise a conflict when move class with private inner class (IDEA-104986)

java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java

@@ -301,6 +301,9 @@ public class MoveClassToInnerProcessor extends BaseRefactoringProcessor {
       ReferencesSearch.search(member).forEach(new Processor<PsiReference>() {
         public boolean process(final PsiReference psiReference) {
           PsiElement element = psiReference.getElement();
+          for (PsiClass psiClass : myClassesToMove) {
+            if (PsiTreeUtil.isAncestor(psiClass, element, false)) return true;
+          }
           if (isInaccessibleFromTarget(element, PsiModifier.PACKAGE_LOCAL)) {
             collector.addConflict(psiReference.resolve(), element);
           }

java/java-tests/testData/refactoring/moveClassToInner/innerInsideMoved/after/pack2/A.java

@@ -0,0 +1,8 @@
+package pack2;
+
+public class A {
+    public static class Class1 {
+      class Inner {}
+      Inner i;
+    }
+}

java/java-tests/testData/refactoring/moveClassToInner/innerInsideMoved/after/packUser/Class2.java

@@ -0,0 +1,7 @@
+package packUser;
+
+import pack2.A;
+
+public class Class2 {
+  A.Class1 myClass1;
+}

java/java-tests/testData/refactoring/moveClassToInner/innerInsideMoved/before/pack1/Class1.java

@@ -0,0 +1,6 @@
+package pack1;
+
+public class Class1 {
+  class Inner {}
+  Inner i;
+}

java/java-tests/testData/refactoring/moveClassToInner/innerInsideMoved/before/pack2/A.java

@@ -0,0 +1,4 @@
+package pack2;
+
+public class A {
+}

java/java-tests/testData/refactoring/moveClassToInner/innerInsideMoved/before/packUser/Class2.java

@@ -0,0 +1,7 @@
+package packUser;
+
+import pack1.Class1;
+
+public class Class2 {
+  Class1 myClass1;
+}

java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java

@@ -17,7 +17,6 @@ package com.intellij.refactoring;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
-import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiClass;
@@ -50,6 +49,10 @@ public class MoveClassToInnerTest extends RefactoringTestCase {
     doTest(new String[] { "pack1.Class1" }, "pack2.A");
   }
 
+  public void testInnerInsideMoved() throws Exception {
+    doTest(new String[] { "pack1.Class1" }, "pack2.A");
+  }
+
   public void testInsertInnerClassImport() throws Exception {
     final boolean imports = CodeStyleSettingsManager.getSettings(myProject).INSERT_INNER_CLASS_IMPORTS;
     try {