push down: warn if used member from anonymous won't be accessible (IDEA-155656)

java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java

@@ -160,7 +160,8 @@ public class RefactoringConflictsUtil {
       PsiElement refElement = refExpr.resolve();
       if (refElement instanceof PsiMember) {
         PsiExpression qualifier = refExpr.getQualifierExpression();
-        PsiClass qualifierAccessClass = (PsiClass)(qualifier != null && !(qualifier instanceof PsiSuperExpression) ? PsiUtil.getAccessObjectClass(qualifier).getElement() : accessClass);
+        PsiClass qualifierAccessClass = (PsiClass)(qualifier != null && !(qualifier instanceof PsiSuperExpression) ? PsiUtil.getAccessObjectClass(qualifier).getElement()
+                                                                                                                   : accessClass != null && PsiTreeUtil.isAncestor(((PsiMember)refElement).getContainingClass(), accessClass, true) ? null : accessClass);
         if (!RefactoringHierarchyUtil.willBeInTargetClass(refElement, moving, targetClass, false) &&
             (qualifierAccessClass == null || !RefactoringHierarchyUtil.willBeInTargetClass(qualifierAccessClass, moving, targetClass, false))) {
           checkAccessibility((PsiMember)refElement, context, qualifierAccessClass, member, conflicts);

java/java-tests/testData/refactoring/pushDown/PrivateFieldUsedFromMovedAnonymous.java

@@ -0,0 +1,15 @@
+
+class A {
+  private String prefix = "> ";
+
+  void f<caret>oo() {
+    Runnable runnable = new Runnable() {
+      @Override
+      public void run() {
+        System.out.println(prefix);
+      }
+    };
+  }
+}
+
+class B extends A {}

java/java-tests/testData/refactoring/pushDown/PrivateFieldUsedFromMovedAnonymous_after.java

@@ -0,0 +1,16 @@
+
+class A {
+  private String prefix = "> ";
+
+}
+
+class B extends A {
+    void foo() {
+      Runnable runnable = new Runnable() {
+        @Override
+        public void run() {
+          System.out.println(prefix);
+        }
+      };
+    }
+}

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

@@ -89,7 +89,8 @@ public class PullUpMultifileTest extends MultiFileTestCase {
   }
 
   public void testAccessibleViaInheritanceInsideAnonymousClass() {
-    doTest("Method <b><code>method2Move()</code></b> uses method <b><code>A.bar()</code></b>, which is not accessible from the superclass");
+    doTest("Method <b><code>method2Move()</code></b> uses method <b><code>A.bar()</code></b>, which is not accessible from the superclass",
+           "Method <b><code>A.bar()</code></b> is protected and will not be accessible from method <b><code>method2Move()</code></b>.");
   }
 
   public void testReuseSuperMethod() {

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

@@ -46,6 +46,7 @@ public class PushDownTest extends LightRefactoringTestCase {
   public void testFieldAndStaticReferencedClass() { doTest(); }
   public void testThisRefInAnonymous() { doTest(); }
   public void testSuperOverHierarchyConflict() { doTest(true); }
+  public void testPrivateFieldUsedFromMovedAnonymous() { doTest(true); }
   public void testSuperOverHierarchy() { doTest(); }
   public void testMethodTypeParametersList() { doTest(); }
   public void testMethodFromInterfaceToAbstractClass() { doTest(); }