check for conflicts with escalate visibility setting on (IDEA-88719)

java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java

@@ -104,7 +104,7 @@ public class PullUpConflictsUtil {
         }
       }
     }
-    RefactoringConflictsUtil.analyzeAccessibilityConflicts(movedMembers, superClass, conflicts, null, targetRepresentativeElement, abstrMethods);
+    RefactoringConflictsUtil.analyzeAccessibilityConflicts(movedMembers, superClass, conflicts, VisibilityUtil.ESCALATE_VISIBILITY, targetRepresentativeElement, abstrMethods);
     if (superClass != null) {
       if (movedMembers2Super) {
         checkSuperclassMembers(superClass, infos, conflicts);

java/java-tests/testData/refactoring/pullUp/EscalateVisibility.java

@@ -0,0 +1,10 @@
+class Foo {
+  
+}
+
+class FooImpl extends Foo {
+  private void fo<caret>o(){}
+  void bar() {
+    foo();
+  }
+}

java/java-tests/testData/refactoring/pullUp/EscalateVisibility_after.java

@@ -0,0 +1,10 @@
+class Foo {
+
+    protected void foo(){}
+}
+
+class FooImpl extends Foo {
+    void bar() {
+    foo();
+  }
+}

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

@@ -117,6 +117,10 @@ public class PullUpTest extends LightRefactoringTestCase {
 
   public void testTypeParamsConflictingNames() throws Exception {
     doTest(false, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
+  } 
+
+  public void testEscalateVisibility() throws Exception {
+    doTest(false, new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class));
   }
 
   private void doTest(RefactoringTestUtil.MemberDescriptor... membersToFind) throws Exception {