azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move/Copy: Fix 'protected' conflict reporting for references in super type entries

Browse Source 
#KT-22678 Fixed
This commit is contained in:
Alexey Sedunov
2018-02-19 17:18:39 +03:00
parent 27f5ddcf83
commit 883558a4c7
19 changed files with 67 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt
+6 -2
View File
@@ -392,8 +392,12 @@ class MoveConflictChecker(
val targetVisibility = visibility.normalize()
if (targetVisibility == Visibilities.PUBLIC) return true
val referrer = ref.element.getStrictParentOfType<KtNamedDeclaration>()
val referrerDescriptor = referrer?.unsafeResolveToDescriptor() ?: return true
val refElement = ref.element
val referrer = refElement.getStrictParentOfType<KtNamedDeclaration>()
var referrerDescriptor = referrer?.resolveToDescriptorIfAny() ?: return true
if (referrerDescriptor is ClassDescriptor && refElement.getParentOfTypeAndBranch<KtSuperTypeListEntry> { typeReference } != null) {
referrerDescriptor.unsubstitutedPrimaryConstructor?.let { referrerDescriptor = it }
}
if (!isVisibleIn(referrerDescriptor)) return true