Fix expect/actual gutters for declarations in the same module.

Fixed #KT-33510.
This commit is contained in:
Konstantin Tskhovrebov
2020-06-04 18:50:54 +03:00
parent 3b422377d2
commit a6161c6f22
2 changed files with 9 additions and 17 deletions
@@ -28,7 +28,9 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver
internal fun MemberDescriptor.expectedDescriptors() = module.implementedDescriptors.mapNotNull { it.declarationOf(this) }
internal fun MemberDescriptor.expectedDescriptors() =
(module.implementedDescriptors + module)
.mapNotNull { it.declarationOf(this) }
// TODO: Sort out the cases with multiple expected descriptors
fun MemberDescriptor.expectedDescriptor() = expectedDescriptors().firstOrNull()
@@ -101,7 +103,7 @@ fun DeclarationDescriptor.actualsForExpected(): Collection<DeclarationDescriptor
if (this is MemberDescriptor) {
if (!this.isExpect) return emptyList()
return module.implementingDescriptors.flatMap { it.actualsFor(this) }
return (module.implementingDescriptors + module).flatMap { it.actualsFor(this) }
}
if (this is ValueParameterDescriptor) {
@@ -111,6 +113,8 @@ fun DeclarationDescriptor.actualsForExpected(): Collection<DeclarationDescriptor
return emptyList()
}
fun KtDeclaration.hasAtLeastOneActual() = actualsForExpected().isNotEmpty()
// null means "any platform" here
fun KtDeclaration.actualsForExpected(module: Module? = null): Set<KtDeclaration> =
resolveToDescriptorIfAny(BodyResolveMode.FULL)