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

Fix isEffectivelyActual to work with constructors correctly

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-11-08 11:29:01 +03:00
parent 589b377ef3
commit a04321478d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/expectActualUtil.kt
+2 -1
View File
@@ -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)