From a04321478dbc1a692373c6c4b7957c5c738fb78c Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 8 Nov 2018 11:29:01 +0300 Subject: [PATCH] Fix isEffectivelyActual to work with constructors correctly --- .../src/org/jetbrains/kotlin/idea/util/expectActualUtil.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/expectActualUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/expectActualUtil.kt index 4c58e6613dd..9a5ecbdac37 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/expectActualUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/expectActualUtil.kt @@ -132,7 +132,8 @@ fun KtDeclaration.isEffectivelyActual(): Boolean { return descriptor.isEffectivelyActual() } -private fun MemberDescriptor.isEffectivelyActual() = isActual || isEnumEntryInActual() +private fun MemberDescriptor.isEffectivelyActual(): Boolean = + isActual || isEnumEntryInActual() || (this is ClassConstructorDescriptor && containingDeclaration.isEffectivelyActual()) private fun MemberDescriptor.isEnumEntryInActual() = (DescriptorUtils.isEnumEntry(this) && (containingDeclaration as? MemberDescriptor)?.isActual == true)