Move: Do not report conflict on usages of inherited protected members

#KT-15190 Fixed

idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt

@@ -41,8 +41,11 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.DescriptorUtils
+import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
+import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
+import org.jetbrains.kotlin.resolve.source.getPsi
 import org.jetbrains.kotlin.utils.SmartSet
 import java.util.*
 
@@ -232,6 +235,15 @@ class MoveConflictChecker(
                                                        is PsiMember -> target.getJavaMemberDescriptor()
                                                        else -> null
                                                    } ?: return@forEach
+                            if (targetDescriptor is CallableMemberDescriptor &&
+                                targetDescriptor.visibility.normalize() == Visibilities.PROTECTED) {
+                                val resolvedCall = refExpr.getResolvedCall(refExpr.analyze(BodyResolveMode.PARTIAL)) ?: return@forEach
+                                val dispatchReceiver = resolvedCall.dispatchReceiver
+                                if (dispatchReceiver is ExpressionReceiver && dispatchReceiver.expression is KtSuperExpression) return@forEach
+                                val receiverClass = resolvedCall.dispatchReceiver?.type?.constructor?.declarationDescriptor?.source?.getPsi()
+                                if (receiverClass != null && receiverClass.isInsideOf(elementsToMove)) return@forEach
+                            }
+
                             if (!targetDescriptor.isVisibleIn(targetContainer)) {
                                 val message = "${render(declaration)} uses ${render(target)} which will be inaccessible after move"
                                 conflicts.putValue(refExpr, message.capitalize())

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithSuper/after/a/test.kt

@@ -0,0 +1,6 @@
+package a
+
+open class ProtectedParent {
+    protected open fun inherit() {}
+}
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithSuper/after/b/ProtectedChild.kt

@@ -0,0 +1,9 @@
+package b
+
+import a.ProtectedParent
+
+class ProtectedChild : ProtectedParent() {
+    override fun inherit() {
+        super.inherit()
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithSuper/before/a/test.kt

@@ -0,0 +1,11 @@
+package a
+
+open class ProtectedParent {
+    protected open fun inherit() {}
+}
+
+class <caret>ProtectedChild : ProtectedParent() {
+    override fun inherit() {
+        super.inherit()
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithSuper/protectedMemberUsageWithSuper.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "a/test.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "b"
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithThis/after/a/test.kt

@@ -0,0 +1,6 @@
+package a
+
+open class ProtectedParent {
+    protected open fun inherit() {}
+}
+

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithThis/after/b/ProtectedChild.kt

@@ -0,0 +1,10 @@
+package b
+
+import a.ProtectedParent
+
+class ProtectedChild : ProtectedParent() {
+    fun foo() {
+        this.inherit()
+        inherit()
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithThis/before/a/test.kt

@@ -0,0 +1,12 @@
+package a
+
+open class ProtectedParent {
+    protected open fun inherit() {}
+}
+
+class <caret>ProtectedChild : ProtectedParent() {
+    fun foo() {
+        this.inherit()
+        inherit()
+    }
+}

idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithThis/protectedMemberUsageWithThis.test

@@ -0,0 +1,5 @@
+{
+  "mainFile": "a/test.kt",
+  "type": "MOVE_KOTLIN_TOP_LEVEL_DECLARATIONS",
+  "targetPackage": "b"
+}

idea/tests/org/jetbrains/kotlin/idea/refactoring/move/MoveTestGenerated.java

@@ -665,4 +665,16 @@ public class MoveTestGenerated extends AbstractMoveTest {
         String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/movePropertyToPackageWithConflicts/movePropertyToPackageWithConflicts.test");
         doTest(fileName);
     }
+
+    @TestMetadata("kotlin/moveTopLevelDeclarations/protectedMemberUsageWithSuper/protectedMemberUsageWithSuper.test")
+    public void testKotlin_moveTopLevelDeclarations_protectedMemberUsageWithSuper_ProtectedMemberUsageWithSuper() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithSuper/protectedMemberUsageWithSuper.test");
+        doTest(fileName);
+    }
+
+    @TestMetadata("kotlin/moveTopLevelDeclarations/protectedMemberUsageWithThis/protectedMemberUsageWithThis.test")
+    public void testKotlin_moveTopLevelDeclarations_protectedMemberUsageWithThis_ProtectedMemberUsageWithThis() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/move/kotlin/moveTopLevelDeclarations/protectedMemberUsageWithThis/protectedMemberUsageWithThis.test");
+        doTest(fileName);
+    }
 }