Pull Members Up: Skip visibility checking between members to move

idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/pullUpConflictsUtils.kt

@@ -147,6 +147,7 @@ private fun KotlinPullUpData.checkVisibility(
         conflicts: MultiMap<PsiElement, String>
 ) {
     fun reportConflictIfAny(targetDescriptor: DeclarationDescriptor) {
+        if (targetDescriptor in memberDescriptors.values) return
         val target = (targetDescriptor as? DeclarationDescriptorWithSource)?.source?.getPsi() ?: return
         if (targetDescriptor is DeclarationDescriptorWithVisibility
             && !Visibilities.isVisibleWithIrrelevantReceiver(targetDescriptor, targetClassDescriptor)) {

idea/testData/refactoring/pullUp/k2k/inaccessibleMemberUsed.kt

@@ -6,7 +6,7 @@ class <caret>B: A() {
     // INFO: {"checked": "false"}
     private fun foo() = 1
 
-    // INFO: {"checked": "true"}
+    // INFO: {"checked": "false"}
     private class Z(n: Int)
 
     // INFO: {"checked": "true"}

idea/testData/refactoring/pullUp/k2k/noVisibilityCheckBetweenMovedMembers.kt

@@ -0,0 +1,8 @@
+open class Temp1
+open class <caret>Temp2 : Temp1() {
+    // INFO: {"checked": "true"}
+    private val used: Int = 1
+    // INFO: {"checked": "true"}
+    private val using: Int = used + 1
+}
+class Temp3 : Temp2()

idea/testData/refactoring/pullUp/k2k/noVisibilityCheckBetweenMovedMembers.kt.after

@@ -0,0 +1,10 @@
+open class Temp1 {
+    // INFO: {"checked": "true"}
+    private val used: Int = 1
+    // INFO: {"checked": "true"}
+    private val using: Int = used + 1
+}
+
+open class Temp2 : Temp1() {
+}
+class Temp3 : Temp2()

idea/tests/org/jetbrains/kotlin/idea/refactoring/pullUp/PullUpTestGenerated.java

@@ -181,6 +181,12 @@ public class PullUpTestGenerated extends AbstractPullUpTest {
             doKotlinTest(fileName);
         }
 
+        @TestMetadata("noVisibilityCheckBetweenMovedMembers.kt")
+        public void testNoVisibilityCheckBetweenMovedMembers() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/noVisibilityCheckBetweenMovedMembers.kt");
+            doKotlinTest(fileName);
+        }
+
         @TestMetadata("outsideOfClass.kt")
         public void testOutsideOfClass() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/pullUp/k2k/outsideOfClass.kt");