!fixup split EAR into parts
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 1e71ff9..0e1e9cb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver; +import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolverKt; import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -510,7 +511,7 @@ } parentEnumOrSealed.add(currentDescriptor.getTypeConstructor()); if (currentDescriptor.isExpect()) { - List<MemberDescriptor> actualDescriptors = ExpectedActualResolver.INSTANCE.findCompatibleActualForExpected( + List<MemberDescriptor> actualDescriptors = ExpectedActualResolverKt.findCompatibleActualForExpected( currentDescriptor, DescriptorUtilsKt.getModule( currentDescriptor) ); for (MemberDescriptor actualDescriptor: actualDescriptors) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt index 3472879..453da8d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ExpectedActualDeclarationChecker.kt
@@ -37,6 +37,7 @@ import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver.Compatibility import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver.Compatibility.Compatible import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver.Compatibility.Incompatible +import org.jetbrains.kotlin.resolve.multiplatform.findCompatibleActualForExpected import org.jetbrains.kotlin.resolve.source.PsiSourceFile import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.utils.addToStdlib.safeAs @@ -407,9 +408,7 @@ assert(descriptor.isExpect) { "Not an expected class: $descriptor" } if (isOptionalAnnotationClass(descriptor)) { - with(ExpectedActualResolver) { - return descriptor.findCompatibleActualForExpected(descriptor.module).isEmpty() - } + return descriptor.findCompatibleActualForExpected(descriptor.module).isEmpty() } return false
diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ArgumentsUtils.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ArgumentsUtils.kt index 74b2f56..d3980f9 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ArgumentsUtils.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/ArgumentsUtils.kt
@@ -28,6 +28,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.isParameterOfAnnotation import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver +import org.jetbrains.kotlin.resolve.multiplatform.findCompatibleExpectedForActual import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastInfo import org.jetbrains.kotlin.types.UnwrappedType import org.jetbrains.kotlin.types.checker.intersectWrappedTypes @@ -80,10 +81,8 @@ private fun ValueParameterDescriptor.checkExpectedParameter(checker: (ValueParameterDescriptor) -> Boolean): Boolean { val function = containingDeclaration if (function is FunctionDescriptor && function.isActual) { - with(ExpectedActualResolver) { - val expected = function.findCompatibleExpectedForActual(function.module).firstOrNull() - return expected is FunctionDescriptor && checker(expected.valueParameters[index]) - } + val expected = function.findCompatibleExpectedForActual(function.module).firstOrNull() + return expected is FunctionDescriptor && checker(expected.valueParameters[index]) } return false }