AllOpen: Fix incorrect 'accessing non-final property in constructor' warning (KT-16619)

2017-12-26 00:55:55 +09:00
parent df19162c8c
commit 0a3a493f25
3 changed files with 25 additions and 1 deletions
@@ -39,7 +39,9 @@ enum class Modality {
 }

 val CallableMemberDescriptor.isOverridable: Boolean
-    get() = modality != Modality.FINAL && (containingDeclaration as? ClassDescriptor)?.isFinalClass != true
+    get() = visibility != Visibilities.PRIVATE
+            && modality != Modality.FINAL
+            && (containingDeclaration as? ClassDescriptor)?.isFinalClass != true

 val CallableMemberDescriptor.isOverridableOrOverrides: Boolean
    get() = isOverridable || DescriptorUtils.isOverride(this)