show line markers for properties defined in the primary constructor (KT-12626)

This commit is contained in:
Dmitry Jemerov
2016-07-14 15:49:26 +02:00
parent 4391d833b9
commit e224041760
7 changed files with 85 additions and 36 deletions
@@ -180,8 +180,11 @@ fun KtDeclaration.isOverridable(): Boolean {
val parent = parent
if (!(parent is KtClassBody || parent is KtParameterList)) return false
val klass = parent.parent as? KtClass ?: return false
if (!klass.isInheritable() && !klass.isEnum()) return false
val klass = if (parent.parent is KtPrimaryConstructor)
parent.parent.parent as? KtClass
else
parent.parent as? KtClass
if (klass == null || (!klass.isInheritable() && !klass.isEnum())) return false
if (hasModifier(KtTokens.FINAL_KEYWORD) || hasModifier(KtTokens.PRIVATE_KEYWORD)) return false